[gluegen2] 01/06: Fix a few remaining glitches in patch renamedLibrary.diff

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository gluegen2.

commit 1a683153508f9d6b370d031c4b873e84eca47763
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Oct 10 01:30:17 2015 +0000

    Fix a few remaining glitches in patch renamedLibrary.diff
    
    Now the native library is generated with its new name by the ant build
    system.
---
 debian/patches/renamedLibrary.diff | 50 ++++++++++++++++++++++++++++++++------
 debian/rules                       |  2 +-
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/debian/patches/renamedLibrary.diff b/debian/patches/renamedLibrary.diff
index 58ce448..1bec7c6 100644
--- a/debian/patches/renamedLibrary.diff
+++ b/debian/patches/renamedLibrary.diff
@@ -1,6 +1,8 @@
---- a/src/junit/com/jogamp/common/util/TestTempJarCache.java
-+++ b/src/junit/com/jogamp/common/util/TestTempJarCache.java
-@@ -196,8 +196,8 @@
+Index: gluegen2/src/junit/com/jogamp/common/util/TestTempJarCache.java
+===================================================================
+--- gluegen2.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java
++++ gluegen2/src/junit/com/jogamp/common/util/TestTempJarCache.java
+@@ -196,8 +196,8 @@ public class TestTempJarCache extends Si
      @Test
      public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
          if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
@@ -11,9 +13,11 @@
          final ClassLoader cl = getClass().getClassLoader();
  
          final Uri jarUri = JarUtil.getJarUri(TempJarCache.class.getName(), cl);
---- a/src/java/com/jogamp/common/os/Platform.java
-+++ b/src/java/com/jogamp/common/os/Platform.java
-@@ -256,7 +256,7 @@
+Index: gluegen2/src/java/com/jogamp/common/os/Platform.java
+===================================================================
+--- gluegen2.orig/src/java/com/jogamp/common/os/Platform.java
++++ gluegen2/src/java/com/jogamp/common/os/Platform.java
+@@ -256,7 +256,7 @@ public class Platform extends PlatformPr
      private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
  
      /** fixed basename of JAR file and native library */
@@ -22,7 +26,7 @@
  
      //
      // static initialization order:
-@@ -317,7 +317,7 @@
+@@ -317,7 +317,7 @@ public class Platform extends PlatformPr
                  DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
  
                  // JVM bug workaround
@@ -31,7 +35,7 @@
  
                  // AWT Headless determination
                  if( !PropertyAccess.getBooleanProperty("java.awt.headless", true) &&
-@@ -350,7 +350,7 @@
+@@ -350,7 +350,7 @@ public class Platform extends PlatformPr
      }
  
      /**
@@ -40,3 +44,33 @@
       */
      public static void initSingleton() { }
  
+Index: gluegen2/make/build.xml
+===================================================================
+--- gluegen2.orig/make/build.xml
++++ gluegen2/make/build.xml
+@@ -413,7 +413,7 @@
+       <property name="c.compiler.src.files.common" value="src/native/common/*.c" />
+       <property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" />
+ 
+-      <property name="output.lib.name" value="gluegen-rt" />
++      <property name="output.lib.name" value="gluegen2-rt" />
+       <condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition>
+       <condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition>
+       <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>
+@@ -490,13 +490,13 @@
+       <antcall target="c.manifest" inheritRefs="true" />
+ 
+       <native.tag.jar objdir="${build}/obj"
+-                      nativejarfile="${build}/gluegen-rt-natives-${os.and.arch}.jar"
++                      nativejarfile="${build}/gluegen2-rt-natives-${os.and.arch}.jar"
+                       manifestfile="${build}/Manifest-rt-natives.temp" 
+                       module="common"
+-                      includelibs="*gluegen-rt.${native.library.suffix}" />
++                      includelibs="*gluegen2-rt.${native.library.suffix}" />
+ 
+       <!-- Produce duplicates for different configurations, since non-native-jar aliasing (Bug 1023/Bug 1024) -->
+-      <copy file="${build}/gluegen-rt-natives-${os.and.arch}.jar" tofile="${build}/gluegen-rt-android-natives-${os.and.arch}.jar"/>
++      <copy file="${build}/gluegen2-rt-natives-${os.and.arch}.jar" tofile="${build}/gluegen-rt-android-natives-${os.and.arch}.jar"/>
+     </target>  
+ 
+   <!-- ================================================================== -->
diff --git a/debian/rules b/debian/rules
index 37596f3..906dd06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ install/libgluegen2-build-java::
 	rm debian/libgluegen2-build-java/usr/share/gluegen2/src/java/com/jogamp/gluegen/cgram/license.txt
 
 install/libgluegen2-jni::
-	install -m 644 -D build/obj/libgluegen-rt.so debian/libgluegen2-jni/usr/lib/jni/libgluegen2-rt.so
+	install -m 644 -D build/obj/libgluegen2-rt.so debian/libgluegen2-jni/usr/lib/jni/libgluegen2-rt.so
 
 install/libgluegen2-doc::
 	$(DEB_ANT_INVOKE) javadoc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git