From 4b9dcc5e99d443646fd2ae174246b594a078b9a6 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 12 Oct 2023 12:13:49 +0200 Subject: [PATCH] Set version to 1.3.11: integrate extended version (VERSION + last git commit) in send-last-version-message. --- OnDemandUpdatePTU.pro | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OnDemandUpdatePTU.pro b/OnDemandUpdatePTU.pro index 6855d62..a0a3fb6 100644 --- a/OnDemandUpdatePTU.pro +++ b/OnDemandUpdatePTU.pro @@ -34,6 +34,7 @@ DEFINES += QT_DEPRECATED_WARNINGS # too small when updating apism. # Fix display of UPDATE_SUCCESS when opkg_command fails. Detected when # updating apsim failed. +# 1.3.11: Integrate version of ATBUpdateTool in SendLastVersion-ISMAS-message. win32 { BUILD_DATE=$$system("date /t") @@ -43,7 +44,10 @@ win32 { BUILD_TIME=$$system("date +%H:%M:%S") } -VERSION="1.3.10" +GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1") + +VERSION="1.3.11" +EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}" INCLUDEPATH += plugins @@ -53,6 +57,7 @@ CONFIG += c++17 DEFINES+=APP_VERSION=\\\"$$VERSION\\\" DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\" DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\" +DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\" QMAKE_CXXFLAGS += -g QMAKE_CXXFLAGS += -Wno-deprecated-copy