From 4c14aa1da000574efad40a5d0b6fee1f13cd5b6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20B=C3=A9daride?= Date: Wed, 11 Jun 2014 17:14:36 +0200 Subject: [PATCH 1/1] No rpath in libsimgird-java and libsurf-java --- buildtools/Cmake/MakeJava.cmake | 2 ++ src/bindings/java/org/simgrid/surf/Action.java | 2 +- src/bindings/java/org/simgrid/surf/ActionList.java | 2 +- src/bindings/java/org/simgrid/surf/ActionState.java | 2 +- src/bindings/java/org/simgrid/surf/Cpu.java | 2 +- src/bindings/java/org/simgrid/surf/CpuAction.java | 2 +- src/bindings/java/org/simgrid/surf/CpuModel.java | 2 +- src/bindings/java/org/simgrid/surf/LmmConstraint.java | 2 +- src/bindings/java/org/simgrid/surf/LmmVariable.java | 2 +- src/bindings/java/org/simgrid/surf/Model.java | 2 +- src/bindings/java/org/simgrid/surf/NetworkAction.java | 2 +- src/bindings/java/org/simgrid/surf/NetworkLink.java | 2 +- src/bindings/java/org/simgrid/surf/Plugin.java | 2 +- src/bindings/java/org/simgrid/surf/Resource.java | 2 +- src/bindings/java/org/simgrid/surf/ResourceState.java | 2 +- src/bindings/java/org/simgrid/surf/RoutingEdge.java | 2 +- src/bindings/java/org/simgrid/surf/Surf.java | 2 +- src/bindings/java/org/simgrid/surf/SurfJNI.java | 3 ++- src/bindings/java/org/simgrid/surf/TmgrTrace.java | 2 +- src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java | 2 +- src/bindings/java/org/simgrid/surf/XbtDict.java | 2 +- src/bindings/java/surf.i | 1 + src/bindings/java/surfJAVA_wrap.cxx | 2 +- src/bindings/java/surfJAVA_wrap.h | 2 +- 24 files changed, 26 insertions(+), 22 deletions(-) diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index a0be698e1e..7e0d62cf8e 100644 --- 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 911a8d3188..6680aae400 100644 --- 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 5a9493cbc4..515ad2d63a 100644 --- 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 094dd49b9e..a8ebd36363 100644 --- 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 61a2d5460d..e172525454 100644 --- 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 50f0fd6055..fc99edf7e8 100644 --- 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 b5572a836a..28c239bc93 100644 --- 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 775c379cef..52daca4277 100644 --- 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 7e9e372296..428914b118 100644 --- 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 3e6e7f8eb3..f0da14822e 100644 --- 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 c1b758dc68..76d3ae87cc 100644 --- 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 a787a8bd4f..5e61e7f7de 100644 --- 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 c3d5f5c6ee..957a707a22 100644 --- 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 4091eb538f..77e8bf9597 100644 --- 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 830373445a..728d4f4155 100644 --- 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 36b117a511..a112d4bb10 100644 --- 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 b4ef317ae5..4165404e83 100644 --- 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 53cc07e823..697afea9d2 100644 --- 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 1c7555fa45..9402242bb2 100644 --- 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 d3f1f7e7a8..08eee1d0a2 100644 --- 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 dbbc370a72..71450b422d 100644 --- 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 1c61df50a5..b43c4fde24 100644 --- 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 32b867520f..f029bd2cce 100644 --- 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 065713a2d6..54faa7d29f 100644 --- 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 -- 2.20.1