changed extract path in native loader to contain version

BestSolution-at · Jul 27, 2020 · f7ecd6f · f7ecd6f
1 parent a4e35f5
commit f7ecd6f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/org.eclipse.fx.drift.java11/build.gradle b/org.eclipse.fx.drift.java11/build.gradle
@@ -4,6 +4,11 @@ plugins {
     id 'eclipse'
 }
 
+java {
+	sourceCompatibility = JavaVersion.VERSION_11
+	targetCompatibility = JavaVersion.VERSION_11
+}
+
 
 eclipse {
 	project {

diff --git a/org.eclipse.fx.drift.java8/build.gradle b/org.eclipse.fx.drift.java8/build.gradle
@@ -3,6 +3,11 @@ plugins {
     id 'eclipse'
 }
 
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 
 eclipse {
 	project {

diff --git a/org.eclipse.fx.drift/build.gradle b/org.eclipse.fx.drift/build.gradle
@@ -3,6 +3,12 @@ plugins {
     id 'eclipse'
 }
 
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+
 eclipse {
 	project {
 

diff --git a/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/internal/NativeLoader.java b/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/internal/NativeLoader.java
@@ -9,6 +9,9 @@
 
 public class NativeLoader {
 
+	private static final boolean USE_JAVA_LIBRARY_PATH = Boolean.getBoolean("driftfx.use.java.library.path");
+
+
 	private static String OS = null;
 
 	public static String getOsName() {
@@ -32,10 +35,9 @@ public static boolean isMacOs() {
 
 	/*package*/ static boolean osgi = false;
 
-	private static boolean useJavaLibraryPath = Boolean.getBoolean("driftfx.use.java.library.path");
-
+
 	public static void loadLibrary(Class<?> context, String libname) {
-		if (useJavaLibraryPath || osgi) {
+		if (USE_JAVA_LIBRARY_PATH || osgi) {
 			// osgi will take care of it
 			System.loadLibrary(libname);
 		}
@@ -44,11 +46,11 @@ public static void loadLibrary(Class<?> context, String libname) {
 
 			String filename = getFilename(libname);
 			Path tmpDir = Paths.get(System.getProperty("java.io.tmpdir"));
-			Path extractPath = tmpDir.resolve("driftfx").resolve(filename);
+			Path extractPath = tmpDir.resolve("driftfx").resolve(Versioning.getVersion()).resolve(filename);
 
 			String resourceName = "/native/" + filename;
 			URL url = context.getResource(resourceName);
-			System.err.println("Resource Lookup: name: " + resourceName + ", context: " + context + " => " + url);
+			Log.debug("Resource Lookup: name: " + resourceName + ", context: " + context + " => " + url);
 
 			try (InputStream in = context.getResourceAsStream("/native/" + filename)) {
 				extract(in, extractPath);

diff --git a/settings.gradle b/settings.gradle
@@ -1,9 +1,10 @@
-rootProject.name = 'driftfx'
-
-include 'native'
-include 'native:driftfx'
-include 'native:driftcpp'
-
-include 'org.eclipse.fx.drift'
-include 'org.eclipse.fx.drift.java8'
-include 'org.eclipse.fx.drift.java11'
+rootProject.name = 'driftfx-root'
+
+include 'native'
+include 'native:driftfx'
+include 'native:driftcpp'
+
+include 'org.eclipse.fx.drift'
+include 'org.eclipse.fx.drift.java8'
+include 'org.eclipse.fx.drift.java11'
+