Skip to content

Commit

Permalink
Adding RC build.
Browse files Browse the repository at this point in the history
  • Loading branch information
dvorka committed Dec 25, 2023
1 parent 7a65251 commit f4bbdfc
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 9 deletions.
6 changes: 5 additions & 1 deletion app/app.pro
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ mfci {
DEFINES += DO_MF_CI
}

mfrc {
DEFINES += DO_MF_RC
}

# Hunspell spell check:
# - Windows and Ubuntu Xenial require DEPRECATED Hunspell API
# - Ubuntu Bionic and newer distros use NEW Hunspell API
Expand Down Expand Up @@ -133,7 +137,7 @@ mfner {
win32 {
INCLUDEPATH += $$PWD/../deps/zlib-win/include
DEPENDPATH += $$PWD/../deps/zlib-win/include

CONFIG(release, debug|release): LIBS += -L$$PWD/../deps/zlib-win/lib/ -lzlibwapi
else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../deps/zlib-win/lib/ -lzlibwapi
} else {
Expand Down
21 changes: 19 additions & 2 deletions build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,16 @@ build-dev:
# TODO: build-dev-clang


build-ci: clean
.PHONY: build-rc
build-rc:
@echo "MindForger RC build..."
cd .. && qmake CONFIG+=mfrc -r mindforger.pro && make -j 7
@echo "If RC build succeeded, then MindForger executable can be found in:\n app/mindforger"
ls -al ../app/mindforger


.PHONY: build-ci
build-ci:
@echo "MindForger CI build..."
cd .. && qmake CONFIG+=mfci -r mindforger.pro && make -j 7
@echo "If CI build succeeded, then MindForger executable can be found in:\n app/mindforger"
Expand All @@ -133,6 +142,14 @@ run: ../app/mindforger
# cd ../app && pwd && ./mindforger /home/dvorka/mf-devel/bug-copy-image


run-rc: build-rc
cd ../app && pwd && ./mindforger /home/dvorka/mf-devel/library-trainer


run-ci: build-ci
cd ../app && pwd && ./mindforger /home/dvorka/mf-devel/library-trainer


run-dev: build-dev
cd ../app && pwd && ./mindforger /home/dvorka/mf-devel/library-trainer
# cd ../app && pwd && ./mindforger /home/dvorka/mf-devel/computer-hw.md
Expand All @@ -150,7 +167,7 @@ install: clean ../app/mindforger
~/bin/mind --version


install-dev-local: clean build-dev
install-dev-local: clean build-rc
cp -vf ../app/mindforger ~/bin
mv -vf ~/bin/mindforger ~/bin/mind
~/bin/mind --version
Expand Down
12 changes: 6 additions & 6 deletions lib/src/app_info.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#define MINDFORGER_VERSION_MAJOR "1"
#define MINDFORGER_VERSION_MINOR "55"
#define MINDFORGER_VERSION_REVISION "1"
#define MINDFORGER_VERSION_STRING "1.55.1"
#define MINDFORGER_VERSION_DWORD 1,55,1,2
#define MINDFORGER_VERSION_MAJOR "2"
#define MINDFORGER_VERSION_MINOR "0"
#define MINDFORGER_VERSION_REVISION "0"
#define MINDFORGER_VERSION_STRING "2.0.0"
#define MINDFORGER_VERSION_DWORD 2,0,0,2
#define MINDFORGER_APP_NAME "MindForger"
#define MINDFORGER_APP_DESCRIPTION "MindForger Thinking Notebook"
#define MINDFORGER_APP_AUTHOR "Martin Dvorak"
#define MINDFORGER_APP_URL "https://www.mindforger.com"
#define MINDFORGER_APP_COMPANY MINDFORGER_APP_NAME
#define MINDFORGER_APP_LEGAL "\xA9 2016-2023 Martin Dvorak. All Rights Reserved"
#define MINDFORGER_APP_EXE "mindforger.exe"
#define MINDFORGER_APP_EXE "mindforger.exe"
2 changes: 2 additions & 0 deletions lib/src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ namespace m8r {

#ifdef DO_MF_DEBUG
#define MINDFORGER_NIGHTLY " (" __DATE__ " " __TIME__ ")"
#elif DO_MF_RC
#define MINDFORGER_NIGHTLY " (RC " __DATE__ " " __TIME__ ")"
#elif DO_MF_CI
#define MINDFORGER_NIGHTLY " (CI " __DATE__ " " __TIME__ ")"
#else
Expand Down
1 change: 1 addition & 0 deletions mindforger.pro
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
# qmake CONFIG+=mfnoccache ... do NOT use ccache to build the project
# qmake CONFIG+=mfdebug ... show debug messages + include WIP code
# qmake CONFIG+=mfci ... CI build (AppVeyor, ...) w/ build info @ window title
# qmake CONFIG+=mfrc ... RC build w/ build info @ window title
# qmake CONFIG+=mfunits ... option to run unit tests
# qmake CONFIG+=mfllamacpp ... EXPERIMENTAL option to enable wingman @ llama.cpp
# qmake CONFIG+=mfner ... DEPRECATED: build project w/ NER and link dlib/MITIE
Expand Down

0 comments on commit f4bbdfc

Please sign in to comment.