Adapt to new version scheme, see GlueGen a3f2ef50ad33c58a240a17fcf03e415d772207c3, etc

5 files changed, 23 insertions, 20 deletions

diff --git a/make/build-test.xml b/make/build-test.xml
index 31f5f9c..c9df712 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -52,6 +52,8 @@
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
 
     <target name="declare.common" depends="jogamp.env.init, gluegen.cpptasks.detect.os">
+        <property name="joal.version"         value="${jogamp.version.base}-${version.timestamp}" />
+
         <property name="project.root"         value=".." />
         <property name="build"                value="${project.root}/${rootrel.build}" />
 
@@ -84,7 +86,7 @@
         <mkdir dir="${classes.test}"/>
     </target>
 
-    <target name="test.compile.javase">
+    <target name="test.compile.javase" depends="declare.common" >
         <javac destdir="${classes.test}" 
                excludes="${java.part.test.android}"
                fork="yes"
@@ -101,10 +103,11 @@
             tofile="${build.test}/manifest-test.mf"
             overwrite="true">
             <filterset>
-                <filter token="VERSION" value="${joal.version}"/>
+                <filter token="VERSION" value="${jogamp.version}"/>
+                <filter token="BUILD_VERSION" value="${joal.version}"/>
                 <filter token="SCM_BRANCH" value="${joal.build.branch}"/>
                 <filter token="SCM_COMMIT" value="${joal.build.commit}"/>
-                <filter token="BASEVERSION" value="${joal_base_version}"/>
+                <filter token="BASEVERSION" value="${jogamp.version.base}"/>
             </filterset>
         </copy>
         <jar manifest="${build.test}/manifest-test.mf" destfile="${build}/joal-test.jar">
@@ -135,10 +138,11 @@
             tofile="${build.test}/manifest-test-android.mf"
             overwrite="true">
             <filterset>
-                <filter token="VERSION" value="${joal.version}"/>
+                <filter token="VERSION" value="${jogamp.version}"/>
+                <filter token="BUILD_VERSION" value="${joal.version}"/>
                 <filter token="SCM_BRANCH" value="${joal.build.branch}"/>
                 <filter token="SCM_COMMIT" value="${joal.build.commit}"/>
-                <filter token="BASEVERSION" value="${joal_base_version}"/>
+                <filter token="BASEVERSION" value="${jogamp.version.base}"/>
             </filterset>
         </copy>
         <jar manifest="${build.test}/manifest-test-android.mf" destfile="${build}/joal-test-android.jar" filesonly="true">
@@ -161,8 +165,8 @@
             androidmanifest.path="resources/android/AndroidManifest-test.xml"
             androidresources.path="resources/android/res-test"
             jarmanifest.path="${build.test}/manifest-test-android.mf"
-            version.code="${joal_int_version}"
-            version.name="${joal.version.plus}" />
+            version.code="${jogamp.version.int}"
+            version.name="${jogamp.version}" />
     </target>
 
     <target name="test.compile" depends="declare.common" unless="test.compile.skip">
diff --git a/make/build.xml b/make/build.xml
index 40e72c0..8a7dc6b 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -44,11 +44,6 @@
     <property name="gluegen.build" value="${gluegen.root}/${rootrel.build}" />
 
     <!-- This is the version of JOAL you are building -->
-    <property name="joal_base_version" value="2.0"/>
-    <property name="joal_int_version"  value="2"/>
-    <tstamp>
-        <format property="version.timestamp" pattern="yyyyMMdd"/>
-    </tstamp>
     <property name="joal.build.number" value="manual-build"/>
     <property name="joal.build.id"     value="${version.timestamp}"/>
     <mkdir dir="${build}" />
@@ -66,8 +61,6 @@
         <arg line="rev-parse HEAD"/>
     </exec>
     <property name="joal.build.commit" value="manual"/> <!-- fallback -->
-    <property name="joal.version"      value="${joal_base_version}-${version.timestamp}" />
-    <property name="joal.version.plus" value="${joal_base_version}-${joal.build.branch}-b${joal.build.number}-${joal.build.commit}-${version.timestamp}" />
 
     <!-- Pull in GlueGen cpptasks build file -->
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
@@ -94,6 +87,8 @@
       -->
     <target name="init" depends="jogamp.env.init, gluegen.cpptasks.detect.os">
 
+        <property name="joal.version"      value="${jogamp.version.base}-${version.timestamp}" />
+
         <!-- The location and name of the configuration ANT file that will
            - validate to ensure that all user-define variables are set. -->
         <property name="validate.user.properties" value="${make}/validate-properties.xml" />
@@ -526,16 +521,17 @@
     <!--
        - Build the joal.jar file.
       -->
-    <target name="jar">
+    <target name="jar" depends="init">
         <!-- Prepare the manifest -->
         <copy file="joalversion"
           tofile="tempversion"
           overwrite="true">
             <filterset>
-                <filter token="VERSION" value="${joal.version}"/>
+                <filter token="VERSION" value="${jogamp.version}"/>
+                <filter token="BUILD_VERSION" value="${joal.version}"/>
                 <filter token="SCM_BRANCH" value="${joal.build.branch}"/>
                 <filter token="SCM_COMMIT" value="${joal.build.commit}"/>
-                <filter token="BASEVERSION" value="${joal_base_version}" />
+                <filter token="BASEVERSION" value="${jogamp.version.base}" />
             </filterset>
         </copy>
 
@@ -553,7 +549,7 @@
         <delete file="tempversion"/>
     </target>
 
-    <target name="android.package" if="isAndroid">
+    <target name="android.package" depends="init" if="isAndroid">
         <aapt.signed 
             jarsrcdir="${src.java}"
             jarbuilddir="${build}"
@@ -564,8 +560,8 @@
             androidmanifest.path="resources/android/AndroidManifest-joal.xml"
             androidresources.path="resources/android/res-joal"
             jarmanifest.path="tempversion"
-            version.code="${joal_int_version}"
-            version.name="${joal.version.plus}" />
+            version.code="${jogamp.version.int}"
+            version.name="${jogamp.version}" />
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/joalversion b/make/joalversion
index ee7d012..d670b2b 100755
--- a/make/joalversion
+++ b/make/joalversion
@@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@
 Specification-Vendor: JogAmp Community
 Implementation-Title: Java Bindings for OpenAL Runtime Environment
 Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
 Implementation-Vendor: JogAmp Community
diff --git a/make/joalversion-test b/make/joalversion-test
index 43d9c28..388b171 100644
--- a/make/joalversion-test
+++ b/make/joalversion-test
@@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@
 Specification-Vendor: JogAmp Community
 Implementation-Title: Test Java Bindings for OpenAL Runtime Environment on Android
 Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
 Implementation-Vendor: JogAmp Community
diff --git a/make/joalversion-test-android b/make/joalversion-test-android
index 43d9c28..388b171 100644
--- a/make/joalversion-test-android
+++ b/make/joalversion-test-android
@@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@
 Specification-Vendor: JogAmp Community
 Implementation-Title: Test Java Bindings for OpenAL Runtime Environment on Android
 Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
 Implementation-Vendor: JogAmp Community