Author: cazfi
Date: Wed Apr 26 20:14:51 2017
New Revision: 35301

URL: http://svn.gna.org/viewcvs/freeciv?rev=35301&view=rev
Log:
Support building installer_cross from a git repository

See hrm Feature #655148

Modified:
    branches/S3_0/windows/installer_cross/installer_build.sh
    branches/S3_0/windows/installer_cross/winbuild.sh

Modified: branches/S3_0/windows/installer_cross/installer_build.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/installer_build.sh?rev=35301&r1=35300&r2=35301&view=diff
==============================================================================
--- branches/S3_0/windows/installer_cross/installer_build.sh    (original)
+++ branches/S3_0/windows/installer_cross/installer_build.sh    Wed Apr 26 
20:14:51 2017
@@ -101,7 +101,9 @@
 
 SETUP=$(grep "Setup=" $DLLSPATH/crosser.txt | sed -e 's/Setup="//' -e 's/"//')
 
-if test -d ../../.svn ; then
+if test -d ../../.git ; then
+  VERREV="$(../../fc_version)-$(cd ../.. && git rev-parse --short HEAD)"
+elif test -d ../../.svn ; then
   VERREV="$(../../fc_version)-r$(cd ../.. && svn info | grep Revision | sed 
's/Revision: //')"
 else
   VERREV="$(../../fc_version)"

Modified: branches/S3_0/windows/installer_cross/winbuild.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/winbuild.sh?rev=35301&r1=35300&r2=35301&view=diff
==============================================================================
--- branches/S3_0/windows/installer_cross/winbuild.sh   (original)
+++ branches/S3_0/windows/installer_cross/winbuild.sh   Wed Apr 26 20:14:51 2017
@@ -35,7 +35,9 @@
   exit 1
 fi
 
-if test -d ../../.svn ; then
+if test -d ../../.git ; then
+  VERREV="$(../../fc_version)-$(cd ../.. && git rev-parse --short HEAD)"
+elif test -d ../../.svn ; then
   VERREV="$(../../fc_version)-r$(cd ../.. && svn info | grep Revision | sed 
's/Revision: //')"
 else
   VERREV="$(../../fc_version)"


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to