fix(jawt): revert d20409b and implement a better fix

LWJGL · Dec 7, 2017 · 95d6bfd · 95d6bfd
1 parent 7f7a521
commit 95d6bfd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/modules/core/src/main/java/org/lwjgl/system/APIUtil.java b/modules/core/src/main/java/org/lwjgl/system/APIUtil.java
@@ -13,10 +13,12 @@
 import java.lang.reflect.*;
 import java.net.*;
 import java.nio.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.function.*;
 import java.util.jar.*;
 import java.util.regex.*;
+import java.util.stream.*;
 
 import static org.lwjgl.system.Checks.*;
 import static org.lwjgl.system.MemoryUtil.*;
@@ -97,6 +99,22 @@ public static Optional<String> apiGetManifestValue(String attributeName) {
         return Optional.empty();
     }
 
+    public static String apiFindLibrary(String start, String name) {
+        String libName = Platform.get().mapLibraryName(name);
+        try (Stream<Path> paths = Files.find(
+            Paths.get(start).toAbsolutePath(),
+            Integer.MAX_VALUE,
+            (path, attributes) -> attributes.isRegularFile() && path.getFileName().toString().equals(libName)
+        )) {
+            return paths
+                .findFirst()
+                .map(Path::toString)
+                .orElse(name);
+        } catch (IOException e) {
+            return name;
+        }
+    }
+
     public static SharedLibrary apiCreateLibrary(String name) {
         switch (Platform.get()) {
             case WINDOWS:

diff --git a/modules/core/src/main/java/org/lwjgl/system/Library.java b/modules/core/src/main/java/org/lwjgl/system/Library.java
@@ -204,15 +204,14 @@ public static SharedLibrary loadNative(Class<?> context, String name) {
     public static SharedLibrary loadNative(Class<?> context, String name, boolean bundledWithLWJGL) {
         apiLog("Loading library: " + name);
 
-        String libName = Platform.get().mapLibraryName(name);
-
         // METHOD 1: absolute path
-        if (new File(libName).isAbsolute()) {
-            SharedLibrary lib = apiCreateLibrary(libName);
+        if (new File(name).isAbsolute()) {
+            SharedLibrary lib = apiCreateLibrary(name);
             apiLog("\tSuccess");
             return lib;
         }
 
+        String        libName = Platform.get().mapLibraryName(name);
         SharedLibrary lib;
 
         // METHOD 2: org.lwjgl.librarypath

diff --git a/modules/templates/src/main/kotlin/org/lwjgl/system/jawt/templates/jawt.kt b/modules/templates/src/main/kotlin/org/lwjgl/system/jawt/templates/jawt.kt
@@ -10,7 +10,7 @@ import org.lwjgl.system.jni.*
 
 val jawt = "JAWTFunctions".nativeClass(JAWT_PACKAGE, prefix = "JAWT_", prefixMethod = "JAWT_", binding = simpleBinding(
     "jawt",
-    libraryExpression = """Configuration.JAWT_LIBRARY_NAME, "jawt", System.getProperty("java.home") + "/bin/jawt"""",
+    libraryExpression = """Configuration.JAWT_LIBRARY_NAME, "jawt", apiFindLibrary(System.getProperty("java.home"), "jawt")""",
     callingConvention = CallingConvention.STDCALL
 )) {
     nativeDirective(