Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Java didn't report the same OS name as Cmake for Windows platform, force it to be...
authorAugustin Degomme <degomme@idpann.imag.fr>
Tue, 19 Feb 2013 16:24:33 +0000 (17:24 +0100)
committerAugustin Degomme <degomme@idpann.imag.fr>
Tue, 19 Feb 2013 16:24:33 +0000 (17:24 +0100)
src/bindings/java/org/simgrid/msg/Msg.java

index e6938fb..3ec72e8 100644 (file)
@@ -37,7 +37,12 @@ public final class Msg {
                nativeInit();
        }
        private static void loadLib (String name) {
-               String Path = "NATIVE/"+System.getProperty("os.name")+"/"+System.getProperty("os.arch")+"/";
+         String Os = System.getProperty("os.name");
+         //Windows may report its name in java differently from cmake, which generated the path
+               if(Os.toLowerCase().indexOf("win") >= 0) Os = "Windows";
+               String Path = "NATIVE/"+Os+"/"+System.getProperty("os.arch")+"/";
+                               System.out.println("loading from " +Path);
+
                String filename=name;
                InputStream in = Msg.class.getClassLoader().getResourceAsStream(Path+filename);