Changeset ca5e52a

Timestamp:

05/01/2021 02:07:11 PM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

9d0684c

Parents:

4a570af1

Message:

git-version: simplify version number

Files:

• book/bookinfo.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• git-version.sh (modified) (2 diffs)

book/bookinfo.xml

@@ -48 +48 @@
   <revhistory>
     <revision>
-      <revnumber>&short-version;</revnumber>
+      <revnumber>&version;</revnumber>
       <date>&pubdate;</date>
       <revremark>Ongoing Release</revremark>

general.ent

@@ -14 +14 @@
 <!ENTITY releasedate    "September 1st, &year;">
 <!ENTITY pubdate        "&year;-&month;-&day;">
-<!ENTITY short-version "&version;">
 -->
 

git-version.sh

@@ -32 +32 @@
 full_date="$month $day$suffix, $year"
 
-sha="g$(git describe --always)"
-version="$short_date-$sha"
+sha="$(git describe --abbrev=1)"
+if git describe --all --match trunk > /dev/null 2> /dev/null; then
+        sha=$(echo "$sha" | sed 's/-g[^-]*$//')
+fi
+version="$sha"
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-        version="$version-MODIFIED"
+        version="$version+"
 fi
 
@@ -44 +47 @@
 echo "<!ENTITY copyrightdate     \"2001-$year\">"          >> version.ent
 echo "<!ENTITY version           \"$version\">"            >> version.ent
-echo "<!ENTITY short-version     \"$sha\">"                >> version.ent
 echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
 echo "<!ENTITY pubdate           \"$short_date\">"         >> version.ent