[libnative-platform-java] 07/08: Fix issues on library name

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository libnative-platform-java.

commit ea42347887e61139d26e50f50371c1ed00b4abe9
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Fri Jun 5 23:40:26 2015 +0800

    Fix issues on library name
---
 debian/Makefile                                   | 5 +----
 debian/libnative-platform-jni.install             | 2 +-
 debian/patches/libname.diff                       | 9 ++++++---
 debian/patches/native_locator_usr_lib_first.patch | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 580f164..157d933 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -35,7 +35,7 @@ JAVA_SRC_NO_INTERNAL_FILEPATHS = $(shell find $(JSRCDIR) -name "*.java" ! -path
 
 .PHONY: clean jar javadoc
 
-build: $(ODIR)/libnative-platform.so $(ODIR)/libnative-platform-curses.so jar javadoc arch-jar
+build: $(ODIR)/libnative-platform.so $(ODIR)/libnative-platform-curses.so jar javadoc
 
 $(ODIR)/libnative-platform.so: $(OBJ_STD)
 	$(CXX) -shared -fPIC $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^
@@ -57,9 +57,6 @@ jar: $(JCLASSESDIR)/%.class
 	mkdir -p $(JDOCDIR)
 	(cd $(JCLASSESDIR) ; jar cf ../../$(JAR) .)
 
-arch-jar: $(ODIR)/libnative-platform.so $(ODIR)/libnative-platform-curses.so
-	(cd $(ODIR) ; $(JAVA_HOME)/bin/jar cf ../../$(JAR_ARCH) *.so)
-
 $(ODIR)/%.o: $(MAINCPPDIR)/*.cpp $(SHAREDCPPDIR)/*.cpp $(CURSESCPPDIR)/*.cpp $(IGEN)/native.h
 	mkdir -p $(ODIR)
 	$(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -c -o $(ODIR)/curses.o src/curses/cpp/curses.cpp
diff --git a/debian/libnative-platform-jni.install b/debian/libnative-platform-jni.install
index b5d2cb9..3e94c0b 100644
--- a/debian/libnative-platform-jni.install
+++ b/debian/libnative-platform-jni.install
@@ -1 +1 @@
-build/binaries/libnative-platform*.so     /usr/lib/jni/
\ No newline at end of file
+build/binaries/*.so     /usr/lib/jni/
\ No newline at end of file
diff --git a/debian/patches/libname.diff b/debian/patches/libname.diff
index 0c3e0dd..edadbfd 100644
--- a/debian/patches/libname.diff
+++ b/debian/patches/libname.diff
@@ -2,7 +2,7 @@ Description: Library name is always stable under Debian GNU/Linux
  when shared object is installed into /usr/lib/jni/
  So remove Linux32Bit / Linux64Bit handling.
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2015-06-03
+Last-Update: 2015-06-05
 Forwarded: not-needed
 --- a/src/main/java/net/rubygrapefruit/platform/internal/Platform.java
 +++ b/src/main/java/net/rubygrapefruit/platform/internal/Platform.java
@@ -22,12 +22,15 @@ Forwarded: not-needed
                  } else if (osName.contains("os x") || osName.contains("darwin")) {
                      if (arch.equals("i386")) {
                          platform = new OsX32Bit();
-@@ -187,6 +190,10 @@
+@@ -187,6 +190,13 @@
          }
      }
  
 +    private static class Linux extends Unix {
-+        
++        @Override
++        public String getId() {
++            return "linux";
++        }
 +    }
 +
      private static class Linux32Bit extends Unix {
diff --git a/debian/patches/native_locator_usr_lib_first.patch b/debian/patches/native_locator_usr_lib_first.patch
index 5ce137a..a2870cb 100644
--- a/debian/patches/native_locator_usr_lib_first.patch
+++ b/debian/patches/native_locator_usr_lib_first.patch
@@ -2,7 +2,7 @@ Description: Try to load native library [java.library.path]/libnative-platform.s
  instead of extractDir or classpath.
  It will load first file matching expected name for paths listed in java.library.path
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2014-01-19
+Last-Update: 2015-06-05
 Forwarded: no
 --- a/src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLocator.java
 +++ b/src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLocator.java
@@ -15,7 +15,7 @@ Forwarded: no
 +        String[] libPaths = System.getProperty("java.library.path").split(java.io.File.pathSeparator);
 +        	for (String libPath : libPaths) {
 +        	  // For each JNI path, try to load lib
-+        	  File libFile = new File(libPath, libraryFileName);
++        	  File libFile = new File(libPath, libraryDef.name);
 +        	  if (libFile.isFile()) {
 +        	      return libFile;
 +        	  }

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