X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a41288199a037f57d4c3ca5e5619104ca0897e1f..41dc0d03d65ec6d89569d47d3a335d84b0ba927e:/buildtools/Cmake/Distrib.cmake diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index a054f6f53c..34d620b302 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -95,12 +95,12 @@ foreach(file ${HEADERS}) endforeach(file ${HEADERS}) # example files -foreach(file ${examples_to_install_in_doc}) +foreach(file ${examples_to_install}) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/examples/" "" file ${file}) get_filename_component(location ${file} PATH) install(FILES "examples/${file}" DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location}) -endforeach(file ${examples_to_install_in_doc}) +endforeach(file ${examples_to_install}) # bindings cruft @@ -138,6 +138,7 @@ COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/tesh COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid-colorizer COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid_update_xml COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/gras_stub_generator +COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/graphicator COMMAND ${CMAKE_COMMAND} -E echo "uninstall bin ok" COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/amok COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/gras @@ -145,13 +146,17 @@ COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/ins COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/msg COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/simdag COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/smpi +COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/simix COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/surf COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/xbt COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/mc +COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/simgrid COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/simgrid_config.h COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/gras.h COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/xbt.h COMMAND ${CMAKE_COMMAND} -E echo "uninstall include ok" +COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/simgrid_update_xml.1 +COMMAND ${CMAKE_COMMAND} -E echo "uninstall man ok" WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" ) @@ -169,14 +174,57 @@ endif(HAVE_LUA) ## (instead of any cruft laying on my disk as CPack does) ### ################################################################ +# This is the complete list of what will be added to the source archive +set(source_to_pack + ${headers_to_install} + ${source_of_generated_headers} + ${XBT_RL_SRC} + ${EXTRA_DIST} + ${SMPI_SRC} + ${GRAS_RL_SRC} + ${XBT_SRC} + ${GTNETS_SRC} + ${NS3_SRC} + ${SURF_SRC} + ${SIMIX_SRC} + ${TRACING_SRC} + ${MSG_SRC} + ${SIMDAG_SRC} + ${GRAS_COMMON_SRC} + ${GRAS_SG_SRC} + ${AMOK_SRC} + ${LUA_SRC} + ${MC_SRC} + ${JEDULE_SRC} + ${RNGSTREAM_SRC} + ${BINDINGS_FILES} + ${CMAKE_SOURCE_FILES} + ${EXAMPLES_CMAKEFILES_TXT} + ${TESHSUITE_CMAKEFILES_TXT} + ${TOOLS_CMAKEFILES_TXT} + ${TESTSUITE_CMAKEFILES_TXT} + ${DOC_SOURCES} + ${DOC_FIGS} + ${README_files} + ${xml_files} + ${tesh_files} + ${txt_files} + ${bin_files} + ${examples_src} + ${teshsuite_src} + ${tools_src} + ${testsuite_src} + ${PLATFORMS_EXAMPLES} +) + ########################################## ### Fill in the "make dist-dir" target ### ########################################## add_custom_target(dist-dir COMMENT "Generating the distribution directory" - COMMAND test -e ${PROJECT_NAME}-${release_version}/ && chmod -R a+w ${PROJECT_NAME}-${release_version}/ || true COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/ + COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_NAME}-${release_version}.tar.gz COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version} COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/html/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ ${PROJECT_NAME}-${release_version}/doc/html/ @@ -194,23 +242,23 @@ foreach(file ${source_to_pack}) get_filename_component(file_location ${file} PATH) string(REGEX MATCH ";${file_location};" OPERATION "${dirs_in_tarball}") if(NOT OPERATION) - set(dirs_in_tarball "${dirs_in_tarball};${file_location};") - add_custom_command( - TARGET dist-dir - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/ - ) - endif(NOT OPERATION) - - # Actually copy the file - add_custom_command( - TARGET dist-dir - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} ${PROJECT_NAME}-${release_version}/${file_location}/ - ) - - add_custom_command( - TARGET dist-dir - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile - ) + set(dirs_in_tarball "${dirs_in_tarball};${file_location};") + add_custom_command( + TARGET dist-dir + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/ + ) + endif(NOT OPERATION) + + # Actually copy the file + add_custom_command( + TARGET dist-dir + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} ${PROJECT_NAME}-${release_version}/${file_location}/ + ) + + add_custom_command( + TARGET dist-dir + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile + ) endforeach(file ${source_to_pack}) ###################################### @@ -218,8 +266,11 @@ endforeach(file ${source_to_pack}) ###################################### add_custom_target(dist + COMMENT "Removing the distribution directory" DEPENDS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz + COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/ ) + add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz COMMENT "Compressing the archive from the distribution directory" @@ -229,53 +280,56 @@ add_custom_command( ) add_dependencies(dist dist-dir) +if(NOT enable_maintainer_mode) + add_custom_target(echo-dist + COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------" + COMMAND ${CMAKE_COMMAND} -E echo "WARNING: Distrib is generated without option maintainer mode " + COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------" + ) + add_dependencies(dist echo-dist) +endif(NOT enable_maintainer_mode) + ########################################### ### Fill in the "make distcheck" target ### ########################################### +set(CMAKE_BINARY_TEST_DIR ${CMAKE_BINARY_DIR}) + # Allow to test the "make dist" add_custom_target(distcheck COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy" - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}.cpy - COMMAND ${CMAKE_COMMAND} -E echo "XXX copy again the source tree" - COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_NAME}-${release_version}/ ${PROJECT_NAME}-${release_version}.cpy + COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} + + COMMAND ${CMAKE_COMMAND} -E echo "XXX Untar distrib" + COMMAND ${CMAKE_COMMAND} -E tar xf ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} + COMMAND ${CMAKE_COMMAND} -E echo "XXX create build and install subtrees" - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/_build - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/_inst - - # This stupid cmake creates a directory in source, killing the purpose of the chmod - # (tricking around) - COMMAND ${CMAKE_COMMAND} -E echo "XXX change the modes of directories" - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/CMakeFiles - COMMAND chmod -R a-w ${PROJECT_NAME}-${release_version}/ # FIXME: we should pass without commenting that line - COMMAND chmod -R a+w ${PROJECT_NAME}-${release_version}/_build - COMMAND chmod -R a+w ${PROJECT_NAME}-${release_version}/_inst - COMMAND chmod -R a+w ${PROJECT_NAME}-${release_version}/CMakeFiles - + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst + COMMAND ${CMAKE_COMMAND} -E echo "XXX Configure" - COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build ${CMAKE_COMMAND} build .. -DCMAKE_INSTALL_PREFIX=../_inst -Wno-dev -Denable_doc=OFF -# COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build make dist-dir + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build + ${CMAKE_COMMAND} + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst + -Denable_lua=ON + -Denable_model-checking=ON + .. COMMAND ${CMAKE_COMMAND} -E echo "XXX Build" - COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build make VERBOSE=1 - - # This fails, unfortunately, because GRAS is broken for now - COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build ctest -j5 --output-on-failure - - COMMAND ${CMAKE_COMMAND} -E echo "XXX Check that cleaning works" - COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build make clean - COMMAND ${CMAKE_COMMAND} -E echo "XXX Display what is remaining after make clean" - COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build ls -lR - COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove _build and _inst directories" - COMMAND chmod a+w ${PROJECT_NAME}-${release_version}/ - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/_build - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/_inst - COMMAND ${CMAKE_COMMAND} -E echo "XXX The output of the diff follows" - COMMAND diff -ruN ${PROJECT_NAME}-${release_version}.cpy ${PROJECT_NAME}-${release_version} - COMMAND ${CMAKE_COMMAND} -E echo "XXX end of the diff, random cleanups now" - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}.cpy - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version} + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} + + COMMAND ${CMAKE_COMMAND} -E echo "XXX Test" + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ctest || true + + COMMAND ${CMAKE_COMMAND} -E echo "XXX Install" + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} install + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgrid.so + ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgridtest.so + + COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove temp directories" + COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} ) -add_dependencies(distcheck dist-dir) +#add_dependencies(distcheck dist) ####################################### ### Fill in the "make check" target ### @@ -325,15 +379,17 @@ WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" add_custom_target(sync-gforge-doc COMMAND chmod g+rw -R doc/ COMMAND chmod a+rX -R doc/ +COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ || true COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/ || true -COMMAND scp doc/html/simgrid_modules2.png doc/html/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/ +COMMAND scp doc/html/simgrid_modules2.png doc/html/simgrid_modules.png doc/webcruft/simgrid_logo_2011.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/ WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ) add_dependencies(sync-gforge-doc simgrid_documentation) add_custom_target(sync-gforge-dtd -COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/${release_version}/ +COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/simgrid.dtd +COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" )