From ff57bec408cfaad6174181c0da7fc3d03d67d925 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Sun, 8 Apr 2018 16:49:48 +0200 Subject: [PATCH 1/2] cd into src dir before invoking git fixes #267 --- tools/linuxdeployqt/linuxdeployqt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index 85488ea..9e6b859 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -20,7 +20,7 @@ DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled # don't break the quotes -- at the moment, the shell commands are injected into the Makefile to have them run on every # build and not during configure time -DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell git rev-parse --short HEAD)\"'" +DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell cd $$PWD && git rev-parse --short HEAD)\"'" DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\"'" @@ -34,5 +34,5 @@ isEmpty(_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 += EXCLUDELIST=\""$$system($$_PRO_FILE_PWD_/../excludelist.sh)"\" \ No newline at end of file +DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell cd $$PWD && git describe --tags $(shell cd $$PWD && git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'" +DEFINES += EXCLUDELIST=\""$$system($$_PRO_FILE_PWD_/../excludelist.sh)"\" From 4830aa24907a275bfb76e1b9d898951249adf1d0 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Sun, 8 Apr 2018 16:50:08 +0200 Subject: [PATCH 2/2] fixed usage of qmake message function --- tools/linuxdeployqt/linuxdeployqt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index 9e6b859..999a5f2 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -12,7 +12,7 @@ load(qt_tool) HEADERS += shared.h SOURCES += main.cpp \ - shared.cpp + shared.cpp DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled @@ -27,10 +27,10 @@ DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\ _BUILD_NUMBER = $$(TRAVIS_BUILD_NUMBER) isEmpty(_BUILD_NUMBER) { - message(Not building on Travis CI, tagging build as local dev build) + 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) + message("Building on Travis CI build, build number $$_BUILD_NUMBER") DEFINES += BUILD_NUMBER="'\"$$_BUILD_NUMBER\"'" }