From fe98a413289e770c7489ee5fb0ccd797699a85f6 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Fri, 2 Feb 2018 12:54:39 +0100 Subject: [PATCH 1/5] Fix version information, mk. 1 --- tools/linuxdeployqt/linuxdeployqt.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index f131a11..4feec90 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -24,10 +24,10 @@ 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')\"'" -equals($$(TRAVIS_BUILD_NUMBER), "") { +isEmpty($(TRAVIS_BUILD_NUMBER)) { DEFINES += BUILD_NUMBER="'\"\"'" } else { - DEFINES += BUILD_NUMBER="'\"$$(TRAVIS_BUILD_NUMBER)\"'" + DEFINES += BUILD_NUMBER="'\"$(TRAVIS_BUILD_NUMBER)"'" } DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell git describe --tags $(shell git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'" From d3d76b5df6466a88026ee0e2a86c91d1881861cd Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Fri, 2 Feb 2018 13:01:42 +0100 Subject: [PATCH 2/5] Fix version information, mk. 2 --- tools/linuxdeployqt/linuxdeployqt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index 4feec90..864a676 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -27,7 +27,7 @@ DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\ isEmpty($(TRAVIS_BUILD_NUMBER)) { DEFINES += BUILD_NUMBER="'\"\"'" } else { - DEFINES += BUILD_NUMBER="'\"$(TRAVIS_BUILD_NUMBER)"'" + DEFINES += BUILD_NUMBER="'\"$(TRAVIS_BUILD_NUMBER)\"'" } DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell git describe --tags $(shell git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'" From d1d3641f588ed5ba81c7a08d7e4fb2e1fbb7d202 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Fri, 2 Feb 2018 13:18:19 +0100 Subject: [PATCH 3/5] Fix version information, mk. 3 --- tools/linuxdeployqt/linuxdeployqt.pro | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index 864a676..e74f9e3 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -24,10 +24,13 @@ 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')\"'" -isEmpty($(TRAVIS_BUILD_NUMBER)) { +_BUILD_NUMBER = $$TRAVIS_BUILD_NUMBER + +isEmpty(_BUILD_NUMBER) { DEFINES += BUILD_NUMBER="'\"\"'" } 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)\"'" From f74e53d447a8d7aaa69ec0b03316576c37e7590b Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Fri, 2 Feb 2018 13:20:18 +0100 Subject: [PATCH 4/5] Print version number during build --- tests/tests-ci.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index 8a64a25..f9819f7 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -39,6 +39,10 @@ ulimit -a -H # error handling performed separately set +e +# print version number +./linuxdeployqt-*-x86_64.AppImage --version + +# TODO: reactivate tests #bash -e tests/tests.sh true RESULT=$? From 4714c5ad7a17d754c973cf60098fa23ef28725aa Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Fri, 2 Feb 2018 15:53:39 +0100 Subject: [PATCH 5/5] Fix version information, mk. 4 Thanks #qt on Freenode --- tools/linuxdeployqt/linuxdeployqt.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index e74f9e3..1d9e3f5 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -24,9 +24,10 @@ 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')\"'" -_BUILD_NUMBER = $$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="'\"\"'" } else { message(Building on Travis CI build, build number $$_BUILD_NUMBER)