No rpath in libsimgird-java and libsurf-java

diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake
index a0be698..7e0d62c 100644 (file)
--- a/buildtools/Cmake/MakeJava.cmake
+++ b/buildtools/Cmake/MakeJava.cmake
@@ -138,6 +138,8 @@ else()
     PROPERTIES COMPILE_FLAGS "-fPIC -I\"${JAVA_INCLUDE_PATH}\" -I\"${JAVA_INCLUDE_PATH2}\""
   )
 endif()
+set_target_properties(surf-java PROPERTIES SKIP_BUILD_RPATH ON)
+set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON)
 
 add_dependencies(simgrid-java surf-java)
 add_dependencies(simgrid-java_pre_jar surf-java)

diff --git a/src/bindings/java/org/simgrid/surf/Action.java b/src/bindings/java/org/simgrid/surf/Action.java
index 911a8d3..6680aae 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/Action.java
+++ b/src/bindings/java/org/simgrid/surf/Action.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/ActionList.java b/src/bindings/java/org/simgrid/surf/ActionList.java
index 5a9493c..515ad2d 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/ActionList.java
+++ b/src/bindings/java/org/simgrid/surf/ActionList.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/ActionState.java b/src/bindings/java/org/simgrid/surf/ActionState.java
index 094dd49..a8ebd36 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/ActionState.java
+++ b/src/bindings/java/org/simgrid/surf/ActionState.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/Cpu.java b/src/bindings/java/org/simgrid/surf/Cpu.java
index 61a2d54..e172525 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/Cpu.java
+++ b/src/bindings/java/org/simgrid/surf/Cpu.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/CpuAction.java b/src/bindings/java/org/simgrid/surf/CpuAction.java
index 50f0fd6..fc99edf 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/CpuAction.java
+++ b/src/bindings/java/org/simgrid/surf/CpuAction.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/CpuModel.java b/src/bindings/java/org/simgrid/surf/CpuModel.java
index b5572a8..28c239b 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/CpuModel.java
+++ b/src/bindings/java/org/simgrid/surf/CpuModel.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/LmmConstraint.java b/src/bindings/java/org/simgrid/surf/LmmConstraint.java
index 775c379..52daca4 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/LmmConstraint.java
+++ b/src/bindings/java/org/simgrid/surf/LmmConstraint.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/LmmVariable.java b/src/bindings/java/org/simgrid/surf/LmmVariable.java
index 7e9e372..428914b 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/LmmVariable.java
+++ b/src/bindings/java/org/simgrid/surf/LmmVariable.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/Model.java b/src/bindings/java/org/simgrid/surf/Model.java
index 3e6e7f8..f0da148 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/Model.java
+++ b/src/bindings/java/org/simgrid/surf/Model.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/NetworkAction.java b/src/bindings/java/org/simgrid/surf/NetworkAction.java
index c1b758d..76d3ae8 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/NetworkAction.java
+++ b/src/bindings/java/org/simgrid/surf/NetworkAction.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/NetworkLink.java b/src/bindings/java/org/simgrid/surf/NetworkLink.java
index a787a8b..5e61e7f 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/NetworkLink.java
+++ b/src/bindings/java/org/simgrid/surf/NetworkLink.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/Plugin.java b/src/bindings/java/org/simgrid/surf/Plugin.java
index c3d5f5c..957a707 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/Plugin.java
+++ b/src/bindings/java/org/simgrid/surf/Plugin.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/Resource.java b/src/bindings/java/org/simgrid/surf/Resource.java
index 4091eb5..77e8bf9 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/Resource.java
+++ b/src/bindings/java/org/simgrid/surf/Resource.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/ResourceState.java b/src/bindings/java/org/simgrid/surf/ResourceState.java
index 8303734..728d4f4 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/ResourceState.java
+++ b/src/bindings/java/org/simgrid/surf/ResourceState.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/RoutingEdge.java b/src/bindings/java/org/simgrid/surf/RoutingEdge.java
index 36b117a..a112d4b 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/RoutingEdge.java
+++ b/src/bindings/java/org/simgrid/surf/RoutingEdge.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/Surf.java b/src/bindings/java/org/simgrid/surf/Surf.java
index b4ef317..4165404 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/Surf.java
+++ b/src/bindings/java/org/simgrid/surf/Surf.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/SurfJNI.java b/src/bindings/java/org/simgrid/surf/SurfJNI.java
index 53cc07e..697afea 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/SurfJNI.java
+++ b/src/bindings/java/org/simgrid/surf/SurfJNI.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -13,6 +13,7 @@ import org.simgrid.NativeLib;
 public class SurfJNI {
 
   static {
+    NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(
       new Thread() {

diff --git a/src/bindings/java/org/simgrid/surf/TmgrTrace.java b/src/bindings/java/org/simgrid/surf/TmgrTrace.java
index 1c7555f..9402242 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/TmgrTrace.java
+++ b/src/bindings/java/org/simgrid/surf/TmgrTrace.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java b/src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java
index d3f1f7e..08eee1d 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java
+++ b/src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/org/simgrid/surf/XbtDict.java b/src/bindings/java/org/simgrid/surf/XbtDict.java
index dbbc370..71450b4 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/XbtDict.java
+++ b/src/bindings/java/org/simgrid/surf/XbtDict.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i
index 1c61df5..b43c4fd 100644 (file)
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -16,6 +16,7 @@ import org.simgrid.NativeLib;
 %}
 %pragma(java) jniclasscode=%{
   static {
+    NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(
       new Thread() {

diff --git a/src/bindings/java/surfJAVA_wrap.cxx b/src/bindings/java/surfJAVA_wrap.cxx
index 32b8675..f029bd2 100644 (file)
--- a/src/bindings/java/surfJAVA_wrap.cxx
+++ b/src/bindings/java/surfJAVA_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make

diff --git a/src/bindings/java/surfJAVA_wrap.h b/src/bindings/java/surfJAVA_wrap.h
index 065713a..54faa7d 100644 (file)
--- a/src/bindings/java/surfJAVA_wrap.h
+++ b/src/bindings/java/surfJAVA_wrap.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make