From c2f3f2b8e2508c5c90459879bc005fdbba03f75c Mon Sep 17 00:00:00 2001 From: Ale Martinez Date: Fri, 6 Dec 2019 10:28:34 -0300 Subject: [PATCH] Define GC version string for travis-ci builds Next commit will do this only for tagged builds --- travis/linux/before_script.sh | 2 ++ travis/osx/before_script.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/travis/linux/before_script.sh b/travis/linux/before_script.sh index de914db01..ad52a7065 100755 --- a/travis/linux/before_script.sh +++ b/travis/linux/before_script.sh @@ -4,6 +4,8 @@ export PATH=/opt/qt59/bin:$PATH cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri +# Define GC version string, only for tagged builds +echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri # user WEBENGINE echo DEFINES += NOWEBKIT >> src/gcconfig.pri # Trusty needs C99 mode to enable declarations in for loops diff --git a/travis/osx/before_script.sh b/travis/osx/before_script.sh index 11940558f..39447755e 100755 --- a/travis/osx/before_script.sh +++ b/travis/osx/before_script.sh @@ -21,7 +21,8 @@ cd .. cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri -/usr/local/opt/qt5/bin/lupdate src/src.pro +# Define GC version string, only for tagged builds +echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri echo DEFINES += NOWEBKIT >> src/gcconfig.pri sed -i "" "s|#\(CONFIG += release.*\)|\1 static |" src/gcconfig.pri sed -i "" "s|#\(QMAKE_LRELEASE\).*|\1 += /usr/local/opt/qt5/bin/lrelease|" src/gcconfig.pri