git-version: simplify version number

This commit is contained in:
Xi Ruoyao 2021-05-01 22:07:11 +08:00
parent 4a570af171
commit ca5e52ae46
3 changed files with 7 additions and 6 deletions

View File

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

View File

@ -13,7 +13,6 @@
<!ENTITY version "10.2">
<!ENTITY releasedate "September 1st, &year;">
<!ENTITY pubdate "&year;-&month;-&day;">
<!ENTITY short-version "&version;">
-->
<!ENTITY copyholder "The BLFS Development Team">

View File

@ -31,11 +31,14 @@ esac
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
echo "<!ENTITY day \"$day_digit\">" > version.ent
@ -43,6 +46,5 @@ echo "<!ENTITY month \"$month_digit\">" >> version.ent
echo "<!ENTITY year \"$year\">" >> version.ent
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