Changeset 2729

Timestamp:

Apr 19, 2012, 10:22:26 AM (11 years ago)

Author:

Peter

Message:

Define version on one line in order to avoid that version change in
stable branch (e.g. 0.8 -> 0.8.1) gets merged into trunk and changes
version in trunk from 0.9pre to 0.9.1pre. Also lift out generic stuff
into new file m4/my_version.m4 so that file can be reused in other
projects.

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• m4/my_version.m4 (added)
• m4/version.m4 (modified) (2 diffs)

trunk/configure.ac

@@ -34 +34 @@
 
 m4_include([m4/version.m4])
-AC_INIT([yat],[YAT_VERSION__],[libyat-users@lists.sourceforge.net],,
+AC_INIT([yat],[my_VERSION],[libyat-users@lists.sourceforge.net],,
         [http://dev.thep.lu.se/yat])
+MY_VERSION
 AC_PREREQ(2.63)
 AC_CONFIG_SRCDIR([yat/utility/Matrix.h])
@@ -53 +54 @@
 
 AC_SUBST([YAT_LT_VERSION], [YAT_LT_VERSION_INFO])
-AC_SUBST([YAT_MAJOR_VERSION], [MAJOR_VERSION])
-AC_SUBST([YAT_MINOR_VERSION], [MINOR_VERSION])
-AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
-AC_SUBST([YAT_DEV_BUILD], [DEV_BUILD])
-AC_DEFINE([YAT_VERSION], ["YAT_VERSION__"], [version])
-AC_DEFINE([YAT_MAJOR_VERSION], [MAJOR_VERSION], [major version])
-AC_DEFINE([YAT_MINOR_VERSION], [MINOR_VERSION], [minor version])
-AC_DEFINE([YAT_PATCH_VERSION], [PATCH_VERSION], [patch version])
-AC_DEFINE([YAT_DEV_BUILD], [DEV_BUILD], [Define to false if official version])
+AC_DEFINE([YAT_VERSION], ["my_VERSION"], [version])
 
 AC_CONFIG_HEADERS([config.h])

trunk/m4/version.m4

@@ -23 +23 @@
 # Set version numbers, see http://apr.apache.org/versioning.html
 #
-# MAJOR - Modify when incompatible changes are made
-m4_define([MAJOR_VERSION], [0])
-# MINOR - Modify when new functionality is added
-m4_define([MINOR_VERSION], [9])
-# PATCH - Modify for every released patch
-m4_define([PATCH_VERSION], [0])
 
-# DEV_BUILD - When rolling a tarball we set this to `false'. In
-# repository value remains `true'.
-m4_define([DEV_BUILD], [true])
+m4_include([m4/my_version.m4])
+
+MY_VERSION_early([0], [9], [0], [true])
 
 # Library versioning (current:revision:age)
@@ -75 +69 @@
 #
 m4_define([YAT_LT_VERSION_INFO], [6:0:0])
-
-###
-###  DO NOT EDIT BELOW THIS LINE
-###
-
-# Setting YAT_VERSION__ based upon settings above
-m4_define([YAT_VERSION__],MAJOR_VERSION.MINOR_VERSION) 
-# disregarding patch number if zero
-m4_define([YAT_VERSION__], m4_if(PATCH_VERSION,[0], YAT_VERSION__,
-                                 YAT_VERSION__.PATCH_VERSION))
-m4_define([YAT_VERSION__], m4_if(DEV_BUILD,[true], YAT_VERSION__[pre],
-                                 YAT_VERSION__))