Parcourir la source

Updated the revision header with git revision

Sam Lantinga il y a 4 ans
Parent
commit
9deffcd325
2 fichiers modifiés avec 6 ajouts et 7 suppressions
  1. 4 4
      build-scripts/showrev.sh
  2. 2 3
      build-scripts/updaterev.sh

+ 4 - 4
build-scripts/showrev.sh

@@ -5,9 +5,9 @@
 SDL_ROOT=$(dirname $0)/..
 cd $SDL_ROOT
 
-if [ -x "$(command -v hg)" ]; then
-    rev="$(hg parents --template 'hg-{rev}:{node|short}' 2>/dev/null)"
-    if [ $? = 0 ]; then
+if [ -x "$(command -v git)" ]; then
+    rev=$(echo "$(git remote get-url origin 2>/dev/null)@$(git rev-list HEAD~.. 2>/dev/null)")
+    if [ "$rev" != "@" ]; then
         echo $rev
         exit 0
     fi
@@ -21,5 +21,5 @@ if [ -x "$(command -v p4)" ]; then
     fi
 fi
 
-echo "hg-0:baadf00d"
+echo ""
 exit 1

+ 2 - 3
build-scripts/updaterev.sh

@@ -8,10 +8,9 @@ srcdir=..
 header=$outdir/include/SDL_revision.h
 
 rev=`sh showrev.sh 2>/dev/null`
-if [ "$rev" != "" -a "$rev" != "hg-0:baadf00d" ]; then
-    revnum=`echo $rev | sed 's,hg-\([0-9]*\).*,\1,'`
+if [ "$rev" != "" ]; then
     echo "#define SDL_REVISION \"$rev\"" >"$header.new"
-    echo "#define SDL_REVISION_NUMBER $revnum" >>"$header.new"
+    echo "#define SDL_REVISION_NUMBER 0" >>"$header.new"
     if diff $header $header.new >/dev/null 2>&1; then
         rm "$header.new"
     else