Android: proper version.code and test manifest

3 files changed, 27 insertions, 3 deletions

diff --git a/make/build-test.xml b/make/build-test.xml
index 3b7aaccf1..75c319068 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -69,7 +69,7 @@
             android.abi="${android.abi}"
             androidmanifest.path="resources/android/AndroidManifest-test.xml"
             androidresources.path="resources/android/res-test"
-            jarmanifest.path="${build.jogl}/manifest.mf"
+            jarmanifest.path="${build.test}/manifest-test.mf"
             version.code="${jogl_int_version}"
             version.name="${jogl.version.plus}" />
     </target>
@@ -94,7 +94,18 @@
                 <exclude name="**/*.java"/>
             </fileset>
         </copy>
-        <jar destfile="${jogl.test.jar}" filesonly="true">
+        <copy file="joglversion-test"
+            tofile="${build.test}/manifest-test.mf"
+            overwrite="true">
+            <filterset>
+                <filter token="VERSION" value="${jogl.version}"/>
+                <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+                <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+                <filter token="BASEVERSION" value="${jogl_base_version}"/>
+            </filterset>
+        </copy>
+
+        <jar manifest="${build.test}/manifest-test.mf" destfile="${jogl.test.jar}" filesonly="true">
             <!-- get all class files, but skip any resource files that external tools
                  might have copied into the class directory (otherwise, it's possible
                  to get the same resource file twice in the jar) -->
diff --git a/make/joglversion-test b/make/joglversion-test
new file mode 100644
index 000000000..23c80f997
--- /dev/null
+++ b/make/joglversion-test
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Specification-Title: Test Java Bindings for OpenGL API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: Test Java Bindings for OpenGL Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: com.jogamp.opengl.test
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/versions.xml b/make/versions.xml
index f679895f1..6e320bc50 100644
--- a/make/versions.xml
+++ b/make/versions.xml
@@ -12,7 +12,7 @@
        betas before release candidates to give the Community time to
        react.-->
   <property name="jogl_base_version" value="2.0" />
-  <property name="jogl_int_version"  value="4" />
+  <property name="jogl_int_version"  value="0914008" /> <!-- xxyyzzz, xx=API yy screen-from-to zzz app-version-->
 
   <!-- Uncomment this property in order to produce a JOGL release
        build without running the "RI" (Reference Implementation)