Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-05-06 11:36:56 +02:00
Code Issues Packages Projects Releases Activity

Add external version

Browse Source
This commit is contained in:
Ximi1970
2020-04-12 21:50:26 +02:00
parent 7f464cbeb8
commit 856d776a87
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -56,7 +56,7 @@ systray-x-app:
rm -f SysTray-X ;\
mkdir -p app/build ;\
cd app/build ;\
$(QMAKE) ../SysTray-X/SysTray-X.pro ;\
$(QMAKE) $(EXT_VERSION) ../SysTray-X/SysTray-X.pro ;\
make ;\
cd ../.. ;\
cp app/build/SysTray-X .
@@ -74,3 +74,11 @@ systray-x-app:
../build.bat x86_64 5.14.1 ;\
cd ../..
endif
#DEFINES+=EXT_VERSION \
DEFINES+=APP_VERSION_MAJOR=\\\\\\\"\"$(VERSION_MAJOR)\\\\\\\"\" \
DEFINES+=APP_VERSION_MINOR=\\\\\\\"\"$(VERSION_MINOR)\\\\\\\"\" \
DEFINES+=APP_VERSION_PATCH=\\\\\\\"\"$(VERSION_PATCH)\\\\\\\"\" \
DEFINES+=APP_BUILD=\\\\\\\"\"$(BUILD_NUMBER2)\\\\\\\"\" \
DEFINES+=APP_GITHASH=\\\\\\\"\"$(GIT_HASH2)\\\\\\\"\" \
DEFINES+=APP_GITBRANCH=\\\\\\\"\"$(GIT_BRANCH2)\\\\\\\"\" \

24
app/SysTray-X/SysTray-X.pro
View File

@@ -91,18 +91,20 @@ VERSION_MAJOR = $$section(GIT_VERSION, ., 0, 0)
VERSION_MINOR = $$section(GIT_VERSION, ., 1, 1)
VERSION_PATCH = $$section(GIT_VERSION, ., 2, 2)
DEFINES += APP_VERSION_MAJOR=\\\"$$VERSION_MAJOR\\\"
DEFINES += APP_VERSION_MINOR=\\\"$$VERSION_MINOR\\\"
DEFINES += APP_VERSION_PATCH=\\\"$$VERSION_PATCH\\\"
DEFINES += APP_BUILD=\\\"$$BUILD_NUMBER\\\"
DEFINES += APP_GITHASH=\\\"$$GIT_HASH\\\"
DEFINES += APP_GITBRANCH=\\\"$$GIT_BRANCH\\\"
!contains(DEFINES,EXT_VERSION) {
DEFINES += APP_VERSION_MAJOR=\\\"$$VERSION_MAJOR\\\"
DEFINES += APP_VERSION_MINOR=\\\"$$VERSION_MINOR\\\"
DEFINES += APP_VERSION_PATCH=\\\"$$VERSION_PATCH\\\"
DEFINES += APP_BUILD=\\\"$$BUILD_NUMBER\\\"
DEFINES += APP_GITHASH=\\\"$$GIT_HASH\\\"
DEFINES += APP_GITBRANCH=\\\"$$GIT_BRANCH\\\"
message("Buildnumber: "$$BUILD_NUMBER)
message("Git hash: "$$GIT_HASH)
message("Git branch: "$$GIT_BRANCH)
message("Version: "$$VERSION_MAJOR"."$$VERSION_MINOR"."$$VERSION_PATCH)
#message($$QMAKESPEC)
message("Buildnumber: "$$BUILD_NUMBER)
message("Git hash: "$$GIT_HASH)
message("Git branch: "$$GIT_BRANCH)
message("Version: "$$VERSION_MAJOR"."$$VERSION_MINOR"."$$VERSION_PATCH)
#message($$QMAKESPEC)
}
unix: {
#

2
dist/rpm/systray-x.spec vendored
View File

@@ -59,7 +59,7 @@ export APP_BUILD=`cat %{S:1} | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(.*\)
export APP_GITHASH=`cat %{S:1} | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/"`
export APP_GITBRANCH=`cat %{S:1} | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/"`
make %{?_smp_mflags} CFLAGS="-DAPP_VERSION_MAJOR=${VERSION_MAJOR} -DAPP_VERSION_MINOR=${VERSION_MINOR} -DAPP_VERSION_PATCH=${VERSION_PATCH} -DAPP_BUILD=${BUILD_NUMBER} -DAPP_GITHASH=${GIT_HASH} -DAPP_GITBRANCH=${GIT_BRANCH}"
make %{?_smp_mflags} EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\"\"$(VERSION_MAJOR)\\\\\\\"\" DEFINES+=APP_VERSION_MINOR=\\\\\\\"\"$(VERSION_MINOR)\\\\\\\"\" DEFINES+=APP_VERSION_PATCH=\\\\\\\"\"$(VERSION_PATCH)\\\\\\\"\" DEFINES+=APP_BUILD=\\\\\\\"\"$(BUILD_NUMBER2)\\\\\\\"\" DEFINES+=APP_GITHASH=\\\\\\\"\"$(GIT_HASH2)\\\\\\\"\" DEFINES+=APP_GITBRANCH=\\\\\\\"\"$(GIT_BRANCH2)\\\\\\\"\""
sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|%{_bindir}/SysTray-X|' > SysTray_X.json