From 37760af388303834e359703aad9562ce6165845f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 11 Jul 2014 03:09:58 +0200
Subject: Bug 1024: Add fallback for native-jar-file location via classpath

Adapt to GlueGen commit f5c48efcf546ba4e08e197ccced6df83b57e1755
---
 make/build-newt.xml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'make/build-newt.xml')

diff --git a/make/build-newt.xml b/make/build-newt.xml
index d9d2e6645..4a5997b02 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -745,6 +745,18 @@
               <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
           </filterset>
         </copy>
+        <copy file="${manifestfile}-natives"
+          tofile="${build.newt}/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-awt" depends="setup-manifestfile" unless="setup.noAWT">
@@ -829,11 +841,11 @@
     </target>
 
     <target name="build-jars-native" depends="gluegen.cpptasks.detect.os,setup-manifestfile">
-        <jar manifest="${build.newt}/manifest.mf" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
-            <fileset dir="${obj.newt}">
-              <include name="*.${native.library.suffix}" />
-            </fileset>
-        </jar>
+        <native.tag.jar objdir="${obj.newt}"
+                        nativejarfile="${build.newt}/newt-natives-${os.and.arch}.jar"
+                        manifestfile="${build.newt}/manifest-natives.mf"
+                        module="newt"
+                        includelibs="*.${native.library.suffix}" />
     </target>
 
     <!-- ================================================================== -->
-- 
cgit v1.2.3