From 3ad19855487dd6423a08ca992ea522903d9d3209 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Wed, 17 Jun 2020 00:16:01 +0800 Subject: [PATCH] Build Versions --- ozwadmin-main/ozwadmin-main.pro | 17 +++++++++++++++++ ozwadmin.pro | 1 - scripts/build.sh | 3 ++- scripts/{package.nsis => package.nsis.in} | 2 +- scripts/version.in | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) rename scripts/{package.nsis => package.nsis.in} (98%) create mode 100644 scripts/version.in diff --git a/ozwadmin-main/ozwadmin-main.pro b/ozwadmin-main/ozwadmin-main.pro index 7ce9f95..7a8e5eb 100644 --- a/ozwadmin-main/ozwadmin-main.pro +++ b/ozwadmin-main/ozwadmin-main.pro @@ -13,10 +13,27 @@ TEMPLATE = app isEmpty(BUILDNUMBER) { BUILDNUMBER = 0 } +GIT_VERSION_TAG=$$system(git describe --tags --match *.0) +message($$GIT_VERSION_TAG) +GIT_VERSIONS = $$split(GIT_VERSION_TAG, "-") +message($$GIT_VERSIONS) +BUILDNUMBER=$$member(GIT_VERSIONS, 1) + VERSION = 0.1.$$BUILDNUMBER message("Building Version $$VERSION") DEFINES +=APP_VERSION=$$VERSION +unix { + packagefiles.input=$$PWD/../scripts/version.in + packagefiles.output=$$PWD/../scripts/version + QMAKE_SUBSTITUTES += packagefiles +} +win { + packagefiles.input=$$PWD/../scripts/package.nsis.in + packagefiles.output=$$PWD/../scripts/package.nsis + QMAKE_SUBSTITUTES += packagefiles +} + SOURCES += main.cpp\ configuration.cpp \ diff --git a/ozwadmin.pro b/ozwadmin.pro index d490191..4137185 100644 --- a/ozwadmin.pro +++ b/ozwadmin.pro @@ -12,4 +12,3 @@ SUBDIRS = ozwadmin-widgets devicedb-lib ozwadmin-main ozwadmin-main.depends = qt-openzwave ozwadmin-widgets devicedb-lib -1 diff --git a/scripts/build.sh b/scripts/build.sh index 6291c46..53d2b1c 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -22,7 +22,8 @@ mkdir -p /opt/AppDir/usr/share/metainfo/ #cp /opt/ozw-admin/scripts/ozwadmin.appdata.xml /opt/AppDir/usr/share/metainfo/ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64 export QMAKE=/opt/qt512/bin/qmake -export VERSION=0.1 +export VERSION=$(cat /opt/ozw-admin/scripts/version) +echo $VERSION cd /opt && ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt --output appimage -d ozw-admin/scripts/ozwadmin.desktop -i ozw-admin/scripts/ozwadmin.png #cd ozw-admin && ../linuxdeploy-x86_64.AppImage --appdir AppDir -e ozwadmin --plugin qt --output appimage -d scripts/ozwadmin.desktop -i scripts/ozwadmin.png cp /opt/OZWAdmin-*.AppImage /opt/buildfiles/ diff --git a/scripts/package.nsis b/scripts/package.nsis.in similarity index 98% rename from scripts/package.nsis rename to scripts/package.nsis.in index a805047..5a3fa78 100644 --- a/scripts/package.nsis +++ b/scripts/package.nsis.in @@ -1,6 +1,6 @@ ; ===== Defines ===== !define APPLICATION_NAME "OpenZwave Admin" -!define APPLICATION_VERSION "0.1.0" +!define APPLICATION_VERSION "$$VERSION" !define COMPANY "OpenZWave" !define PROJECT_ROOT "." diff --git a/scripts/version.in b/scripts/version.in new file mode 100644 index 0000000..2afc6d0 --- /dev/null +++ b/scripts/version.in @@ -0,0 +1 @@ +$$VERSION \ No newline at end of file