Add AS support in MSG and java bindings

[simgrid.git] / src / bindings / java / org / simgrid / msg / Msg.java

diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java
index e6938fb..5e67165 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Msg.java
+++ b/src/bindings/java/org/simgrid/msg/Msg.java
@@ -37,7 +37,11 @@ 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")+"/";
+
                String filename=name;
                InputStream in = Msg.class.getClassLoader().getResourceAsStream(Path+filename);
                
@@ -179,6 +183,8 @@ public final class Msg {
         */
        public final static native void createEnvironment(String platformFile);
 
+       public final static native As environmentGetRoutingRoot();
+
        /**
         * The method to deploy the simulation.
         *