Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8992f7f..00ebaf2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -263,6 +263,18 @@ else()
   set(HAVE_BOOST_CONTEXTS 0)
 endif()
 
+# Try again to see if we have libboost-context
+find_package(Boost 1.42 COMPONENTS context)
+set(Boost_FOUND 1) # We don't care of whether this component is missing
+
+if(Boost_FOUND AND Boost_GRAPH_FOUND)
+  set(HAVE_BOOST_GRAPH 1)
+else()
+  message ("   boost        : found.")
+  message ("   boost-graph  : missing. Install libboost-graph-dev for this optional feature.")
+  set(HAVE_BOOST_GRAPH 0)
+endif()
+
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(execinfo backtrace              "" HAVE_BACKTRACE_IN_LIBEXECINFO)
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 71b1595..de5d17c 100644 (file)
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -32,15 +32,21 @@ public final class NativeLib {
                try {
                        /* Prefer the version of the library bundled into the jar file and use it */
                        loadLib(name);
-               } catch (SimGridLibNotFoundException e) {
+               } catch (SimGridLibNotFoundException embeededException) {
                        /* If not found, try to see if we can find a version on disk */
                        try {
                                System.loadLibrary(name);
-                       } catch (UnsatisfiedLinkError e2) {
-                               if (! name.equals("boost_context")) {
-                                       System.err.println("Cannot load the bindings to the "+name+" library in path "+getPath());
-                                       e.printStackTrace();
-                                       System.err.println("This jar file does not seem to fit your system, and I cannot find an installation of SimGrid.");
+                       } catch (UnsatisfiedLinkError systemException) {
+                               if (! name.equals("boost_context")) { // Ignore when we cannot load boost_context
+                                       
+                                       System.err.println("\nCannot load the bindings to the "+name+" library in path "+getPath());
+                                       Throwable cause = embeededException.getCause();
+                                       if (cause instanceof java.lang.UnsatisfiedLinkError && cause.getMessage().matches(".*libcgraph.so.*"))
+                                               System.err.println("HINT: Try to install the libcgraph package (sudo apt-get install libcgraph).");
+                                       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();
+                                       cause.printStackTrace();
                                        System.exit(1);
                                }
                        }
@@ -116,10 +122,8 @@ 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);
+               } catch (Throwable e) {
+                       throw new SimGridLibNotFoundException("Cannot load the bindings to the "+name+" library in path "+getPath(), e);
                }
        }
 
@@ -154,7 +158,7 @@ class SimGridLibNotFoundException extends Exception {
                super(msg);
        }
 
-       public SimGridLibNotFoundException(String msg, Exception e) {
+       public SimGridLibNotFoundException(String msg, Throwable e) {
                super(msg,e);
        }
 }
\ No newline at end of file