From bf9b7c65b8535d74ebc3e00ce1b637d7ec7698a6 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Mon, 7 Apr 2014 10:52:32 +0200 Subject: [PATCH] Force windows jar to bundle into x86, as we only build/support 32 bits version --- src/bindings/java/org/simgrid/NativeLib.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index cf024b60dc..5d6a1bca62 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -18,16 +18,17 @@ public final class NativeLib { 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 (os.toLowerCase().startsWith("^win")){ + os = "Windows"; + arch = "x86"; + }else if (os.contains("OS X")) + os = "Darwin"; + os = os.replace(' ', '_'); arch = arch.replace(' ', '_'); -- 2.20.1