diff options
| author | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
|---|---|---|
| committer | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
| commit | 9fce91044649c9f97bd94c5791a10270afad7570 (patch) | |
| tree | a69fa244ddeb78e52248d4306a4ecc6b27e924da /make/build.xml | |
| parent | 5116d72f0150bdd6353ee664ef76e414bd61f87e (diff) | |
| parent | bfb10d309d97c19a33f9b6758f647186f8e0ddd6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 0c6c97d34..2eb5a8654 100644 --- a/make/build.xml +++ b/make/build.xml @@ -96,10 +96,23 @@ <fileset dir="${build.nativewindow}" includes="*.jar" /> <fileset dir="${build.newt}" includes="*.jar" /> </copy> + + <copy file="joglversion-all" + tofile="${build}/manifest-all.mf" + overwrite="true"> + <filterset> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> + <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> + <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> + <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> + </filterset> + </copy> </target> <target name="one.jar.dir.android" depends="one.jar.dir.prep" if="android-jars.available" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-android.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build}/manifest-all.mf" destfile="${jogl-all-android.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_core_atoms.classpath"/> @@ -111,7 +124,7 @@ </target> <target name="one.jar.dir" depends="one.jar.dir.prep,one.jar.dir.android" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build}/manifest-all.mf" destfile="${jogl-all.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all_atoms.classpath"/> @@ -120,7 +133,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-noawt.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build}/manifest-all.mf" destfile="${jogl-all-noawt.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -129,7 +142,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-mobile.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build}/manifest-all.mf" destfile="${jogl-all-mobile.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -138,7 +151,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jar}/jogl-all-natives-${os.and.arch}.jar" filesonly="true"> + <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-natives-${os.and.arch}.jar" filesonly="true"> <fileset dir="${lib}"> <include name="*.${native.library.suffix}" /> <exclude name="*jogl_cg.${native.library.suffix}" /> @@ -246,6 +259,7 @@ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> <filter token="BASEVERSION" value="${jogamp.version.base}"/> + <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> </filterset> </copy> <mkdir dir="${archive}/jar" /> |