TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #233 from probonopd/TheAssassin/fix-version-information

Browse Source 
Fix version information (fixes #232)
This commit is contained in:
TheAssassin
2018-02-02 16:00:45 +01:00
committed by GitHub
parent 002059c196 4714c5ad7a
commit 988d294250
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tests-ci.sh
+4
View File
@@ -39,6 +39,10 @@ ulimit -a -H
# error handling performed separately # error handling performed separately
set +e set +e
# print version number
./linuxdeployqt-*-x86_64.AppImage --version
# TODO: reactivate tests
#bash -e tests/tests.sh #bash -e tests/tests.sh
true true
RESULT=$? RESULT=$?
tools/linuxdeployqt/linuxdeployqt.pro
+6 -2
View File
@@ -24,10 +24,14 @@ DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell git rev-parse --short HEAD)\"'"
DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\"'" DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\"'"
equals($$(TRAVIS_BUILD_NUMBER), "") { _BUILD_NUMBER = $$(TRAVIS_BUILD_NUMBER)
isEmpty(_BUILD_NUMBER) {
message(Not building on Travis CI, tagging build as local dev build)
DEFINES += BUILD_NUMBER="'\"<local dev build>\"'" DEFINES += BUILD_NUMBER="'\"<local dev build>\"'"
} else { } else {
DEFINES += BUILD_NUMBER="'\"$$(TRAVIS_BUILD_NUMBER)\"'" message(Building on Travis CI build, build number $$_BUILD_NUMBER)
DEFINES += BUILD_NUMBER="'\"$$_BUILD_NUMBER\"'"
} }
DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell git describe --tags $(shell git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'" DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell git describe --tags $(shell git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'"