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-nativewindow.xml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

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

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 881e322d5..76fc5a287 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -795,6 +795,18 @@
               <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
           </filterset>
         </copy>
+        <copy file="${manifestfile}-natives"
+          tofile="${build.nativewindow}/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">
@@ -832,11 +844,11 @@
                      includes="${java.part.core}"
                      excludes="${java.part.awt} ${java.part.x11} ${java.part.windows}"/>
         </jar>
-        <jar manifest="${build.nativewindow}/manifest.mf" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
-            <fileset dir="${obj.nativewindow}">
-              <include name="*.${native.library.suffix}" />
-            </fileset>
-        </jar>
+        <native.tag.jar objdir="${obj.nativewindow}"
+                        nativejarfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar"
+                        manifestfile="${build.nativewindow}/manifest-natives.mf"
+                        module="nativewindow"
+                        includelibs="*.${native.library.suffix}" />
     </target>
 
     <!-- ================================================================== -->
-- 
cgit v1.2.3