Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-02 10:35:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2795 from thunder2/fix-git-describe

Browse Source 
Changed automatic version numbering with "git describe" to split the …
This commit is contained in:
csoler 2023-11-26 18:21:38 +01:00 committed by GitHub
commit a1fdce2e58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
retroshare.pri
View File

@ -456,13 +456,26 @@ defined in command line")
RS_MINOR_VERSION = $$member(RS_GIT_DESCRIBE_SPLIT, 1) RS_MINOR_VERSION = $$member(RS_GIT_DESCRIBE_SPLIT, 1)
RS_GIT_DESCRIBE_SPLIT = $$member(RS_GIT_DESCRIBE_SPLIT, 2) RS_GIT_DESCRIBE_SPLIT = $$member(RS_GIT_DESCRIBE_SPLIT, 2)
RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE_SPLIT, -) RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE_SPLIT, )
RS_MINI_VERSION = $$member(RS_GIT_DESCRIBE_SPLIT, 0) # Split string into mini version (leading numbers) and extra version (string after the numbers)
RS_MINI_VERSION =
RS_GIT_DESCRIBE_SPLIT = $$member(RS_GIT_DESCRIBE_SPLIT, 1, -1) RS_EXTRA_VERSION =
for(CHAR, RS_GIT_DESCRIBE_SPLIT) {
RS_EXTRA_VERSION = $$join(RS_GIT_DESCRIBE_SPLIT,-,-) isEqual(CHAR, 0) | greaterThan(CHAR, 0):lessThan(CHAR, 9) | isEqual(CHAR, 9) {
# Number
isEmpty(RS_EXTRA_VERSION) {
# Add leading numbers to mini version
RS_MINI_VERSION = $${RS_MINI_VERSION}$${CHAR}
} else {
# Add to extra version
RS_EXTRA_VERSION = $${RS_EXTRA_VERSION}$${CHAR}
}
} else {
# Add to extra version
RS_EXTRA_VERSION = $${RS_EXTRA_VERSION}$${CHAR}
}
}
message("RetroShare version\ message("RetroShare version\
$${RS_MAJOR_VERSION}.$${RS_MINOR_VERSION}.$${RS_MINI_VERSION}$${RS_EXTRA_VERSION}\ $${RS_MAJOR_VERSION}.$${RS_MINOR_VERSION}.$${RS_MINI_VERSION}$${RS_EXTRA_VERSION}\