From 0af92b17f90b6a8194d70c7821cb74a920227786 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Thu, 13 Jul 2006 21:54:52 +0000
Subject: [PATCH] move some version stuff to version.properties

---
 bindings/java/build.xml          | 13 +++++--------
 bindings/java/version.properties |  6 ++++++
 2 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 bindings/java/version.properties

diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index 712559db..f26f344a 100644
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -4,12 +4,10 @@
 
 <project name="Sigar" default="build" basedir=".">
 
-  <property name="copyright.year" value="2004-2006"/>
-  <property name="version.major" value="1"/>
-  <property name="version.minor" value="2"/>
-  <property name="version.maint" value="0"/>
+  <property file="version.properties"/>
+
   <property name="sigar.version"
-            value="${version.major}.${version.minor}.${version.maint}"/>
+            value="${version.major}.${version.minor}.${version.maint}.${version.build}"/>
 
   <property file="${user.home}/.sigar-build.properties"/>
   <property name="project.name" value="sigar"/>
@@ -107,6 +105,7 @@
       <replacefilter token="@@VERSION_MAJOR@@" value="${version.major}"/>
       <replacefilter token="@@VERSION_MINOR@@" value="${version.minor}"/>
       <replacefilter token="@@VERSION_MAINT@@" value="${version.maint}"/>
+      <replacefilter token="@@VERSION_BUILD@@" value="${version.build}"/>
       <replacefilter token="@@COPYRIGHT_YEAR@@" value="${copyright.year}"/>
     </replace>
   </target>
@@ -124,8 +123,6 @@
     <antcall target="version-file">
        <param name="version.file.srcdir"
               value="../.."/>
-       <param name="version.file.dstdir"
-              value="${jni.libarch}"/>
        <param name="version.file"
               value="src/sigar_version.c"/>
     </antcall>
@@ -160,7 +157,7 @@
       <include name="bindings/java/src/jni/*.c"/>
       <include name="bindings/java/src/${win32.jni}/*.cpp"/>
       <include name="bindings/java/src/${win32.jni}/*.c"/>
-      <include name="bindings/java/build/${jni.libarch}/src/*.c"/>
+      <include name="bindings/java/build/src/sigar_version.c"/>
     </patternset>
 
     <path id="jni.include.dirs">
diff --git a/bindings/java/version.properties b/bindings/java/version.properties
new file mode 100644
index 00000000..46cf251f
--- /dev/null
+++ b/bindings/java/version.properties
@@ -0,0 +1,6 @@
+copyright.year=2004-2006
+version.major=1
+version.minor=2
+version.maint=0
+version.build=0
+