Build Versions

This commit is contained in:
Justin Hammond 2020-06-17 00:16:01 +08:00
parent fc979d551a
commit 3ad1985548
5 changed files with 21 additions and 3 deletions

View file

@ -13,10 +13,27 @@ TEMPLATE = app
isEmpty(BUILDNUMBER) { isEmpty(BUILDNUMBER) {
BUILDNUMBER = 0 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 VERSION = 0.1.$$BUILDNUMBER
message("Building Version $$VERSION") message("Building Version $$VERSION")
DEFINES +=APP_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\ SOURCES += main.cpp\
configuration.cpp \ configuration.cpp \

View file

@ -12,4 +12,3 @@ SUBDIRS = ozwadmin-widgets devicedb-lib ozwadmin-main
ozwadmin-main.depends = qt-openzwave ozwadmin-widgets devicedb-lib ozwadmin-main.depends = qt-openzwave ozwadmin-widgets devicedb-lib
1

View file

@ -22,7 +22,8 @@ mkdir -p /opt/AppDir/usr/share/metainfo/
#cp /opt/ozw-admin/scripts/ozwadmin.appdata.xml /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 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64
export QMAKE=/opt/qt512/bin/qmake 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 /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 #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/ cp /opt/OZWAdmin-*.AppImage /opt/buildfiles/

View file

@ -1,6 +1,6 @@
; ===== Defines ===== ; ===== Defines =====
!define APPLICATION_NAME "OpenZwave Admin" !define APPLICATION_NAME "OpenZwave Admin"
!define APPLICATION_VERSION "0.1.0" !define APPLICATION_VERSION "$$VERSION"
!define COMPANY "OpenZWave" !define COMPANY "OpenZWave"
!define PROJECT_ROOT "." !define PROJECT_ROOT "."

1
scripts/version.in Normal file
View file

@ -0,0 +1 @@
$$VERSION