Changeset 30402 for main/trunk/greenstone2/common-src/indexers/mgpp/java

Timestamp:

2016-03-14T10:34:17+13:00 (8 years ago)

Author:

davidb

Message:

Fix for MacOS 10.11, El Capitan

Location:

main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp

Files:

• MGPPRetrieveWrapper.java (modified) (1 diff)
• MGPPSearchWrapper.java (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/MGPPRetrieveWrapper.java

@@ -31 +31 @@
   
     static {
-    System.loadLibrary("mgppretrievejni");
+    String gsdlos = System.getenv("GSDLOS");
+    if (gsdlos!=null && gsdlos.equals("darwin")) {
+        // As of MacOX 10.11 (El Capitan), effectivly supresses DYLD_LIBRARY_PATH (does
+        // not propagate it to child processes).  This is a result of changes to their
+        // security model, and seems to come into effect for 'untrusted' executables.
+        // Greenstone run as a regular user, is 'unstrusted'.  It is possible, with
+        // admin rights, to override this, however that is not really a viable solution
+        // for our project.  Hence the change here to use Systen.load() with an
+        // absolute pathname, rather than rely of System.loadLibrary().
+
+        String gsdl3srchome = System.getenv("GSDL3SRCHOME");
+        String full_jni_library = gsdl3srchome + "/lib/jni/libmgppretrievejni.jnilib";
+        System.load(full_jni_library);
+    }
+    else {
+        System.loadLibrary("mgppretrievejni");
+    }
     }
     

main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/MGPPSearchWrapper.java

@@ -41 +41 @@
 
     static {
-    System.loadLibrary("mgppsearchjni");
+    String gsdlos = System.getenv("GSDLOS");
+    if (gsdlos!=null && gsdlos.equals("darwin")) {
+        // As of MacOX 10.11 (El Capitan), effectivly supresses DYLD_LIBRARY_PATH (does
+        // not propagate it to child processes).  This is a result of changes to their
+        // security model, and seems to come into effect for 'untrusted' executables.
+        // Greenstone run as a regular user, is 'unstrusted'.  It is possible, with
+        // admin rights, to override this, however that is not really a viable solution
+        // for our project.  Hence the change here to use Systen.load() with an
+        // absolute pathname, rather than rely of System.loadLibrary().
+
+        String gsdl3srchome = System.getenv("GSDL3SRCHOME");
+        String full_jni_library = gsdl3srchome + "/lib/jni/libmgppsearchjni.jnilib";
+        System.load(full_jni_library);
+    }
+    else {
+        System.loadLibrary("mgppsearchjni");
+    }
+
     initIDs();
     }