X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9dbeb2372ad9a123d0558132ebb6e003e10aa641..ad9181ca3aecc03d492eeb63def4370769a32d00:/src/bindings/java/org/simgrid/NativeLib.java

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 82c5c12e3f..4e61de9c82 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -20,13 +20,14 @@ public final class NativeLib {
 
 		if (arch.matches("^i[3-6]86$"))
 			arch = "x86";
-		else if (arch.equalsIgnoreCase("amd64"))
-			arch = "x86_64";
+		else if (arch.equalsIgnoreCase("x86_64"))
+			arch = "amd64";
+		else if (arch.equalsIgnoreCase("AMD64"))
+			arch = "amd64";
 
 		if (os.toLowerCase().startsWith("win")){
 			os = "Windows";
-			arch = "x86";
-		}else if (os.contains("OS X"))
+		} else if (os.contains("OS X"))
 			os = "Darwin";
 
 		os = os.replace(' ', '_');
@@ -60,19 +61,19 @@ public final class NativeLib {
 		if (in == null) {
 			filename = "lib"+name+".so";
 			in = NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-		} 
+		}
 		if (in == null) {
 			filename = name+".dll";
 			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-		}  
+		}
 		if (in == null) {
 			filename = "lib"+name+".dll";
 			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-		}  
+		}
 		if (in == null) {
 			filename = "lib"+name+".dylib";
 			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-		}  
+		}
 		if (in == null) {
 			throw new SimGridLibNotFoundException("Cannot find library "+name+" in path "+Path+". Sorry, but this jar does not seem to be usable on your machine.");
 		}
@@ -94,8 +95,9 @@ public final class NativeLib {
 			in.close();
 			out.close();
 			System.load(fileOut.getAbsolutePath());
-
 		} catch (Exception e) {
+			System.err.println("Error while extracting the native library from the jar: ");
+			e.printStackTrace();
 			throw new SimGridLibNotFoundException("Cannot load the bindings to the "+name+" library in path "+getPath(),   e);
 		}
 	}
@@ -118,11 +120,7 @@ public final class NativeLib {
 
 
 	public static void main(String[] args) {
-		if (args.length >= 1 && args[0].equals("--quiet"))
-			/* be careful, this execution path is used in buildtools/Cmake/Scripts/java_bundle.sh to determine where to put the libs */
-			System.out.println(getPath());
-		else 
-			System.out.println("This java library will try to load the native code under the following name:\n" +getPath());
+		System.out.println("This jarfile searches the native code under: " +getPath());
 	}
 }