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-jogl.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-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 64e1c4508..4efe992de 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1741,6 +1741,18 @@ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> </filterset> </copy> + <copy file="${manifestfile}-natives" + tofile="${build.jogl}/manifest-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="build-jars-os-desktop-javase" depends="setup-manifestfile"> @@ -1857,17 +1869,18 @@ <fileset dir="${classes}" includes="${java.part.nv-cg}"/> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${obj.jogl}"> - <include name="*.${native.library.suffix}" /> - <exclude name="*jogl_cg.${native.library.suffix}" /> - </fileset> - </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-cg-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${obj.jogl}"> - <include name="*jogl_cg.${native.library.suffix}" /> - </fileset> - </jar> + <native.tag.jar objdir="${obj.jogl}" + nativejarfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" + manifestfile="${build.jogl}/manifest-natives.mf" + module="opengl" + includelibs="*.${native.library.suffix}" + excludelibs="*jogl_cg.${native.library.suffix}" /> + + <native.tag.jar objdir="${obj.jogl}" + nativejarfile="${build.jogl}/jogl-cg-natives-${os.and.arch}.jar" + manifestfile="${build.jogl}/manifest-natives.mf" + module="cg" + includelibs="*jogl_cg.${native.library.suffix}" /> </target> <!-- ================================================================== --> |