aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replace beta semvar correctly (#2980)

Browse source
This commit is contained in:
Zach H 2017-12-28 21:30:17 -05:00 committed by GitHub
parent dfaa85847c
commit 87c978937d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/getversion.cmake
View file

@ -80,7 +80,7 @@ function(get_tag_name commit)
# Extract information from tag: # Extract information from tag:
# YYYY-MM-DD-Release-MAJ.MIN.PATCH # YYYY-MM-DD-Release-MAJ.MIN.PATCH
# YYYY-MM-DD-Development-MAJ.MIN.PATCH-betaX # YYYY-MM-DD-Development-MAJ.MIN.PATCH-beta.X
string(REPLACE "-" ";" GIT_TAG_EXPLODED "${GIT_TAG}") string(REPLACE "-" ";" GIT_TAG_EXPLODED "${GIT_TAG}")
string(REPLACE "." ";" GIT_TAG_EXPLODED "${GIT_TAG_EXPLODED}") string(REPLACE "." ";" GIT_TAG_EXPLODED "${GIT_TAG_EXPLODED}")
@ -141,8 +141,16 @@ function(get_tag_name commit)
endif() endif()
# Label # Label
# 7 = Full release
# 8 = Dev release, first beta so only "beta" attached
# 9 = Dev release, not first beta so "beta.N" attached
if(${GIT_TAG_LISTCOUNT} EQUAL 8) if(${GIT_TAG_LISTCOUNT} EQUAL 8)
list(GET GIT_TAG_EXPLODED 7 GIT_TAG_LABEL) list(GET GIT_TAG_EXPLODED 7 GIT_TAG_LABEL)
elseif(${GIT_TAG_LISTCOUNT} EQUAL 9)
list(GET GIT_TAG_EXPLODED 7 GIT_TAG_LABEL)
list(GET GIT_TAG_EXPLODED 8 GIT_TAG_LABEL_NUM)
set(GIT_TAG_LABEL ${GIT_TAG_LABEL} ${GIT_TAG_LABEL_NUM})
string(REPLACE ";" "." GIT_TAG_LABEL "${GIT_TAG_LABEL}")
else() else()
SET(GIT_TAG_LABEL "") SET(GIT_TAG_LABEL "")
endif() endif()