Item13195: Improve the Foswiki version/release strings

foswiki · Jan 10, 2015 · 198f7ce · 198f7ce
1 parent f1205dc
commit 198f7ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -169,8 +169,8 @@ BEGIN {
 
     # DO NOT CHANGE THE FORMAT OF $VERSION.
     # Use $RELEASE for a descriptive version.
-    use version 0.77; $VERSION = version->declare("v1.2.0_999");
-    $RELEASE = 'Foswiki-1.2.0_999 svn';
+    use version 0.77; $VERSION = version->declare("v1.1.999_001");
+    $RELEASE = 'Foswiki-1.2.0 GIT';
 
     # Default handlers for different %TAGS%
     # Where an entry is set as 'undef', the tag will be demand-loaded

diff --git a/core/tools/develop/foswiki-trunk-update.sh b/core/tools/develop/foswiki-trunk-update.sh
@@ -68,9 +68,12 @@ cp -a $PROD/data/System/FoswikiSiteChanges.txt* $ROOT/core/data/System/.
 cp -a $PROD/data/System/WebTopBar* $ROOT/core/data/System/.
 
 # Modify Foswiki.pm to show the last revision
-REV=`git log --abbrev=12 --format=format:%h:%ci -1`
+REV=`git log --abbrev=12 --format=format:"Commit: %h - %ci" -1`
+BR=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/Branch: \1/'`
+
 cd $ROOT/core/lib
-sed -e "s/\(RELEASE = '\)/\1GIT: $REV: /" Foswiki.pm > Foswiki.pm.new
+# Default string $RELEASE = 'Foswiki-1.2.0 GIT';
+sed -e "s/\(RELEASE = .*\)';/\1: $BR $REV';/" Foswiki.pm > Foswiki.pm.new
 mv Foswiki.pm.new Foswiki.pm
 
 # Make sure we have links to all non-existing webs to trunk