Changeset 8307474 for git-version.sh

Timestamp:

12/04/2021 03:28:15 PM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

lazarus

Children:

e6974d1

Parents:

b22e4ceb (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into lazarus

File:

• git-version.sh (modified) (4 diffs)

git-version.sh

@@ -1 +1 @@
 #!/bin/sh
+
+if [ "$1" = sysv ]; then
+        SYSV="INCLUDE"
+        SYSTEMD="IGNORE "
+elif [ "$1" = systemd ]; then
+        SYSV="IGNORE "
+        SYSTEMD="INCLUDE"
+else
+        echo You must provide either \"sysv\" or \"systemd\" as argument
+        exit 1
+fi
+
+echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
+echo "<!ENTITY % systemd \"$SYSTEMD\">"  >> conditional.ent
 
 if ! git status > /dev/null; then
         # Either it's not a git repository, or git is unavaliable.
         # Just workaround.
-        echo "<!ENTITY version           \"unknown\">"         >  version.ent
-        echo "<!ENTITY versiond          \"unknown-systemd\">" >> version.ent
+        echo "<!ENTITY year              \"????\">"            >  version.ent
+        echo "<!ENTITY version           \"unknown\">"         >> version.ent
         echo "<!ENTITY releasedate       \"unknown\">"         >> version.ent
-        echo "<!ENTITY copyrightdate     \"1999-2021\">"       >> version.ent
+        echo "<!ENTITY pubdate           \"unknown\">"         >> version.ent
         exit 0
 fi
@@ -19 +33 @@
 year=$(date --date "$commit_date" "+%Y")
 month=$(date --date "$commit_date" "+%B")
-month_digit=$(date --date "$commit_date" "+%m")
 day_digit=$(date --date "$commit_date" "+%d")
 day=$(echo $day_digit | sed 's/^0//')
@@ -33 +46 @@
 
 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"
+version=$(echo "$sha" | sed 's/-g[^-]*$//')
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
@@ -42 +52 @@
 fi
 
-echo "<!ENTITY day               \"$day_digit\">"          >  version.ent
-echo "<!ENTITY month             \"$month_digit\">"        >> version.ent
-echo "<!ENTITY year              \"$year\">"               >> version.ent
-echo "<!ENTITY copyrightdate     \"2001-$year\">"          >> version.ent
+echo "<!ENTITY year              \"$year\">"               >  version.ent
 echo "<!ENTITY version           \"$version\">"            >> version.ent
 echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent