Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Force windows jar to bundle into x86, as we only build/support 32 bits version
authorAugustin Degomme <degomme@idpann.imag.fr>
Mon, 7 Apr 2014 08:52:32 +0000 (10:52 +0200)
committerAugustin Degomme <degomme@idpann.imag.fr>
Mon, 7 Apr 2014 08:52:32 +0000 (10:52 +0200)
src/bindings/java/org/simgrid/NativeLib.java

index cf024b6..5d6a1bc 100644 (file)
@@ -18,16 +18,17 @@ public final class NativeLib {
         String os = System.getProperty("os.name");
         String arch = System.getProperty("os.arch");
 
         String os = System.getProperty("os.name");
         String arch = System.getProperty("os.arch");
 
-        if (os.toLowerCase().startsWith("^win"))
-            os = "Windows";
-        else if (os.contains("OS X"))
-            os = "Darwin";
-
         if (arch.matches("^i[3-6]86$"))
             arch = "x86";
         else if (arch.equalsIgnoreCase("amd64"))
             arch = "x86_64";
 
         if (arch.matches("^i[3-6]86$"))
             arch = "x86";
         else if (arch.equalsIgnoreCase("amd64"))
             arch = "x86_64";
 
+        if (os.toLowerCase().startsWith("^win")){
+            os = "Windows";
+            arch = "x86";
+        }else if (os.contains("OS X"))
+            os = "Darwin";
+
         os = os.replace(' ', '_');
         arch = arch.replace(' ', '_');
 
         os = os.replace(' ', '_');
         arch = arch.replace(' ', '_');