X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a..7180ea8446785dbdd3faba8e53f18982520934ea:/buildtools/Cmake/Distrib.cmake diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index c8622b8090..74b4736f63 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -3,31 +3,15 @@ ######################################### # doc -file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/shared/doxygen/) -file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/) -file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/) - -install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/" - DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/ref_guide/html/" - PATTERN ".svn" EXCLUDE - PATTERN ".git" EXCLUDE - PATTERN "*.o" EXCLUDE - PATTERN "*~" EXCLUDE - ) - -install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/" - DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/user_guide/html/" - PATTERN ".svn" EXCLUDE - PATTERN ".git" EXCLUDE - PATTERN "*.o" EXCLUDE - PATTERN "*~" EXCLUDE - ) +file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html/) +install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/" + DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/) #### Generate the manpages if(NOT WIN32) if( NOT MANPAGE_DIR) set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages ) - endif( NOT MANPAGE_DIR) + endif() add_custom_target(manpages ALL COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR} @@ -37,12 +21,13 @@ if(NOT WIN32) install(FILES ${MANPAGE_DIR}/simgrid_update_xml.1 ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1 DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1) -endif(NOT WIN32) +endif() # binaries install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc ${CMAKE_BINARY_DIR}/bin/smpif2c ${CMAKE_BINARY_DIR}/bin/smpiff + ${CMAKE_BINARY_DIR}/bin/smpif90 ${CMAKE_BINARY_DIR}/bin/smpirun DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) @@ -70,17 +55,14 @@ add_custom_target(simgrid_update_xml ALL COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml ) -install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/gras_stub_generator - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) - # libraries -install(TARGETS simgrid gras +install(TARGETS simgrid DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) if(enable_smpi) install(TARGETS smpi DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -endif(enable_smpi) +endif() if(enable_lib_static AND NOT WIN32) install(TARGETS simgrid_static @@ -88,8 +70,8 @@ if(enable_lib_static AND NOT WIN32) if(enable_smpi) install(TARGETS smpi_static DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) - endif(enable_smpi) -endif(enable_lib_static AND NOT WIN32) + endif() +endif() # include files set(HEADERS @@ -126,7 +108,7 @@ if(HAVE_LUA) install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE} DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lua/5.1 ) -endif(HAVE_LUA) +endif() ########################################### ### Fill in the "make uninstall" target ### @@ -135,22 +117,20 @@ endif(HAVE_LUA) add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/doc/simgrid COMMAND ${CMAKE_COMMAND} -E echo "uninstall doc ok" - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/libgras* COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsimgrid* COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsmpi* + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid* COMMAND ${CMAKE_COMMAND} -E echo "uninstall lib ok" COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpicc COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpif2c COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpiff + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpif90 COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpirun 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 COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/instr COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/msg COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/simdag @@ -161,10 +141,10 @@ add_custom_target(uninstall 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 remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/tesh.1 COMMAND ${CMAKE_COMMAND} -E echo "uninstall man ok" WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" ) @@ -175,7 +155,7 @@ if(HAVE_LUA) COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE} WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/" ) -endif(HAVE_LUA) +endif() ################################################################ ## Build a sain "make dist" target to build a source package ### @@ -187,11 +167,7 @@ endif(HAVE_LUA) set(source_to_pack ${headers_to_install} ${source_of_generated_headers} - ${AMOK_SRC} ${BINDINGS_SRC} - ${GRAS_COMMON_SRC} - ${GRAS_RL_SRC} - ${GRAS_SG_SRC} ${GTNETS_SRC} ${JEDULE_SRC} ${LUA_SRC} @@ -200,6 +176,7 @@ set(source_to_pack ${NS3_SRC} ${RNGSTREAM_SRC} ${SIMDAG_SRC} + ${SIMGRID_SRC} ${SIMIX_SRC} ${SMPI_SRC} ${SURF_SRC} @@ -213,9 +190,9 @@ set(source_to_pack ${TESTSUITE_CMAKEFILES_TXT} ${TOOLS_CMAKEFILES_TXT} ${DOC_FIGS} + ${DOC_IMG} ${DOC_SOURCES} - ${REF_GUIDE_SOURCES} - ${USER_GUIDE_SOURCES} + ${DOC_TOOLS} ${PLATFORMS_EXAMPLES} ${README_files} ${bin_files} @@ -237,10 +214,6 @@ add_custom_target(dist-dir 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/user_guide/html/ - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/ref_guide/html/ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/ ${PROJECT_NAME}-${release_version}/doc/user_guide/html/ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/ ${PROJECT_NAME}-${release_version}/doc/ref_guide/html/ ) add_dependencies(dist-dir simgrid_documentation) add_dependencies(dist-dir maintainer_files) @@ -260,7 +233,7 @@ foreach(file ${source_to_pack}) TARGET dist-dir COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/ ) - endif(NOT OPERATION) + endif() # Actually copy the file add_custom_command( @@ -300,7 +273,7 @@ if(NOT enable_maintainer_mode) COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------" ) add_dependencies(dist echo-dist) -endif(NOT enable_maintainer_mode) +endif() ########################################### ### Fill in the "make distcheck" target ### @@ -314,7 +287,7 @@ add_custom_target(distcheck 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 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 ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build @@ -324,14 +297,12 @@ add_custom_target(distcheck 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 ${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 chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ctest 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 @@ -339,10 +310,16 @@ add_custom_target(distcheck ${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 Build documentation" + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} simgrid_documentation + + COMMAND ${CMAKE_COMMAND} -E echo "XXX Install with documentation" + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} install + 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) +add_dependencies(distcheck dist) ####################################### ### Fill in the "make check" target ### @@ -352,11 +329,11 @@ if(enable_memcheck) add_custom_target(check COMMAND ctest -D ExperimentalMemCheck ) -else(enable_memcheck) +else() add_custom_target(check COMMAND make test ) -endif(enable_memcheck) +endif() ####################################### ### Fill in the "make xxx-clean" target ### @@ -379,23 +356,10 @@ add_custom_target(maintainer-clean ) add_custom_target(supernovae-clean - COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_gras.c COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_sg.c COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ) -############################################# -### Fill in the "make sync-gforge" target ### -############################################# - -#PIPOL -add_custom_target(sync-pipol - COMMAND scp -r Experimental_bindings.sh Experimental.sh MemCheck.sh pre-simgrid.sh navarro@pipol.inria.fr:~/ - COMMAND scp -r rc.* navarro@pipol.inria.fr:~/.pipol/ - COMMAND scp -r Nightly* navarro@pipol.inria.fr:~/.pipol/nightly - COMMAND ssh navarro@pipol.inria.fr "chmod a=rwx ~/* ~/.pipol/rc.* ~/.pipol/nightly/*" - WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/buildtools/pipol/" - ) include(CPack)