From ead2689dfad687ab5d189151dfd12ea979c42ae8 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 1 Feb 2013 11:47:01 +0100 Subject: [PATCH] Another fix in build depends. Hope it is correct now. Workaround a bug in cmake -E touch, where the modifiction time is truncated when file exists. --- buildtools/Cmake/MakeLib.cmake | 10 ++++++---- examples/java/async/CMakeLists.txt | 3 ++- examples/java/bittorrent/CMakeLists.txt | 3 ++- examples/java/chord/CMakeLists.txt | 3 ++- examples/java/cloud/CMakeLists.txt | 3 ++- examples/java/commTime/CMakeLists.txt | 3 ++- examples/java/io/CMakeLists.txt | 3 ++- examples/java/kademlia/CMakeLists.txt | 3 ++- examples/java/master_slave_bypass/CMakeLists.txt | 3 ++- examples/java/master_slave_kill/CMakeLists.txt | 3 ++- examples/java/masterslave/CMakeLists.txt | 3 ++- examples/java/migration/CMakeLists.txt | 3 ++- examples/java/mutualExclusion/CMakeLists.txt | 3 ++- examples/java/pingPong/CMakeLists.txt | 3 ++- examples/java/priority/CMakeLists.txt | 3 ++- examples/java/startKillTime/CMakeLists.txt | 3 ++- examples/java/suspend/CMakeLists.txt | 3 ++- examples/java/tracing/CMakeLists.txt | 3 ++- 18 files changed, 40 insertions(+), 21 deletions(-) diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index 37a020c670..dc94f02a74 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/buildtools/Cmake/MakeLib.cmake @@ -72,21 +72,23 @@ if(enable_java) add_custom_command( COMMENT "Finalize simgrid.jar..." OUTPUT ${SIMGRID_JAR}_finalized - DEPENDS simgrid SG_java ${SIMGRID_JAR} ${MANIFEST_FILE} + DEPENDS ${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 - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" COMMAND ${CMAKE_COMMAND} -E remove_directory "NATIVE" COMMAND ${CMAKE_COMMAND} -E make_directory "${JSG_BUNDLE}" - COMMAND ${CMAKE_COMMAND} -E copy "./lib/${LIBSIMGRID_SO}" "${JSG_BUNDLE}" + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}" "${JSG_BUNDLE}" COMMAND ${CMAKE_STRIP} -S "${JSG_BUNDLE}/${LIBSIMGRID_SO}" - COMMAND ${CMAKE_COMMAND} -E copy "./lib/${LIBSG_JAVA_SO}" "${JSG_BUNDLE}" + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/lib/${LIBSG_JAVA_SO}" "${JSG_BUNDLE}" COMMAND ${CMAKE_STRIP} -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 ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} "NATIVE" + COMMAND ${CMAKE_COMMAND} -E remove ${SIMGRID_JAR}_finalized COMMAND ${CMAKE_COMMAND} -E touch ${SIMGRID_JAR}_finalized ) add_custom_target(SG_java_jar_finalize DEPENDS ${SIMGRID_JAR}_finalized) diff --git a/examples/java/async/CMakeLists.txt b/examples/java/async/CMakeLists.txt index 41082fe491..18d4de12cc 100644 --- a/examples/java/async/CMakeLists.txt +++ b/examples/java/async/CMakeLists.txt @@ -13,9 +13,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/bittorrent/CMakeLists.txt b/examples/java/bittorrent/CMakeLists.txt index a8a46f2627..a245baa0e8 100644 --- a/examples/java/bittorrent/CMakeLists.txt +++ b/examples/java/bittorrent/CMakeLists.txt @@ -15,9 +15,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/chord/CMakeLists.txt b/examples/java/chord/CMakeLists.txt index 50c534f1d7..90167e8070 100644 --- a/examples/java/chord/CMakeLists.txt +++ b/examples/java/chord/CMakeLists.txt @@ -17,9 +17,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/cloud/CMakeLists.txt b/examples/java/cloud/CMakeLists.txt index d3ef5f64b5..9dbb0d1cfc 100644 --- a/examples/java/cloud/CMakeLists.txt +++ b/examples/java/cloud/CMakeLists.txt @@ -12,9 +12,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/commTime/CMakeLists.txt b/examples/java/commTime/CMakeLists.txt index 2404c0f02f..320b5c8b84 100644 --- a/examples/java/commTime/CMakeLists.txt +++ b/examples/java/commTime/CMakeLists.txt @@ -12,9 +12,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/io/CMakeLists.txt b/examples/java/io/CMakeLists.txt index 1d1e5ab1de..767e4d6b90 100644 --- a/examples/java/io/CMakeLists.txt +++ b/examples/java/io/CMakeLists.txt @@ -10,9 +10,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/kademlia/CMakeLists.txt b/examples/java/kademlia/CMakeLists.txt index b6cdc1ac13..8b3833d73f 100644 --- a/examples/java/kademlia/CMakeLists.txt +++ b/examples/java/kademlia/CMakeLists.txt @@ -20,9 +20,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/master_slave_bypass/CMakeLists.txt b/examples/java/master_slave_bypass/CMakeLists.txt index ae5fea702f..9b18ca45d2 100644 --- a/examples/java/master_slave_bypass/CMakeLists.txt +++ b/examples/java/master_slave_bypass/CMakeLists.txt @@ -12,9 +12,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/master_slave_kill/CMakeLists.txt b/examples/java/master_slave_kill/CMakeLists.txt index c4ff8beaf6..34e5b26f9e 100644 --- a/examples/java/master_slave_kill/CMakeLists.txt +++ b/examples/java/master_slave_kill/CMakeLists.txt @@ -12,9 +12,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/masterslave/CMakeLists.txt b/examples/java/masterslave/CMakeLists.txt index e0173a3326..c3083f64b4 100644 --- a/examples/java/masterslave/CMakeLists.txt +++ b/examples/java/masterslave/CMakeLists.txt @@ -13,9 +13,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/migration/CMakeLists.txt b/examples/java/migration/CMakeLists.txt index 383a02d2a1..72108f0fe9 100644 --- a/examples/java/migration/CMakeLists.txt +++ b/examples/java/migration/CMakeLists.txt @@ -11,9 +11,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/mutualExclusion/CMakeLists.txt b/examples/java/mutualExclusion/CMakeLists.txt index 9e5b45ad0e..4593c8c40c 100644 --- a/examples/java/mutualExclusion/CMakeLists.txt +++ b/examples/java/mutualExclusion/CMakeLists.txt @@ -14,9 +14,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/pingPong/CMakeLists.txt b/examples/java/pingPong/CMakeLists.txt index 95b1361115..8756c210dd 100644 --- a/examples/java/pingPong/CMakeLists.txt +++ b/examples/java/pingPong/CMakeLists.txt @@ -12,9 +12,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/priority/CMakeLists.txt b/examples/java/priority/CMakeLists.txt index 6d838dd92e..a93beec0bb 100644 --- a/examples/java/priority/CMakeLists.txt +++ b/examples/java/priority/CMakeLists.txt @@ -10,9 +10,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/startKillTime/CMakeLists.txt b/examples/java/startKillTime/CMakeLists.txt index 46ea1145d0..0a9716ac34 100644 --- a/examples/java/startKillTime/CMakeLists.txt +++ b/examples/java/startKillTime/CMakeLists.txt @@ -11,9 +11,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/suspend/CMakeLists.txt b/examples/java/suspend/CMakeLists.txt index 8c0e73c330..0ac2dfd6a7 100644 --- a/examples/java/suspend/CMakeLists.txt +++ b/examples/java/suspend/CMakeLists.txt @@ -11,9 +11,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) diff --git a/examples/java/tracing/CMakeLists.txt b/examples/java/tracing/CMakeLists.txt index 1ae946b17e..f035001a36 100644 --- a/examples/java/tracing/CMakeLists.txt +++ b/examples/java/tracing/CMakeLists.txt @@ -12,9 +12,10 @@ if(enable_java) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} ${SIMGRID_JAR} + DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} + COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled ) add_custom_target(${example} ALL DEPENDS ${example}_compiled) -- 2.20.1