palo
/
valentina
mirror of https://gitlab.com/smart-pattern/valentina.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix getting the latest tag distance. #126

merge-requests/13/head
Roman Telezhynskyi 2021-05-13 21:38:24 +03:00
parent 1ea8e1baaa
commit 5c8fbbcc59
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.pri
View File

@ -292,7 +292,7 @@ defineReplace(FindBuildRevision){
defineReplace(FindLatestTagDistance){ defineReplace(FindLatestTagDistance){
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
# Debug mode # Debug mode
return(\\\"0\\\") return(0)
}else{ }else{
# Release mode # Release mode
@ -302,10 +302,10 @@ defineReplace(FindLatestTagDistance){
# 3. latest commit is gSHA # 3. latest commit is gSHA
tag_all = $$system(git describe --tags) tag_all = $$system(git describe --tags)
tag_split = $$split(tag_all, "-") #split at the dashes tag_split = $$split(tag_all, "-") #split at the dashes
GIT_DISTANCE = \\\"$$member(tag_split,1)\\\" #get 2nd element of results GIT_DISTANCE = $$member(tag_split,1) #get 2nd element of results
isEmpty(GIT_DISTANCE){ isEmpty(GIT_DISTANCE){
GIT_DISTANCE = \\\"0\\\" # if we can't find local revision left 0. GIT_DISTANCE = 0 # if we can't find local revision left 0.
} }
message("Latest tag distance:" $${GIT_DISTANCE}) message("Latest tag distance:" $${GIT_DISTANCE})

2
src/libs/vmisc/vmisc.pro
View File

@ -90,6 +90,6 @@ CONFIG(debug, debug|release){
} }
} }
DEFINES += "LATEST_TAG_DISTANCE=$$FindLatestTagDistance()" # Make available latest tag distance number in sources. DEFINES += LATEST_TAG_DISTANCE=\\\"$$FindLatestTagDistance()\\\" # Make available latest tag distance number in sources.
include (../libs.pri) include (../libs.pri)