A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into v3.20-expose-simgrid-jni
[simgrid.git]
/
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
660158a
..
7fb1103
100644
(file)
--- a/
src/bindings/java/org/simgrid/NativeLib.java
+++ b/
src/bindings/java/org/simgrid/NativeLib.java
@@
-79,7
+79,7
@@
public final class NativeLib {
System.err.println();
cause.printStackTrace();
} else {
System.err.println();
cause.printStackTrace();
} else {
- System.err.println("This jar file does not seem to fit your system, and no usable SimGrid installation found on disk.");
+ System.err.println("This jar file does not seem to fit your system, and no usable SimGrid installation found on disk
for "+name+"
.");
}
System.exit(1);
}
}
System.exit(1);
}
@@
-142,11
+142,11
@@
public final class NativeLib {
else if ("x86_64".equalsIgnoreCase(arch) || "AMD64".equalsIgnoreCase(arch))
arch = "amd64";
else if ("x86_64".equalsIgnoreCase(arch) || "AMD64".equalsIgnoreCase(arch))
arch = "amd64";
- if (os.toLowerCase().startsWith("win")){
+ if (os.toLowerCase().startsWith("win"))
{
os = "Windows";
os = "Windows";
- } else if (os.contains("OS X"))
+ } else if (os.contains("OS X"))
{
os = "Darwin";
os = "Darwin";
-
+ }
os = os.replace(' ', '_');
arch = arch.replace(' ', '_');
os = os.replace(' ', '_');
arch = arch.replace(' ', '_');