From 3d61f0eff8b5f91f2460c1872e47ba452ba1d1b7 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 20 Jan 2025 22:21:08 -0600 Subject: [PATCH] Update version scheme to match OpenRGB project --- .gitlab-ci.yml | 2 +- OpenRGBE131ReceiverPlugin.pro | 43 ++++++++++++++++++++++++++++++---- scripts/build-package-files.sh | 19 ++++++++++----- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 072fceb..3f73218 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ #-----------------------------------------------------------------------# variables: GIT_SUBMODULE_STRATEGY: recursive - GIT_DEPTH: 1 + GIT_DEPTH: 0 .shared_windows_runners: tags: diff --git a/OpenRGBE131ReceiverPlugin.pro b/OpenRGBE131ReceiverPlugin.pro index 064b284..8c4364f 100644 --- a/OpenRGBE131ReceiverPlugin.pro +++ b/OpenRGBE131ReceiverPlugin.pro @@ -26,10 +26,43 @@ CONFIG += #-----------------------------------------------------------------------------------------------# # Application Configuration # #-----------------------------------------------------------------------------------------------# -MAJOR = 0 -MINOR = 9 -REVISION = 1 -PLUGIN_VERSION = $$MAJOR"."$$MINOR$$REVISION +MAJOR = 0 +MINOR = 9 +SUFFIX = git + +SHORTHASH = $$system("git rev-parse --short=7 HEAD") +LASTTAG = "release_"$$MAJOR"."$$MINOR +COMMAND = "git rev-list --count "$$LASTTAG"..HEAD" +COMMITS = $$system($$COMMAND) + +VERSION_NUM = $$MAJOR"."$$MINOR"."$$COMMITS +VERSION_STR = $$MAJOR"."$$MINOR + +VERSION_DEB = $$VERSION_NUM +VERSION_WIX = $$VERSION_NUM".0" +VERSION_AUR = $$VERSION_NUM +VERSION_RPM = $$VERSION_NUM + +equals(SUFFIX, "git") { +VERSION_STR = $$VERSION_STR"+ ("$$SUFFIX$$COMMITS")" +VERSION_DEB = $$VERSION_DEB"~git"$$SHORTHASH +VERSION_AUR = $$VERSION_AUR".g"$$SHORTHASH +VERSION_RPM = $$VERSION_RPM"^git"$$SHORTHASH +} else { + !isEmpty(SUFFIX) { +VERSION_STR = $$VERSION_STR"+ ("$$SUFFIX")" +VERSION_DEB = $$VERSION_DEB"~"$$SUFFIX +VERSION_AUR = $$VERSION_AUR"."$$SUFFIX +VERSION_RPM = $$VERSION_RPM"^"$$SUFFIX + } +} + +message("VERSION_NUM: "$$VERSION_NUM) +message("VERSION_STR: "$$VERSION_STR) +message("VERSION_DEB: "$$VERSION_DEB) +message("VERSION_WIX: "$$VERSION_WIX) +message("VERSION_AUR: "$$VERSION_AUR) +message("VERSION_RPM: "$$VERSION_RPM) #-----------------------------------------------------------------------------------------------# # Automatically generated build information # @@ -40,7 +73,7 @@ GIT_COMMIT_ID = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PR # Inject vars in defines # #-----------------------------------------------------------------------------------------------# DEFINES += \ - VERSION_STRING=\\"\"\"$$PLUGIN_VERSION\\"\"\" \ + VERSION_STRING=\\"\"\"$$VERSION_STR\\"\"\" \ GIT_COMMIT_ID=\\"\"\"$$GIT_COMMIT_ID\\"\"\" #-----------------------------------------------------------------------------------------------# diff --git a/scripts/build-package-files.sh b/scripts/build-package-files.sh index fa02b39..0a6b11f 100755 --- a/scripts/build-package-files.sh +++ b/scripts/build-package-files.sh @@ -19,13 +19,20 @@ if [ -e ${1} ]; then echo "Warning: File ${1} exists and will be overwritten" fi -MAJOR=$(grep MAJOR\ ${PROJECT_FILE} | cut -d= -f 2 | tr -d [:space:]) -MINOR=$(grep MINOR\ ${PROJECT_FILE} | cut -d= -f 2 | tr -d [:space:]) -REVISION=$(grep REVISION\ ${PROJECT_FILE} | cut -d= -f 2 | tr -d [:space:]) +VERSION_VAR="VERSION_NUM" +QMAKE_EXE="qmake" -#Convert Revision to a nummber in case it is blank in the project file -REVISION=$(( ${REVISION} + 0 )) +if [[ ${1} == *"debian"* ]]; then + VERSION_VAR="VERSION_DEB" + QMAKE_EXE="qmake" +fi -PACKAGE_VERSION="${MAJOR}.${MINOR}.${REVISION}" +if [[ ${1} == *"fedora"* ]]; then + VERSION_VAR="VERSION_RPM" + QMAKE_EXE="qmake-qt5" +fi + +PACKAGE_VERSION=$(${QMAKE_EXE} ${PROJECT_FILE} 2>&1 | grep ${VERSION_VAR} | cut -d ':' -f 3 | tr -d ' ') +echo $PACKAGE_VERSION sed -e "s/${VERSION_PATTERN}/${PACKAGE_VERSION}/g" ${INFILE_PATH} > ${1}