Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fix the build of java bundles, sorry
authorMartin Quinson <martin.quinson@loria.fr>
Sat, 29 Nov 2014 13:03:13 +0000 (14:03 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Sat, 29 Nov 2014 13:03:13 +0000 (14:03 +0100)
buildtools/Cmake/Scripts/java_bundle.sh
src/bindings/java/org/simgrid/NativeLib.java

index c0d51ce..136d568 100755 (executable)
@@ -20,7 +20,7 @@ JAVA=$2
 STRIP=$3
 shift 3
 
 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
 
 # sanity check
 case "$JSG_BUNDLE" in
index cdeb4b6..d253847 100644 (file)
@@ -114,6 +114,10 @@ public final class NativeLib {
 
 
        public static void main(String[] args) {
 
 
        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());
        }
 }
        }
 }