From f4bbdfccdc4eb18b5d2d7007504e5c9be23caf0e Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Mon, 25 Dec 2023 10:55:14 +0100 Subject: [PATCH] Adding RC build. --- app/app.pro | 6 +++++- build/Makefile | 21 +++++++++++++++++++-- lib/src/app_info.h | 12 ++++++------ lib/src/version.h | 2 ++ mindforger.pro | 1 + 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/app/app.pro b/app/app.pro index 08d50e9a..b652db04 100644 --- a/app/app.pro +++ b/app/app.pro @@ -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 @@ -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 { diff --git a/build/Makefile b/build/Makefile index 5136aba5..5fe13bb5 100644 --- a/build/Makefile +++ b/build/Makefile @@ -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" @@ -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 @@ -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 diff --git a/lib/src/app_info.h b/lib/src/app_info.h index cff0e94d..e7279bef 100644 --- a/lib/src/app_info.h +++ b/lib/src/app_info.h @@ -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" diff --git a/lib/src/version.h b/lib/src/version.h index 0105a777..3e1d46c5 100644 --- a/lib/src/version.h +++ b/lib/src/version.h @@ -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 diff --git a/mindforger.pro b/mindforger.pro index 43c18934..a55fd719 100644 --- a/mindforger.pro +++ b/mindforger.pro @@ -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