From: mquinson Date: Tue, 15 Jun 2010 19:40:13 +0000 (+0000) Subject: make clean works now X-Git-Tag: v3_5~943 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4186c47274eb5abc59c85ed6e8963f7ceb8dab44 make clean works now git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7866 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index e2f68c7c83..06d37d6874 100755 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -214,9 +214,11 @@ add_dependencies(dist dist-dir) # Allow to test the "make dist" add_custom_target(distcheck + COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy + COMMAND ${CMAKE_COMMAND} -E copy_directory simgrid-${release_version}/ simgrid-${release_version}.cpy COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_build COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_inst - + # This stupid cmake creates a directory in source, killing the purpose of the chmod # (tricking around) COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/CMakeFiles @@ -227,9 +229,17 @@ add_custom_target(distcheck COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ${CMAKE_COMMAND} build .. -Dprefix=../_inst # COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make dist-dir - COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make - COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ctest -j5 --output-on-failure + COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make + + # This fails, unfortunately, because GRAS is broken for now +# COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ctest -j5 --output-on-failure + + COMMAND ${CMAKE_COMMAND} -E echo "XXX Check that cleaning works" COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make clean + COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_build + COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_inst + COMMAND diff -ruN simgrid-${release_version}.cpy simgrid-${release_version} +# COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy # COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/ ) add_dependencies(distcheck dist-dir) diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake index 2c6745b3d4..d745412580 100644 --- a/buildtools/Cmake/MakeExeLib.cmake +++ b/buildtools/Cmake/MakeExeLib.cmake @@ -29,7 +29,15 @@ endif(WIN32) if(HAVE_RUBY) set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME} -module") - exec_program("${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}" OUTPUT_VARIABLE LIEN_OK) + exec_program("${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" + "${PROJECT_DIRECTORY}" + OUTPUT_VARIABLE IGNORED) + + # Make sure this extra link will get cleaned + get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) + set_directory_properties( + PROPERTIES + ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so") endif(HAVE_RUBY) if(CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -49,7 +57,15 @@ endif(pthread) if(HAVE_LUA) SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}") - exec_program("${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}" OUTPUT_VARIABLE LIEN_OK) + exec_program("${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" + "${PROJECT_DIRECTORY}" + OUTPUT_VARIABLE IGNORED) + + # Make sure this extra link will get cleaned + get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) + set_directory_properties( + PROPERTIES + ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${PROJECT_DIRECTORY}/examples/lua/simgrid.so") endif(HAVE_LUA) if(HAVE_GTNETS) diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 7f353d4767..0e08368051 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -12,21 +12,21 @@ target_link_libraries(ex_sd_test2 simgrid pthread m -fprofile-arcs) target_link_libraries(ex_sd_seq_access simgrid pthread m -fprofile-arcs) add_custom_command(TARGET ex_sd_test -POST_BUILD -COMMAND "cp" -ARGS ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test ${PROJECT_DIRECTORY}/examples/simdag/sd_test -WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/" + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test ${PROJECT_DIRECTORY}/examples/simdag/sd_test + WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/" ) add_custom_command(TARGET ex_sd_test2 -POST_BUILD -COMMAND "cp" -ARGS ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test2 ${PROJECT_DIRECTORY}/examples/simdag/sd_test2 -WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/" -) + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test2 ${PROJECT_DIRECTORY}/examples/simdag/sd_test2 + WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/") add_custom_command(TARGET ex_sd_seq_access -POST_BUILD -COMMAND "cp" -ARGS ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_seq_access ${PROJECT_DIRECTORY}/examples/simdag/sd_seq_access -WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/" -) + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_seq_access ${PROJECT_DIRECTORY}/examples/simdag/sd_seq_access + WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/") + +get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) +set_directory_properties( + PROPERTIES + ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${PROJECT_DIRECTORY}/examples/simdag/sd_test;${PROJECT_DIRECTORY}/examples/simdag/sd_test2;${PROJECT_DIRECTORY}/examples/simdag/sd_seq_access")