diff options
| author | Sven Gothel <[email protected]> | 2014-07-11 03:09:58 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-07-11 03:09:58 +0200 |
| commit | 37760af388303834e359703aad9562ce6165845f (patch) | |
| tree | a52a04c1fb7f7cc1d53b2505706457142e3a5159 /make/build.xml | |
| parent | 1b0ffca8d067037150e38c5b87f66a299f253dea (diff) | |
Bug 1024: Add fallback for native-jar-file location via classpath
Adapt to GlueGen commit f5c48efcf546ba4e08e197ccced6df83b57e1755
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index 50a0cfc28..f572ee5d5 100644 --- a/make/build.xml +++ b/make/build.xml @@ -115,6 +115,18 @@ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> </filterset> </copy> + <copy file="joglversion-all-natives" + tofile="${build}/manifest-all-natives.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"> @@ -160,12 +172,12 @@ </zips> </archives> </jar> - <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}" /> - </fileset> - </jar> + <native.tag.jar objdir="${lib}" + nativejarfile="${jar}/jogl-all-natives-${os.and.arch}.jar" + manifestfile="${build}/manifest-all-natives.mf" + module="opengl" + includelibs="*.${native.library.suffix}" + excludelibs="*jogl_cg.${native.library.suffix}" /> <!-- Produce duplicates for diff 'all' configuration, since non-native-jar aliasing (Bug 1023/Bug 1024) --> <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-noawt-natives-${os.and.arch}.jar" /> <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-mobile-natives-${os.and.arch}.jar" /> |