From 37f993aa770f7a40b409f518722179b07eec7fe3 Mon Sep 17 00:00:00 2001 From: nefarius2001 Date: Sun, 24 Jan 2021 02:10:28 +0100 Subject: [PATCH 1/4] #475 git hash & status in verison info (cherry picked from commit 94680ce5d5e4eaaa5cb8f970d458c0b53dbe0ea4) --- Jamulus.pro | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Jamulus.pro b/Jamulus.pro index 25fe9b25b3..eff9336161 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -1,4 +1,4 @@ -VERSION = 3.6.2git +VERSION = 3.6.2 # use target name which does not use a captital letter at the beginning contains(CONFIG, "noupcasename") { @@ -6,6 +6,17 @@ contains(CONFIG, "noupcasename") { TARGET = jamulus } +#allow detailed version info for intermediate builds +contains(CONFIG, "official_release_version") { + message(building an official release version) +} else { + GIT_DESCRIPTION=$$system(git describe --match=xxxxxxxxxxxxxxxxxxxx --always --abbrev --dirty) # the match should never match + VERSION = "$$VERSION"-$$GIT_DESCRIPTION + TARGET = "$$TARGET"-$$VERSION + message(building an intermediate version: $$TARGET) +} + + CONFIG += qt \ thread \ lrelease \ From 549620a133b4b0465bb5c280f4e32c16c40b7f99 Mon Sep 17 00:00:00 2001 From: nefarius2001 Date: Sun, 24 Jan 2021 03:02:41 +0100 Subject: [PATCH 2/4] remove hash from TARGET config (was resulting in automated build problems) --- Jamulus.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jamulus.pro b/Jamulus.pro index eff9336161..a3ef9bafa6 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -12,8 +12,7 @@ contains(CONFIG, "official_release_version") { } else { GIT_DESCRIPTION=$$system(git describe --match=xxxxxxxxxxxxxxxxxxxx --always --abbrev --dirty) # the match should never match VERSION = "$$VERSION"-$$GIT_DESCRIPTION - TARGET = "$$TARGET"-$$VERSION - message(building an intermediate version: $$TARGET) + message(building an intermediate version: $$VERSION) } From 3dac8991bc56039033f6bc5f26420fb64ec39651 Mon Sep 17 00:00:00 2001 From: nefarius2001 Date: Sun, 24 Jan 2021 12:57:20 +0100 Subject: [PATCH 3/4] "dev" suffix for intermediate versions --- ChangeLog | 2 +- Jamulus.pro | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad799788ac..f892978d0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ -### 3.6.2git <- NOTE: the release version number will be 3.6.3 ### +### 3.6.2dev <- NOTE: the release version number will be 3.6.3 ### - show --clientname as first word in title to avoid clipping in Windows task bar (#789) diff --git a/Jamulus.pro b/Jamulus.pro index a3ef9bafa6..a3bdab47b4 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -1,4 +1,4 @@ -VERSION = 3.6.2 +VERSION = 3.6.2dev # use target name which does not use a captital letter at the beginning contains(CONFIG, "noupcasename") { @@ -8,7 +8,12 @@ contains(CONFIG, "noupcasename") { #allow detailed version info for intermediate builds contains(CONFIG, "official_release_version") { + #for creating a new release: + # - count the VERSION up + # - create a new commit + # - run build with "official_release_version" on it message(building an official release version) + VERSION = ($$replace(VERSION, dev, )) } else { GIT_DESCRIPTION=$$system(git describe --match=xxxxxxxxxxxxxxxxxxxx --always --abbrev --dirty) # the match should never match VERSION = "$$VERSION"-$$GIT_DESCRIPTION From db841ed644e2abc7cadd252ab7cf8898e9b0f917 Mon Sep 17 00:00:00 2001 From: nefarius2001 Date: Sun, 24 Jan 2021 21:58:19 +0100 Subject: [PATCH 4/4] release-detection: no dev in version-string --- Jamulus.pro | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Jamulus.pro b/Jamulus.pro index a3bdab47b4..6e906af208 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -7,17 +7,12 @@ contains(CONFIG, "noupcasename") { } #allow detailed version info for intermediate builds -contains(CONFIG, "official_release_version") { - #for creating a new release: - # - count the VERSION up - # - create a new commit - # - run build with "official_release_version" on it - message(building an official release version) - VERSION = ($$replace(VERSION, dev, )) -} else { +if (contains(VERSION, .*dev.*)) { GIT_DESCRIPTION=$$system(git describe --match=xxxxxxxxxxxxxxxxxxxx --always --abbrev --dirty) # the match should never match VERSION = "$$VERSION"-$$GIT_DESCRIPTION message(building an intermediate version: $$VERSION) +} else { + message(building a final release version: $$VERSION) }