X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81e2987ceb9329c50f0ac8109504aa5c784071e2..4fc0e111d1f1a321148fbd950405c91dda6b4290:/tools/cmake/Java.cmake

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 509679254c..e8fa5e22b6 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -4,7 +4,7 @@
 ##
 
 find_package(Java 1.7 COMPONENTS Runtime Development)
-if (not ${Java_FOUND})
+if (NOT ${Java_FOUND})
   message(FATAL_ERROR "Java not found (need at least Java7). Please install the JDK or disable that option")
 endif()
 set(Java_FOUND 1)
@@ -14,20 +14,31 @@ find_package(JNI REQUIRED)
 message("-- [Java] JNI found: ${JNI_FOUND}")
 message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
 
-find_package(SWIG)
-if(${SWIG_FOUND})
-  include(UseSWIG)
-  message("-- [Java] Swig found: version ${SWIG_VERSION}")
-else()
-  message("-- [Java] Swig NOT FOUND. Surf java bindings won't get refreshed. That's fine unless you work on this part yourself.")
+if(WIN32)
+  execute_process(COMMAND         java -d64 -version
+                  OUTPUT_VARIABLE JVM_IS_64_BITS)
+  if("${JVM_IS_64_BITS}" MATCHES "Error")
+    message(fatal_error "SimGrid can only use Java 64 bits")
+  endif()
 endif()
-mark_as_advanced(SWIG_EXECUTABLE)
 
+# find_package(SWIG)
+# if(${SWIG_FOUND})
+#   include(UseSWIG)
+#   message("-- [Java] Swig found: version ${SWIG_VERSION}")
+# else()
+#   message("-- [Java] Swig NOT FOUND. That's fine unless you work on this part yourself.")
+# endif()
+#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)
@@ -41,32 +52,19 @@ 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
 ##
 set(SIMGRID_JAR "${CMAKE_BINARY_DIR}/simgrid.jar")
-set(MANIFEST_IN_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF.in")
+set(MANIFEST_IN_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.in")
 set(MANIFEST_FILE "${CMAKE_BINARY_DIR}/src/bindings/java/MANIFEST.MF")
 
 set(LIBSIMGRID_SO
   libsimgrid${CMAKE_SHARED_LIBRARY_SUFFIX})
 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})
 
 ## Here is how to build simgrid.jar
 ##
@@ -77,35 +75,37 @@ else()
   add_jar(simgrid-java_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
 endif()
 
-add_custom_command(
-  TARGET simgrid-java_jar POST_BUILD
-  COMMENT "Add the documentation into simgrid.jar..."
-  DEPENDS ${MANIFEST_IN_FILE}
-	  ${CMAKE_HOME_DIRECTORY}/COPYING
-	  ${CMAKE_HOME_DIRECTORY}/ChangeLog
-	  ${CMAKE_HOME_DIRECTORY}/NEWS
-	  ${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java
-	  ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
-	    
-  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_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.msg org.simgrid.surf org.simgrid.trace
-  
-  COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1 NEWS
+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
+    COMMENT "Add the documentation into simgrid.jar..."
+    DEPENDS ${MANIFEST_IN_FILE}
+            ${CMAKE_HOME_DIRECTORY}/COPYING
+            ${CMAKE_HOME_DIRECTORY}/ChangeLog
+            ${CMAKE_HOME_DIRECTORY}/NEWS
+            ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
+
+    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_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.msg org.simgrid.trace
+
+    COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc
+    COMMAND ${JAVA_ARCHIVE} -uvf  ${SIMGRID_JAR} -C ${CMAKE_HOME_DIRECTORY} COPYING -C ${CMAKE_HOME_DIRECTORY} ChangeLog -C ${CMAKE_HOME_DIRECTORY} LICENSE-LGPL-2.1 -C ${CMAKE_HOME_DIRECTORY} NEWS
   )
+endif()
 
 ###
 ### Pack the java libraries into the jarfile if asked to do so
 ###
 
 if(enable_lib_in_jar)
-  find_program(STRIP_COMMAND strip)
-  mark_as_advanced(STRIP_COMMAND)
-  if(NOT STRIP_COMMAND)
-    set(STRIP_COMMAND "cmake -E echo (strip not found)")
-  endif()
+
+  
   set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
   
   if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")
@@ -127,67 +127,24 @@ if(enable_lib_in_jar)
   add_custom_command(
     TARGET simgrid-java_jar POST_BUILD
     COMMENT "Add the native libs into simgrid.jar..."
-    DEPENDS simgrid-java 
-	    ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
-	    ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO}
-	    ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO}
+    DEPENDS simgrid simgrid-java ${JAVALIBS}
 	  
-    COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
-    COMMAND ${CMAKE_COMMAND} -E make_directory                                     ${JAVA_NATIVE_PATH}
-    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 ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO}    ${JAVA_NATIVE_PATH}
+    COMMAND ${CMAKE_COMMAND} -E make_directory   ${JAVA_NATIVE_PATH}
     
-    # 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 ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO}    || true
-
-    COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  NATIVE
-    COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}      ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO}
+    # There is no way to disable the dependency of mingw-64 on that lib, unfortunately nor to script cmake -E properly
+    # So let's be brutal and copy it in any case (even on non-windows builds) from the location where chocolatey installs it.
+    # The copy is only expected to work on the appveyor builder, but that's all we need right now
+    # since our users are directed to download that file as nightly build.
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/tools/mingw64/bin/libwinpthread-1.dll  ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true
+
+    COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  ${JAVA_NATIVE_PATH}
     
     COMMAND ${CMAKE_COMMAND} -E echo "-- Cmake put the native code in ${JAVA_NATIVE_PATH}"
     COMMAND "${Java_JAVA_EXECUTABLE}" -classpath "${SIMGRID_JAR}" org.simgrid.NativeLib
-    )
-  if(MINGW)
-    find_library(WINPTHREAD_DLL
-      NAME winpthread winpthread-1
-      PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin
-    )
-    add_custom_command(
-      TARGET simgrid-java_jar POST_BUILD
-      COMMENT "Add the MinGW libs into simgrid.jar..."
-      DEPENDS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
-
-      COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
-      COMMAND ${CMAKE_COMMAND} -E make_directory          ${JAVA_NATIVE_PATH}
-      COMMAND ${CMAKE_COMMAND} -E copy ${WINPTHREAD_DLL}  ${JAVA_NATIVE_PATH}
-
-      COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  NATIVE
-      COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
-    )
-  endif(MINGW)
+  )
+    
 endif(enable_lib_in_jar)
 
 include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-
-if(${SWIG_FOUND})
-  set(CMAKE_SWIG_FLAGS "-package" "org.simgrid.surf")
-  set(CMAKE_SWIG_OUTDIR "${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/surf")
-
-  set_source_files_properties(${JSURF_SWIG_SRC} PROPERTIES CPLUSPLUS 1)
-
-  swig_add_module(surf-java java ${JSURF_SWIG_SRC} ${JSURF_JAVA_C_SRC})
-  swig_link_libraries(surf-java simgrid)
-else()
-  add_library(surf-java SHARED ${JSURF_C_SRC})
-  target_link_libraries(surf-java simgrid)
-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_jar surf-java)
-