From e7a1fc1391c712c572ffc711ec9cba1790f7fc24 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 1 Feb 2013 00:34:50 +0100 Subject: [PATCH] Avoid to modify simgrid.jar at each build. --- buildtools/Cmake/MakeLib.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index b713183c1c..f2960f0b75 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/buildtools/Cmake/MakeLib.cmake @@ -47,11 +47,11 @@ if(enable_java) endif() set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid) - set(MANIFEST_FILE ${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF) add_jar(SG_java_jar ${JMSG_JAVA_SRC}) - add_custom_command(TARGET SG_java_jar POST_BUILD + + set(MANIFEST_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF") + add_custom_command(TARGET simgrid.jar POST_BUILD COMMENT "Update file MANIFEST.MF in simgrid.jar..." - DEPENDS ${MANIFEST_FILE} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} simgrid.jar ) @@ -67,7 +67,7 @@ if(enable_java) endif() message("Native libraries bundeled into: ${JSG_BUNDLE}") - add_custom_command(TARGET SG_java_jar POST_BUILD + add_custom_command(TARGET simgrid.jar POST_BUILD COMMENT "Combine native libraries in simgrid.jar..." DEPENDS simgrid SG_java WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" @@ -77,9 +77,9 @@ if(enable_java) COMMAND strip --strip-debug "${JSG_BUNDLE}/libsimgrid.so" COMMAND ${CMAKE_COMMAND} -E copy ./lib/libSG_java.so "${JSG_BUNDLE}" COMMAND strip --strip-debug "${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}/COPYING" "${JSG_BUNDLE}" COMMAND ${JAVA_ARCHIVE} -uvf simgrid.jar "NATIVE" ) endif() -- 2.20.1