[Opensrf-commits] [GIT] OpenSRF branch master updated. 47d4ebfc5f1c8d0ccb126eda20e3cb69dd885211

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  47d4ebfc5f1c8d0ccb126eda20e3cb69dd885211 (commit)
       via  19431b88f288f785b840887e4f663af5a5f0edbe (commit)
      from  f3cdc028e6ffcc794db3d53e6d29206f91ad05cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 47d4ebfc5f1c8d0ccb126eda20e3cb69dd885211
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon May 16 16:01:37 2011 -0400

    Comment on why we're pulling in version.m4
    
    Commenting code is helpful, I've been told that it is the best
    way to reduce bugs in a project. To that end, make the connection
    between VERSION_NUMBER and PACKAGE_VERSION in configure.ac
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/configure.ac b/configure.ac
index 9dc04ab..df978c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,10 +20,15 @@
 #-------------------------------
 
 export PATH=${PATH}:/usr/sbin
-m4_include([version.m4])
 AC_PREREQ(2.59)
+
+# Get our version number from one file
+m4_include([version.m4])
+
+# Version number gets turned into @PACKAGE_VERSION@
 AC_INIT([OpenSRF],m4_defn([VERSION_NUMBER]),[open-ils-dev at list.georgialibraries.org])
 AM_INIT_AUTOMAKE([OpenSRF], m4_defn([VERSION_NUMBER]))
+
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_PREFIX_DEFAULT([/opensrf])

commit 19431b88f288f785b840887e4f663af5a5f0edbe
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon May 16 15:08:04 2011 -0400

    Define version number in one place
    
    Adding the version.m4 macro defines VERSION_NUMBER for us in
    one place so that we can simplify package releases (and fix
    'osrf_config --version' output so that it does not always
    tell us 'trunk').
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/configure.ac b/configure.ac
index 2b60acb..9dc04ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,9 +20,10 @@
 #-------------------------------
 
 export PATH=${PATH}:/usr/sbin
+m4_include([version.m4])
 AC_PREREQ(2.59)
-AC_INIT([OpenSRF],[trunk],[open-ils-dev at list.georgialibraries.org])
-AM_INIT_AUTOMAKE([OpenSRF], [trunk])
+AC_INIT([OpenSRF],m4_defn([VERSION_NUMBER]),[open-ils-dev at list.georgialibraries.org])
+AM_INIT_AUTOMAKE([OpenSRF], m4_defn([VERSION_NUMBER]))
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_PREFIX_DEFAULT([/opensrf])
diff --git a/version.m4 b/version.m4
new file mode 100644
index 0000000..5c284f9
--- /dev/null
+++ b/version.m4
@@ -0,0 +1 @@
+m4_define([VERSION_NUMBER],[master]) 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   10 ++++++++--
 version.m4   |    1 +
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 version.m4


hooks/post-receive
-- 
OpenSRF