aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix build on FreeBSD. #126

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-05-11 11:19:05 +03:00
parent 2a4082c5a8
commit fd2a69451f
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common.pri
View File

@ -279,12 +279,6 @@ defineReplace(FindBuildRevision){
return(\\\"unknown\\\") return(\\\"unknown\\\")
}else{ }else{
# Release mode # Release mode
macx{
GIT = /usr/local/bin/git # Can't defeat PATH variable on Mac OS.
}else {
GIT = git # All other platforms are OK.
}
DVCS_HESH=$$system("git rev-parse --short HEAD") DVCS_HESH=$$system("git rev-parse --short HEAD")
isEmpty(DVCS_HESH){ isEmpty(DVCS_HESH){
DVCS_HESH = \\\"unknown\\\" # if we can't find build revision left unknown. DVCS_HESH = \\\"unknown\\\" # if we can't find build revision left unknown.
@ -298,15 +292,9 @@ 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
#get latest git tag and it's distance from HEAD
macx{
GIT = /usr/local/bin/git # Can't defeat PATH variable on Mac OS.
}else {
GIT = GIT # All other platforms all OK.
}
# tag is formatted as TAG-N-gSHA: # tag is formatted as TAG-N-gSHA:
# 1. latest stable version is TAG, or vX.Y.Z # 1. latest stable version is TAG, or vX.Y.Z
@ -314,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})