From: Martin Quinson Date: Sat, 23 Jan 2016 21:06:52 +0000 (+0100) Subject: [java] do not load winpthread-1 on windows X-Git-Tag: v3_13~1109 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7b0e15d9b0ad0057ebd501cf89a2ea9607217c23 [java] do not load winpthread-1 on windows - We made sure that we don't depend on that lib with the previous commit. - This makes things really simpler in the cmake, as we need only our own libraries, that are the same on all platforms. No more cmake conditionals that I fail to write for windows, no more sequencing that fail with parallel builds. - While I was at it, I did some reordering in the Java.cmake to have related parts together. --- diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index 1386ec60e5..e7a94e5fe8 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -20,9 +20,6 @@ public final class NativeLib { if (isNativeInited) return; - if (System.getProperty("os.name").toLowerCase().startsWith("win")) - NativeLib.nativeInit("winpthread-1"); - NativeLib.nativeInit("simgrid"); NativeLib.nativeInit("simgrid-java"); isNativeInited = true; diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 613272c90f..669c4288ad 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -14,6 +14,14 @@ find_package(JNI REQUIRED) message("-- [Java] JNI found: ${JNI_FOUND}") message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}") +if(WIN32) + exec_program("java -d32 -version" OUTPUT_VARIABLE IS_32_BITS_JVM) + STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION ) + if(NOT ${POSITION} GREATER -1) + message(fatal_error "SimGrid can only use Java 64 bits") + endif() +endif() + # find_package(SWIG) # if(${SWIG_FOUND}) # include(UseSWIG) @@ -24,9 +32,13 @@ message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}") #mark_as_advanced(SWIG_EXECUTABLE) # Rules to build libsimgrid-java -# +################################ + add_library(simgrid-java SHARED ${JMSG_C_SRC}) -set_target_properties(simgrid-java PROPERTIES VERSION ${libsimgrid-java_version}) +set_target_properties(simgrid-java PROPERTIES VERSION ${libsimgrid-java_version}) +set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON) + +target_link_libraries(simgrid-java simgrid) get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES) if (COMMON_INCLUDES) @@ -40,19 +52,8 @@ endif() get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES) message("-- [Java] simgrid-java includes: ${CHECK_INCLUDES}") -target_link_libraries(simgrid-java simgrid) - - -if(WIN32) - exec_program("java -d32 -version" OUTPUT_VARIABLE IS_32_BITS_JVM) - STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION ) - if(NOT ${POSITION} GREATER -1) - message(fatal_error "SimGrid can only use Java 64 bits") - endif() -endif() - # Rules to build simgrid.jar -# +############################ ## Files to include in simgrid.jar ## @@ -74,6 +75,9 @@ else() add_jar(simgrid-java_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid) endif() +add_dependencies(simgrid-java_jar simgrid-java) +add_dependencies(simgrid-java_jar simgrid) + if (enable_documentation) add_custom_command( TARGET simgrid-java_jar POST_BUILD @@ -127,26 +131,6 @@ if(enable_lib_in_jar) set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/arm) # Default arm (soft-float ABI) endif() - # Find how to copy - set(SHEXE sh) - if(WIN32) - set(SHEXE sh.exe) - endif() - - # Find what to copy - set(JAVALIBS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO}) - if(MINGW) - find_library(WINPTHREAD_DLL - NAME winpthread winpthread-1 - PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin C:\\msys64\\mingw32\\bin C:\\msys64\\mingw32 C:\\msys\\mingw32\\bin C:\\msys\\mingw32 C:\\msys64\\mingw64\\bin C:\\msys64\\mingw64 C:\\msys\\mingw64\\bin C:\\msys\\mingw64 - ) - if(${WINPTHREAD_DLL}) - set(JAVALIBS ${JAVALIBS} ${WINPTHREAD_DLL}) - endif() - endif(MINGW) - string(REPLACE ";" " " JAVALIBS "${JAVALIBS}") - message("-- [Java] Native Libs: ${JAVALIBS}") - add_custom_command( TARGET simgrid-java_jar POST_BUILD COMMENT "Add the native libs into simgrid.jar..." @@ -155,24 +139,14 @@ if(enable_lib_in_jar) COMMAND ${CMAKE_COMMAND} -E remove_directory ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E make_directory ${JAVA_NATIVE_PATH} - COMMAND echo cp ${JAVALIBS} ${JAVA_NATIVE_PATH} # Just display what's going on - # So, first of all, I'm sorry for the next few lines. Here is what's going on. - # I need to copy some files, depending on the environment. - # I cannot use several POST_BUILD commands because cmake does - # force them to run sequentially, so it fails if we build with -j - # So I add some content to the JAVALIBS cmake variable, and copy them in one shoot. - # But cmake list variables are ; separated, not space separated. - # So I string(REPLACE a bit above to change ; into spaces. - # But if I do so, cmake still passes the space-separated list as a single argument to cp. - # So I have to fire a sh -c, just to correctly parse the cp parameters. - # Yup. That's the ways it goes. cmake is so lovely, that's wonderful. - COMMAND ${SHEXE} -c "cp ${JAVALIBS} ${JAVA_NATIVE_PATH}" # cp is less portable, but cmake cannot copy several files at once - ## strip seems to fail on Mac on binaries that are already stripped. ## It then spits: "symbols referenced by indirect symbol table entries that can't be stripped" #COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO} || true #COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} || true + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${JAVA_NATIVE_PATH} + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH} + COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E remove_directory ${JAVA_NATIVE_PATH} @@ -183,10 +157,3 @@ if(enable_lib_in_jar) endif(enable_lib_in_jar) include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) - -set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON) - -add_dependencies(simgrid-java_jar simgrid-java) -add_dependencies(simgrid-java_jar simgrid) - -