Author: cazfi
Date: Sat Feb 13 09:23:21 2016
New Revision: 31904

URL: http://svn.gna.org/viewcvs/freeciv?rev=31904&view=rev
Log:
Initial support for fourth version number part that can used to make emergency
bugfix release without changing version numbering in main branch.
This support for fourth version number part just adds us an option to use it.
Whether it's used in a given release has to be decided case by case.

See patch #6900

Modified:
    trunk/configure.ac
    trunk/fc_version

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=31904&r1=31903&r2=31904&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Sat Feb 13 09:23:21 2016
@@ -36,14 +36,17 @@
 VERSION_SCRIPT_SILENT=yes
 m4_include(fc_version)
 
-VERSION_WITHOUT_LABEL=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
-VERSION=${VERSION_WITHOUT_LABEL}${VERSION_LABEL}
+VERSION_WITHOUT_LABEL=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EMERG_PART}
+VERSION=${VERSION_WITHOUT_LABEL}${VERSION_LABEL}x
 
 AC_DEFINE_UNQUOTED([MAJOR_VERSION], [$MAJOR_VERSION], [Major version])
 AC_DEFINE_UNQUOTED([MINOR_VERSION], [$MINOR_VERSION], [Minor version])
 AC_DEFINE_UNQUOTED([PATCH_VERSION], [$PATCH_VERSION], [Patch version])
+if test x$EMERGENCY_VERSION != x ; then
+  AC_DEFINE_UNQUOTED([EMERGENCY_VERSION], [$EMERGENCY_VERSION], [Emergency 
version])
+fi
 AC_DEFINE_UNQUOTED([VERSION_LABEL], ["${VERSION_LABEL}"], [Version label])
-AC_DEFINE_UNQUOTED([VERSION_STRING], 
["${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}"], 
[Version string])
+AC_DEFINE_UNQUOTED([VERSION_STRING], 
["${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EMERG_PART}${VERSION_LABEL}"],
 [Version string])
 AC_DEFINE_UNQUOTED([IS_DEVEL_VERSION], [$IS_DEVEL_VERSION], [Is this a devel 
version])
 AC_DEFINE_UNQUOTED([IS_FREEZE_VERSION], [$IS_FREEZE_VERSION], [Is this a 
frozen version])
 AC_DEFINE_UNQUOTED([IS_BETA_VERSION], [$IS_BETA_VERSION], [Is this a beta 
version])

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=31904&r1=31903&r2=31904&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Sat Feb 13 09:23:21 2016
@@ -7,6 +7,7 @@
 MAJOR_VERSION="2"
 MINOR_VERSION="91"
 PATCH_VERSION="99"
+EMERGENCY_VERSION=""
 VERSION_LABEL="-dev"
 
 # 1) Development until MAJOR and MINOR version numbers are
@@ -70,7 +71,11 @@
   VERSION_REV="+${VERSION_REV}"
 fi
 
+if test x$EMERGENCY_VERSION != x ; then
+  EMERG_PART=".${EMERGENCY_VERSION}"
+fi
+
 if test x$VERSION_SCRIPT_SILENT != xyes ; then
-  
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}${VERSION_REV}
+  
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EMERG_PART}${VERSION_LABEL}${VERSION_REV}
   echo ${VERSION}
 fi


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

Reply via email to