diff options
| author | Sven Gothel <[email protected]> | 2012-05-04 15:31:50 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-05-04 15:31:50 +0200 |
| commit | a6e7b6cc08cea358c157320ff9d61d424c57e92b (patch) | |
| tree | 982bccf13e579e6bce3ce12952edb424294372fd /make/build-test.xml | |
| parent | 6021217f158965ca480c848eb69bec2169b357cb (diff) | |
Android: proper version.code and test manifest
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 15 |
1 files changed, 13 insertions, 2 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) --> |