draft

Author: james-willis

build.gradle

@@ -28,6 +28,7 @@ model {
         }
     }
 
+    // TODO architecture specific configurations
     components {
         jpostal(NativeLibrarySpec) {
             binaries.all {
@@ -57,9 +58,16 @@ model {
 
 classes.dependsOn 'jpostalSharedLibrary'
 
-
-application {
-    applicationDefaultJvmArgs = ["-Djava.library.path=" + file("${buildDir}/libs/jpostal/shared").absolutePath]
+// Replacing lib path with resources
+processResources.dependsOn(':linkJpostalSharedLibrary')
+sourceSets {
+    main {
+        resources {
+            // Example: if native libs are built into 'build/libs/native'
+            // This is a simplified example; actual paths depend on native plugins
+            srcDir "$buildDir/libs/jpostal/shared"
+        }
+    }
 }
 
 

src/main/java/com/mapzen/jpostal/Config.java

@@ -1,8 +1,11 @@
 package com.mapzen.jpostal;
 
+import java.io.*;
 import java.util.Objects;
 
 public final class Config {
+    private static boolean libLoaded = false;
+
     private final String dataDir;
     private final String libraryFile;
 
@@ -23,7 +26,7 @@ void loadLibrary() {
         if (this.libraryFile != null) {
             System.load(this.libraryFile);
         } else {
-            System.loadLibrary("jpostal");
+            loadLibraryFromJar("jpostal");
         }
     }
 
@@ -72,4 +75,48 @@ public Builder libraryFile(final String libraryFile) {
             return this;
         }
     }
+
+    public static synchronized void loadLibraryFromJar(String libraryName) {
+        if (libLoaded) {
+            return;
+        }
+
+        try {
+            String osName = System.getProperty("os.name").toLowerCase();
+            String nativeLibFileName;
+            String fullPathInJar;
+            if (osName.contains("nix") || osName.contains("nux") || osName.contains("aix")) {
+                nativeLibFileName = "lib" + libraryName + ".so";
+            } else if (osName.contains("mac")) {
+                nativeLibFileName = "lib" + libraryName + ".dylib";
+            } else {
+                throw new UnsupportedOperationException("Unsupported OS: " + osName);
+            }
+            fullPathInJar = "/" + nativeLibFileName;
+
+            InputStream in = Config.class.getResourceAsStream(fullPathInJar);
+            if (in == null) {
+                throw new UnsatisfiedLinkError("Native library " + fullPathInJar + " not found in JAR.");
+            }
+
+            File tempFile = File.createTempFile("lib", nativeLibFileName.substring(nativeLibFileName.lastIndexOf('.')));
+            tempFile.deleteOnExit();
+
+            try (OutputStream out = new FileOutputStream(tempFile)) {
+                byte[] buffer = new byte[8192];
+                int bytesRead;
+                while ((bytesRead = in.read(buffer)) != -1) {
+                    out.write(buffer, 0, bytesRead);
+                }
+            } finally {
+                in.close();
+            }
+
+            System.load(tempFile.getAbsolutePath());
+            libLoaded = true;
+
+        } catch (IOException e) {
+            throw new UnsatisfiedLinkError("Failed to load native library " + libraryName + ": " + e.getMessage());
+        }
+    }
 }