rename facets to extensions for clarity sake

[simgrid.git] / tools / cmake / Java.cmake

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 1fb5127..c3ef8f7 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -101,11 +101,14 @@ add_custom_command(
 ###
 
 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()
+
+  # Stripping disabled for the time being to make Java debuggable. We should introduce a proper option for that.
+  #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")
@@ -138,18 +141,27 @@ if(enable_lib_in_jar)
     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}
     
-    # 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
+    ## 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 echo "-- Cmake put the native code in ${JAVA_NATIVE_PATH}"
     COMMAND "${Java_JAVA_EXECUTABLE}" -classpath "${SIMGRID_JAR}" org.simgrid.NativeLib
     )
+    
+  if (HAVE_BOOST_CONTEXT)
+    add_custom_command(
+      TARGET simgrid-java_jar POST_BUILD
+      COMMENT "Add the boost_context lib into simgrid.jar..."
+      COMMAND ${CMAKE_COMMAND} -E copy ${Boost_CONTEXT_LIBRARY_RELEASE}  ${JAVA_NATIVE_PATH}
+      COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  NATIVE
+    )
+  endif()
+  
   if(MINGW)
     find_library(WINPTHREAD_DLL
       NAME winpthread winpthread-1