From e4c51369141808d61902511c738c5243c9badc62 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 28 Mar 2013 21:20:46 +0100
Subject: Adapt to new version scheme, see GlueGen
 a3f2ef50ad33c58a240a17fcf03e415d772207c3, etc

---
 make/build-test.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'make/build-test.xml')

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">
-- 
cgit v1.2.3