ZOOKEEPER-297. centralize version numbering in the source/build (Diego de Oliveira via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582941 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -814,6 +814,9 @@ IMPROVEMENTS:
   ZOOKEEPER-602. log all exceptions not caught by ZK threads (Rakesh R via
   michim)
 
+  ZOOKEEPER-297. centralize version numbering in the source/build (Diego de
+  Oliveira via michim)
+
 headers
 
 Release 3.4.0 - 

build.xml

@@ -29,7 +29,11 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
 
     <property environment="env"/>
     
-    <property name="version" value="3.5.0-SNAPSHOT" />
+    <property name="version-major" value="3" />
+    <property name="version-minor" value="5" />
+    <property name="version-patch" value="0" />
+    <property name="version" value="${version-major}.${version-minor}.${version-patch}-SNAPSHOT" />
+
     <property name="final.name" value="${name}-${version}"/>
     <property name="revision.dir" value="${basedir}/.revision" />
     <property name="revision.properties" value="revision.properties" />
@@ -354,7 +358,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
         </java>
     </target>
     
-    <target name="build-generated" depends="compile_jute,version-info" >
+    <target name="build-generated" depends="compile_jute,version-info,process-template" >
         <javac srcdir="${src_generated.dir}" destdir="${build.classes}" includeantruntime="false"
             target="${javac.target}" source="${javac.source}" debug="on" />
     </target>
@@ -404,6 +408,24 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
       <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
     </target>
 
+    <target name="process-template">
+      <copy todir="${c.src.dir}" verbose="true" overwrite="true" failonerror="true">
+        <fileset dir="${c.src.dir}">
+          <include name="configure.ac.in"/>
+          <include name="include/zookeeper_version.h.in"/>
+        </fileset>
+        <mapper>
+          <globmapper from="*.in" to="*"/>
+        </mapper>
+        <filterchain>
+          <striplinecomments>
+	     <comment value="!" />
+	  </striplinecomments>
+          <expandproperties />
+        </filterchain>
+      </copy>
+    </target>
+    
     <target name="ivy-retrieve-mvn-ant-task" depends="init,ivy-init">
       <ivy:retrieve settingsRef="${ant.project.name}" conf="mvn-ant-task"
                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>

src/c/configure.ac → src/c/configure.ac.in

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([zookeeper C client],3.4.0,[user@zookeeper.apache.org],[zookeeper])
+AC_INIT([zookeeper C client],${version-major}.${version-minor}.${version-patch},[user@zookeeper.apache.org],[zookeeper])
 AC_CONFIG_SRCDIR([src/zookeeper.c])
 
 # Save initial CFLAGS and CXXFLAGS values before AC_PROG_CC and AC_PROG_CXX

src/c/include/zookeeper_version.h → src/c/include/zookeeper_version.h.in

@@ -22,9 +22,9 @@
 extern "C" {
 #endif
 
-#define ZOO_MAJOR_VERSION 3
-#define ZOO_MINOR_VERSION 4
-#define ZOO_PATCH_VERSION 0
+#define ZOO_MAJOR_VERSION ${version-major}
+#define ZOO_MINOR_VERSION ${version-minor}
+#define ZOO_PATCH_VERSION ${version-patch}
 
 #ifdef __cplusplus
 }