From: Arnaud Giersch Date: Sat, 2 Nov 2013 22:16:37 +0000 (+0100) Subject: Rename SG_java -> simgrid-java. X-Git-Tag: v3_10_rc1~14 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c401435c9bd3efa86a3b7c0367a82ed2b50c2eb1?hp=79b6362c955d06cb8bcc3e1f2a40449c487ea7de Rename SG_java -> simgrid-java. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b2fa7c4af6..6adbbd2a62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ else() set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}") endif() set(libsimgrid_version "${release_version}") -set(libSG_java_version "${release_version}") +set(libsimgrid-java_version "${release_version}") set(GCC_NEED_VERSION "4.0") set(APPLE_NEED_GCC_VERSION "4.6") diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 7c9a201b5c..775512ce86 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -67,7 +67,7 @@ if(enable_lib_static AND NOT WIN32) endif() if(enable_java) - install(TARGETS SG_java + install(TARGETS simgrid-java DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) install(FILES ${SIMGRID_JAR} DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/) diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index c6a77b79bb..52de66de27 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -2,31 +2,31 @@ cmake_minimum_required(VERSION 2.8.6) include(UseJava) -# Rules to build libSG_java +# Rules to build libsimgrid-java # -add_library(SG_java SHARED ${JMSG_C_SRC}) -set_target_properties(SG_java PROPERTIES VERSION ${libSG_java_version}) +add_library(simgrid-java SHARED ${JMSG_C_SRC}) +set_target_properties(simgrid-java PROPERTIES VERSION ${libsimgrid-java_version}) if (CMAKE_VERSION VERSION_LESS "2.8.8") include_directories(${JNI_INCLUDE_DIRS}) message(WARNING "[Java] Try to workaround missing feature in older CMake. You should better update CMake to version 2.8.8 or above.") get_directory_property(CHECK_INCLUDES INCLUDE_DIRECTORIES) else() - get_target_property(COMMON_INCLUDES SG_java INCLUDE_DIRECTORIES) + get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES) if (COMMON_INCLUDES) - set_target_properties(SG_java PROPERTIES + set_target_properties(simgrid-java PROPERTIES INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}") else() - set_target_properties(SG_java PROPERTIES + set_target_properties(simgrid-java PROPERTIES INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}") endif() - add_dependencies(SG_java simgrid) + add_dependencies(simgrid-java simgrid) - get_target_property(CHECK_INCLUDES SG_java INCLUDE_DIRECTORIES) + get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES) endif() -message("-- [Java] SG_java includes: ${CHECK_INCLUDES}") +message("-- [Java] simgrid-java includes: ${CHECK_INCLUDES}") -target_link_libraries(SG_java simgrid) +target_link_libraries(simgrid-java simgrid) @@ -39,14 +39,14 @@ if(WIN32) message(FATAL_ERROR "Java JVM needs to be 32 bits to be able to run with Simgrid on Windows for now") endif() - set_target_properties(SG_java PROPERTIES + set_target_properties(simgrid-java PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows,--kill-at" PREFIX "") find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS) message(STATUS "pexports: ${PEXPORTS_PATH}") if(PEXPORTS_PATH) - add_custom_command(TARGET SG_java POST_BUILD - COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/SG_java.dll > ${CMAKE_BINARY_DIR}/lib/SG_java.def) + add_custom_command(TARGET simgrid-java POST_BUILD + COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/simgrid-java.dll > ${CMAKE_BINARY_DIR}/lib/simgrid-java.def) endif(PEXPORTS_PATH) endif() @@ -60,7 +60,7 @@ set(MANIFEST_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF") set(LIBSIMGRID_SO libsimgrid${CMAKE_SHARED_LIBRARY_SUFFIX}) set(LIBSG_JAVA_SO - ${CMAKE_SHARED_LIBRARY_PREFIX}SG_java${CMAKE_SHARED_LIBRARY_SUFFIX}) + ${CMAKE_SHARED_LIBRARY_PREFIX}simgrid-java${CMAKE_SHARED_LIBRARY_SUFFIX}) ## Name of the "NATIVE" folder in simgrid.jar ## @@ -87,12 +87,12 @@ endif() ## Here is how to build simgrid.jar ## set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid) -add_jar(SG_java_pre_jar ${JMSG_JAVA_SRC}) +add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC}) add_custom_command( COMMENT "Finalize simgrid.jar..." OUTPUT ${SIMGRID_JAR}_finalized - DEPENDS simgrid SG_java SG_java_pre_jar + DEPENDS simgrid simgrid-java simgrid-java_pre_jar ${SIMGRID_JAR} ${MANIFEST_FILE} ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${CMAKE_BINARY_DIR}/lib/${LIBSG_JAVA_SO} @@ -114,4 +114,4 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E remove ${SIMGRID_JAR}_finalized COMMAND ${CMAKE_COMMAND} -E touch ${SIMGRID_JAR}_finalized ) -add_custom_target(SG_java_jar ALL DEPENDS ${SIMGRID_JAR}_finalized) +add_custom_target(simgrid-java_jar ALL DEPENDS ${SIMGRID_JAR}_finalized) diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/buildtools/Cmake/src/simgrid.nsi.in index 2550b857a7..53813ec2db 100644 --- a/buildtools/Cmake/src/simgrid.nsi.in +++ b/buildtools/Cmake/src/simgrid.nsi.in @@ -174,8 +174,8 @@ Section "Java Bindings" JavaSection # install java library and examples CreateDirectory $INSTDIR\examples\simgrid-java setOutPath $INSTDIR\lib - file /nonfatal "lib\SG_java.dll" - file /nonfatal "lib\SG_java.def" + file /nonfatal "lib\simgrid-java.dll" + file /nonfatal "lib\simgrid-java.def" file /nonfatal "simgrid.jar" setOutPath $INSTDIR\examples\simgrid-java file /nonfatal /r ".\examples\" diff --git a/doc/doxygen/bindings.doc b/doc/doxygen/bindings.doc index 25721cc73d..b0e900e6d6 100644 --- a/doc/doxygen/bindings.doc +++ b/doc/doxygen/bindings.doc @@ -83,7 +83,7 @@ $ cmake . \subsubsection bindings_binding_java_use How to use Simgrid-java To execute the examples you need to add the path where you installed -the generated `libSG_java` and `libsimgrid` libraries +the generated `libsimgrid-java` and `libsimgrid` libraries into the `LD_LIBRARY_PATH`. Be careful on Mac, this variable is called `DYLD_LIBRARY_PATH` and not @@ -203,7 +203,7 @@ factory if your JVM support it, so you will just need to execute your simulation with the correct JVM. The selected context factory gets displayed automatically. ~~~~{.sh} -export LD_LIBRARY_PATH=/path/to/simgrid.so:/path/to/libSG_java.so +export LD_LIBRARY_PATH=/path/to/simgrid.so:/path/to/libsimgrid-java.so cd examples $PATH_TO_COROUTINE_JVM/java -cp .:../simgrid.jar masterslave.Masterslave masterslave/ masterslaveDeployment.xml platform.xml ~~~~ diff --git a/examples/java/async/CMakeLists.txt b/examples/java/async/CMakeLists.txt index 18d4de12cc..c2e64e8eb7 100644 --- a/examples/java/async/CMakeLists.txt +++ b/examples/java/async/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/bittorrent/CMakeLists.txt b/examples/java/bittorrent/CMakeLists.txt index a245baa0e8..23e37732fe 100644 --- a/examples/java/bittorrent/CMakeLists.txt +++ b/examples/java/bittorrent/CMakeLists.txt @@ -15,7 +15,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/chord/CMakeLists.txt b/examples/java/chord/CMakeLists.txt index 90167e8070..ddab502534 100644 --- a/examples/java/chord/CMakeLists.txt +++ b/examples/java/chord/CMakeLists.txt @@ -17,7 +17,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/cloud/CMakeLists.txt b/examples/java/cloud/CMakeLists.txt index 9dbb0d1cfc..a02cc47ec0 100644 --- a/examples/java/cloud/CMakeLists.txt +++ b/examples/java/cloud/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/commTime/CMakeLists.txt b/examples/java/commTime/CMakeLists.txt index 320b5c8b84..2ca1a7ab4a 100644 --- a/examples/java/commTime/CMakeLists.txt +++ b/examples/java/commTime/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/io/CMakeLists.txt b/examples/java/io/CMakeLists.txt index 767e4d6b90..fe437f00fd 100644 --- a/examples/java/io/CMakeLists.txt +++ b/examples/java/io/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/kademlia/CMakeLists.txt b/examples/java/kademlia/CMakeLists.txt index 8b3833d73f..fbfe46671a 100644 --- a/examples/java/kademlia/CMakeLists.txt +++ b/examples/java/kademlia/CMakeLists.txt @@ -20,7 +20,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/master_slave_bypass/CMakeLists.txt b/examples/java/master_slave_bypass/CMakeLists.txt index 9b18ca45d2..808bb24921 100644 --- a/examples/java/master_slave_bypass/CMakeLists.txt +++ b/examples/java/master_slave_bypass/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/master_slave_kill/CMakeLists.txt b/examples/java/master_slave_kill/CMakeLists.txt index 34e5b26f9e..95d4ad87db 100644 --- a/examples/java/master_slave_kill/CMakeLists.txt +++ b/examples/java/master_slave_kill/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/masterslave/CMakeLists.txt b/examples/java/masterslave/CMakeLists.txt index c3083f64b4..cccca32d97 100644 --- a/examples/java/masterslave/CMakeLists.txt +++ b/examples/java/masterslave/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/migration/CMakeLists.txt b/examples/java/migration/CMakeLists.txt index 72108f0fe9..2f372eff93 100644 --- a/examples/java/migration/CMakeLists.txt +++ b/examples/java/migration/CMakeLists.txt @@ -11,7 +11,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/mutualExclusion/CMakeLists.txt b/examples/java/mutualExclusion/CMakeLists.txt index 4593c8c40c..b74eecc794 100644 --- a/examples/java/mutualExclusion/CMakeLists.txt +++ b/examples/java/mutualExclusion/CMakeLists.txt @@ -14,7 +14,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/pingPong/CMakeLists.txt b/examples/java/pingPong/CMakeLists.txt index 8756c210dd..7a951e5db1 100644 --- a/examples/java/pingPong/CMakeLists.txt +++ b/examples/java/pingPong/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/priority/CMakeLists.txt b/examples/java/priority/CMakeLists.txt index a93beec0bb..b897df1cf0 100644 --- a/examples/java/priority/CMakeLists.txt +++ b/examples/java/priority/CMakeLists.txt @@ -10,7 +10,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/startKillTime/CMakeLists.txt b/examples/java/startKillTime/CMakeLists.txt index 0a9716ac34..97a28eb717 100644 --- a/examples/java/startKillTime/CMakeLists.txt +++ b/examples/java/startKillTime/CMakeLists.txt @@ -11,7 +11,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/suspend/CMakeLists.txt b/examples/java/suspend/CMakeLists.txt index 0ac2dfd6a7..abf841b11e 100644 --- a/examples/java/suspend/CMakeLists.txt +++ b/examples/java/suspend/CMakeLists.txt @@ -11,7 +11,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/java/tracing/CMakeLists.txt b/examples/java/tracing/CMakeLists.txt index f035001a36..e07314bc57 100644 --- a/examples/java/tracing/CMakeLists.txt +++ b/examples/java/tracing/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/scala/master_slave_bypass/CMakeLists.txt b/examples/scala/master_slave_bypass/CMakeLists.txt index f5c954ad9b..c44c0aa88c 100644 --- a/examples/scala/master_slave_bypass/CMakeLists.txt +++ b/examples/scala/master_slave_bypass/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_scala) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${SCALA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/scala/master_slave_kill/CMakeLists.txt b/examples/scala/master_slave_kill/CMakeLists.txt index ca978c6449..bdc19ec66e 100644 --- a/examples/scala/master_slave_kill/CMakeLists.txt +++ b/examples/scala/master_slave_kill/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_scala) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${SCALA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/examples/scala/masterslave/CMakeLists.txt b/examples/scala/masterslave/CMakeLists.txt index 54b10294bf..634590e3c9 100644 --- a/examples/scala/masterslave/CMakeLists.txt +++ b/examples/scala/masterslave/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_scala) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${SCALA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java index 229566c9d5..93409c5cf8 100644 --- a/src/bindings/java/org/simgrid/msg/Msg.java +++ b/src/bindings/java/org/simgrid/msg/Msg.java @@ -25,11 +25,11 @@ public final class Msg { return; try { /* prefer the version on disk, if existing */ - System.loadLibrary("SG_java"); + System.loadLibrary("simgrid-java"); } catch (UnsatisfiedLinkError e) { /* If not found, unpack the one bundled into the jar file and use it */ loadLib("simgrid"); - loadLib("SG_java"); + loadLib("simgrid-java"); } isNativeInited = true; }