Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Remove the ability to write internal plugins in Java
[simgrid.git] / src / bindings / java / org / simgrid / NativeLib.java
index cdb7710..7c08bc2 100644 (file)
@@ -23,8 +23,10 @@ public final class NativeLib {
                if (System.getProperty("os.name").toLowerCase().startsWith("win"))
                        NativeLib.nativeInit("winpthread-1");
 
+               try {
+                       NativeLib.nativeInit("boost_context");
+               } catch (Exception e) {/* Dont care */}
                NativeLib.nativeInit("simgrid");
-               NativeLib.nativeInit("surf-java");
                NativeLib.nativeInit("simgrid-java");      
                isNativeInited = true;
        }
@@ -38,15 +40,18 @@ public final class NativeLib {
                        try {
                                System.loadLibrary(name);
                        } catch (UnsatisfiedLinkError e2) {
-                               System.err.println("Cannot load the bindings to the "+name+" library in path "+getPath());
-                               e.printStackTrace();
-                               System.err.println("This jar file does not seem to fit your system, and I cannot find an installation of SimGrid.");
-                               System.exit(1);
+                               if (! name.equals("boost_context")) {
+                                       System.err.println("Cannot load the bindings to the "+name+" library in path "+getPath());
+                                       e.printStackTrace();
+                                       System.err.println("This jar file does not seem to fit your system, and I cannot find an installation of SimGrid.");
+                                       System.exit(1);
+                               }
                        }
                }
        }
 
        public static String getPath() {
+               // Inspiration: https://github.com/xerial/snappy-java/blob/develop/src/main/java/org/xerial/snappy/OSInfo.java
                String prefix = "NATIVE";
                String os = System.getProperty("os.name");
                String arch = System.getProperty("os.arch");