revert anything that would interfere with publishing ffor now

Author: madhephaestus

bindings/java/pom.xml

@@ -57,8 +57,13 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.1.0</version>  <!-- pin whatever version you need -->
 				<configuration>
+					<systemProperties>
+						<property>
+							<key>java.library.path</key>
+							<value>${project.basedir}/native</value>
+						</property>
+					</systemProperties>
 					<commandlineArgs>--enable-preview
 						--enable-native-access=ALL-UNNAMED</commandlineArgs>
 				</configuration>

bindings/java/scripts/clojar.sh

@@ -14,7 +14,7 @@ echo "Clojar Version: $1"
 
 set -e
 cd bindings/java/
-mvn versions:set -DnewVersion=$1 --file pom.xml --no-transfer-progress
-mvn deploy --settings=settings.xml --no-transfer-progress
+mvn versions:set -DnewVersion=$1 --file pom.xml
+mvn deploy --settings=settings.xml
 cd ../../
 set -e

bindings/java/src/main/java/com/cadoodlecad/manifold/ManifoldBindings.java

@@ -41,15 +41,12 @@ private static void loadNativeLibrary(String libName, File cacheDirectory) throw
 			if (os.contains("win")) {
 				platform = "win-" + arch;
 				extension = ".dll";
-				libName="lib"+libName;
 			} else if (os.contains("mac")) {
 				platform = "mac-" + arch;
 				extension = ".dylib";
-				libName="lib"+libName;
 			} else if (os.contains("nix") || os.contains("nux") || os.contains("aix")) {
 				platform = "linux-" + arch;
 				extension = ".so";
-				libName="lib"+libName;
 			} else {
 				throw new RuntimeException("Unsupported OS: " + os);
 			}
@@ -77,6 +74,12 @@ private static void loadNativeLibrary(String libName, File cacheDirectory) throw
 				needsCopy = devFile.lastModified() > libFile.lastModified();
 
 			if (needsCopy) {
+//				if (devFile.exists()) {
+//					java.nio.file.Files.copy(devFile.toPath(), libFile.toPath(), 
+//						java.nio.file.StandardCopyOption.REPLACE_EXISTING,
+//						java.nio.file.StandardCopyOption.COPY_ATTRIBUTES);
+//						libFile.setExecutable(true);
+//				} else {
 				try (java.io.InputStream in = ManifoldBindings.class
 						.getResourceAsStream("/manifold3d/natives/" + platform + "/" + fullName)) {
 					if (in == null)
@@ -86,10 +89,8 @@ private static void loadNativeLibrary(String libName, File cacheDirectory) throw
 					System.out.println("Extracted to libs/: " + fullName);
 					if (cacheDirectory == null)
 						libFile.deleteOnExit();
-				}catch(Throwable t) {
-					throw new RuntimeException("Failed to load: " + libName, t);
-
 				}
+				// }
 			} else {
 				System.out.println("Copy not performed, already in cache");
 			}
@@ -102,8 +103,8 @@ private static void loadNativeLibrary(String libName, File cacheDirectory) throw
 	}
 
 	public static void loadNativeLibrarys(File cacheDirectory) throws Exception {
-		loadNativeLibrary("manifold", cacheDirectory);
-		loadNativeLibrary("manifoldc", cacheDirectory);
+		loadNativeLibrary("libmanifold", cacheDirectory);
+		loadNativeLibrary("libmanifoldc", cacheDirectory);
 	}
 
 	public ManifoldBindings() throws Exception {
@@ -112,8 +113,8 @@ public ManifoldBindings() throws Exception {
 
 	public ManifoldBindings(File cacheDirectory) throws Exception {
 		if (!isNativeLibraryLoaded()) {
-			loadNativeLibrary("manifold", cacheDirectory);
-			loadNativeLibrary("manifoldc", cacheDirectory);
+			loadNativeLibrary("libmanifold", cacheDirectory);
+			loadNativeLibrary("libmanifoldc", cacheDirectory);
 		}
 
 		this.library = SymbolLookup.loaderLookup();