michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-28 00:27:21 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for version control info

Browse source
This commit is contained in:
Nicolas Mailloux 2022-02-21 23:38:09 -05:00
parent 4fb815d4e6
commit b4c9abb8a2
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inkbox.pro
View file

@ -8,6 +8,7 @@ QMAKE_CXXFLAGS += -Wno-unused-function -Wno-unused-parameter
# Thanks to https://github.com/mrbindraw/TestVersion/blob/master/TestVersion.pro # Thanks to https://github.com/mrbindraw/TestVersion/blob/master/TestVersion.pro
GIT_VERSION = $$system(git describe --always --tags) GIT_VERSION = $$system(git describe --always --tags)
GIT_COMMIT = $$system(git rev-parse HEAD)
COMMAND_REMOVE_MAKEFILES=$$quote(rm $$system_path($$OUT_PWD\Makefile*)) COMMAND_REMOVE_MAKEFILES=$$quote(rm $$system_path($$OUT_PWD\Makefile*))
PRE_BUILD_TARGET = .dummyfile PRE_BUILD_TARGET = .dummyfile
updatemakefiles.target = $$PRE_BUILD_TARGET updatemakefiles.target = $$PRE_BUILD_TARGET
@ -16,6 +17,7 @@ updatemakefiles.depends = FORCE
PRE_TARGETDEPS += $$PRE_BUILD_TARGET PRE_TARGETDEPS += $$PRE_BUILD_TARGET
QMAKE_EXTRA_TARGETS += updatemakefiles QMAKE_EXTRA_TARGETS += updatemakefiles
DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\" DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"
DEFINES += GIT_COMMIT=\\\"$$GIT_COMMIT\\\"
# You can make your code fail to compile if it uses deprecated APIs. # You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line. # In order to do so, uncomment the following line.

2
mainwindow.cpp
View file

@ -567,7 +567,7 @@ MainWindow::MainWindow(QWidget *parent)
// Write version control info to file in tmpfs // Write version control info to file in tmpfs
if(checkconfig("/opt/inkbox_genuine") == true) { if(checkconfig("/opt/inkbox_genuine") == true) {
string_writeconfig("/external_root/run/inkbox_gui_git_commit", GIT_VERSION); string_writeconfig("/external_root/run/inkbox_gui_git_commit", GIT_COMMIT);
} }
} }