X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..ceb622de45c83bd1d8f1b357432572834932b77a:/buildtools/Cmake/MakeJava.cmake diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index c6a77b79bb..c8df82ab0d 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -2,33 +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}") - -target_link_libraries(SG_java simgrid) - +message("-- [Java] simgrid-java includes: ${CHECK_INCLUDES}") +target_link_libraries(simgrid-java simgrid) if(WIN32) @@ -39,14 +37,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() @@ -56,25 +54,17 @@ endif() ## Files to include in simgrid.jar ## set(SIMGRID_JAR "${CMAKE_BINARY_DIR}/simgrid.jar") -set(MANIFEST_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF") +set(SIMGRID_FULL_JAR "${CMAKE_BINARY_DIR}/simgrid_full.jar") +set(MANIFEST_IN_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF.in") +set(MANIFEST_FILE "${CMAKE_BINARY_DIR}/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}) - -## Name of the "NATIVE" folder in simgrid.jar -## -if(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") - if(${ARCH_32_BITS}) - set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/i386/") - else() - set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/amd64/") - endif() -else() - message(WARNING "Unknown system type. Processor: ${CMAKE_SYSTEM_PROCESSOR}; System: ${CMAKE_SYSTEM_NAME}") - set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR}/") -endif() -message("-- [Java] Native libraries bundled into: ${JSG_BUNDLE}") +set(LIBSIMGRID_JAVA_SO + ${CMAKE_SHARED_LIBRARY_PREFIX}simgrid-java${CMAKE_SHARED_LIBRARY_SUFFIX}) +set(LIBSURF_JAVA_SO + ${CMAKE_SHARED_LIBRARY_PREFIX}surf-java${CMAKE_SHARED_LIBRARY_SUFFIX}) ## Don't strip libraries if not in release mode ## @@ -86,32 +76,52 @@ endif() ## Here is how to build simgrid.jar ## -set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid) -add_jar(SG_java_pre_jar ${JMSG_JAVA_SRC}) +if(CMAKE_VERSION VERSION_LESS "2.8.12") + set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid) + add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} ${JSURF_JAVA_GENERATED_SRC}) +else() + add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} ${JSURF_JAVA_GENERATED_SRC} OUTPUT_NAME simgrid) +endif() +set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/java_bundle.sh") +set(JAVA_BUNDLE_SO_FILES + ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} + ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} + ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO} + ) +set(JAVA_BUNDLE_TXT_FILES + ${CMAKE_HOME_DIRECTORY}/COPYING + ${CMAKE_HOME_DIRECTORY}/ChangeLog + ${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java + ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1 + ) add_custom_command( COMMENT "Finalize simgrid.jar..." OUTPUT ${SIMGRID_JAR}_finalized - DEPENDS simgrid SG_java SG_java_pre_jar - ${SIMGRID_JAR} ${MANIFEST_FILE} - ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} - ${CMAKE_BINARY_DIR}/lib/${LIBSG_JAVA_SO} - ${CMAKE_HOME_DIRECTORY}/COPYING - ${CMAKE_HOME_DIRECTORY}/ChangeLog - ${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java - ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1 - COMMAND ${CMAKE_COMMAND} -E remove_directory "NATIVE" - COMMAND ${CMAKE_COMMAND} -E make_directory "${JSG_BUNDLE}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}" "${JSG_BUNDLE}" - COMMAND ${STRIP_COMMAND} -S "${JSG_BUNDLE}/${LIBSIMGRID_SO}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/lib/${LIBSG_JAVA_SO}" "${JSG_BUNDLE}" - COMMAND ${STRIP_COMMAND} -S "${JSG_BUNDLE}/${LIBSG_JAVA_SO}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/COPYING" "${JSG_BUNDLE}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog" "${JSG_BUNDLE}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java" "${JSG_BUNDLE}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1" "${JSG_BUNDLE}" - COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} "NATIVE" + DEPENDS simgrid simgrid-java simgrid-java_pre_jar + ${SIMGRID_JAR} ${MANIFEST_IN_FILE} + ${JAVA_BUNDLE_SO_FILES} ${JAVA_BUNDLE_TXT_FILES} + COMMAND ${JAVA_BUNDLE} "${SIMGRID_JAR}" "${Java_JAVA_EXECUTABLE}" "${STRIP_COMMAND}" -so ${JAVA_BUNDLE_SO_FILES} -txt ${JAVA_BUNDLE_TXT_FILES} + COMMAND ${CMAKE_COMMAND} -E copy ${MANIFEST_IN_FILE} ${MANIFEST_FILE} + COMMAND ${CMAKE_COMMAND} -E echo "Specification-Version: \\\"${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}\\\"" >> ${MANIFEST_FILE} + COMMAND ${CMAKE_COMMAND} -E echo "Implementation-Version: \\\"${GIT_VERSION}\\\"" >> ${MANIFEST_FILE} + COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} + COMMAND ${CMAKE_COMMAND} -E copy ${SIMGRID_JAR} ${SIMGRID_FULL_JAR} + COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_FULL_JAR} "NATIVE" 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) + +set(CMAKE_SWIG_FLAGS "-package" "org.simgrid.surf") +set(CMAKE_SWIG_OUTDIR "${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/surf") +set(CMAKE_SWIG_OUTDIR "${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf") + +set_source_files_properties(${JSURF_SWIG_SRC} PROPERTIES CPLUSPLUS 1) +#set_source_files_properties(${SURF_SWIG_FILE} PROPERTIES SWIG_FLAGS "-includeall") +include_directories(${JNI_INCLUDE_DIRS}) +swig_add_module(surf-java java ${JSURF_SWIG_SRC} ${JSURF_JAVA_C_SRC}) +swig_link_libraries(surf-java simgrid) + +add_dependencies(simgrid-java surf-java) +add_dependencies(simgrid-java_pre_jar surf-java)