From 7d06cd5ad13b0718679d36d529ee50a4853d6678 Mon Sep 17 00:00:00 2001 From: Ale Martinez Date: Sat, 2 May 2020 15:15:50 -0300 Subject: [PATCH] Add version string for non tag builds Used to build binaries for the release, will be reverted afterwards. --- appveyor.yml | 1 + travis/linux/before_script.sh | 1 + travis/osx/before_script.sh | 3 +++ 3 files changed, 5 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index c39050045..5d461c8ee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -95,6 +95,7 @@ install: before_build: # Define GC version string, only for tagged builds - if %APPVEYOR_REPO_TAG% == "true" (echo DEFINES+=GC_VERSION=VERSION_STRING >> src/gcconfig.pri) +- echo DEFINES+=GC_VERSION=VERSION_STRING >> src/gcconfig.pri # Enable CloudDB - echo CloudDB=active >> src\gcconfig.pri diff --git a/travis/linux/before_script.sh b/travis/linux/before_script.sh index 1706e27be..0ca169eb3 100755 --- a/travis/linux/before_script.sh +++ b/travis/linux/before_script.sh @@ -6,6 +6,7 @@ cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri # Define GC version string, only for tagged builds if [ -n "$TRAVIS_TAG" ]; then echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri; fi +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 90f63aa53..a8ad7242d 100755 --- a/travis/osx/before_script.sh +++ b/travis/osx/before_script.sh @@ -23,6 +23,9 @@ cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri # Define GC version string, only for tagged builds if [ -n "$TRAVIS_TAG" ]; then echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri; fi +# Temporary hack to have a non tag build with version string +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