Author: cazfi
Date: Tue Oct 20 17:46:52 2015
New Revision: 30147

URL: http://svn.gna.org/viewcvs/freeciv?rev=30147&view=rev
Log:
Include svn revision number to the name of the Windows Installer Snapshot build 
package names.

See patch #6443

Modified:
    trunk/fc_version
    trunk/win32/installer/Makefile

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=30147&r1=30146&r2=30147&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Tue Oct 20 17:46:52 2015
@@ -59,7 +59,15 @@
 
 FREECIV_DISTRIBUTOR=""
 
+if test x$VERSION_REVTYPE = xsvn && which svn > /dev/null ; then
+  VERSION_REV="r$(LANG=C svn info 2>/dev/null | grep "^Revision: " | sed 
's/^Revision: //')"
+elif test x$VERSION_REVTYPE = xgit && which git > /dev/null ; then
+  VERSION_REV="$(git rev-parse HEAD)"
+else
+  VERSION_REV=""
+fi
+
 if test x$VERSION_SCRIPT_SILENT != xyes ; then
-  VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}
+  
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}${VERSION_REV}
   echo ${VERSION}
 fi

Modified: trunk/win32/installer/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=30147&r1=30146&r2=30147&view=diff
==============================================================================
--- trunk/win32/installer/Makefile      (original)
+++ trunk/win32/installer/Makefile      Tue Oct 20 17:46:52 2015
@@ -42,7 +42,7 @@
 
 snapshot:
        cd ../.. ; ./autogen.sh --no-configure-run
-       make EXTRA_CONFIG="--enable-svnrev" all
+       make VERSION_REVTYPE="svn" EXTRA_CONFIG="--enable-svnrev" all
 
 
 # build Freeciv
@@ -206,7 +206,7 @@
        find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" 
-delete
 
 # build installer
-       
+
 installer-common: clean-install-common install-freeciv-$(GUI) 
install-env-$(GUI)
        # extract Freeciv version
        $(eval FREECIV_VERSION := $(shell ../../fc_version))


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

Reply via email to