From 8fedff1e848df79948e80f055f24f51f15341aba Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 29 Nov 2014 14:03:13 +0100 Subject: [PATCH] fix the build of java bundles, sorry --- buildtools/Cmake/Scripts/java_bundle.sh | 2 +- src/bindings/java/org/simgrid/NativeLib.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildtools/Cmake/Scripts/java_bundle.sh b/buildtools/Cmake/Scripts/java_bundle.sh index c0d51ce6be..136d568f44 100755 --- a/buildtools/Cmake/Scripts/java_bundle.sh +++ b/buildtools/Cmake/Scripts/java_bundle.sh @@ -20,7 +20,7 @@ JAVA=$2 STRIP=$3 shift 3 -JSG_BUNDLE=$("$JAVA" -classpath "$SIMGRID_JAR" org.simgrid.NativeLib) +JSG_BUNDLE=$("$JAVA" -classpath "$SIMGRID_JAR" org.simgrid.NativeLib --quiet) # sanity check case "$JSG_BUNDLE" in diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index cdeb4b6bd2..d253847398 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -114,6 +114,10 @@ public final class NativeLib { public static void main(String[] args) { - System.out.println("This java library will try to load the native code under the following name:" +getPath()); + 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()); } } -- 2.20.1