X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e78565ea6b354a0e6250a87b483f909665a0ac3..3b53885f888f2539a533797e76a3f3ff84cdfe0c:/buildtools/Cmake/Distrib.cmake diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 4e314ba5cc..68e086b2e4 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -20,18 +20,32 @@ if(NOT WIN32) COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1 COMMENT "Generating manpages" ) - install(FILES ${MANPAGE_DIR}/simgrid_update_xml.1 ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1 + install(FILES + ${MANPAGE_DIR}/simgrid_update_xml.1 + ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1 + ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicc.1 + ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicxx.1 + ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpif90.1 + ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpiff.1 + ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpirun.1 DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1) 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/) +if(enable_smpi) + install(PROGRAMS + ${CMAKE_BINARY_DIR}/bin/smpicc + ${CMAKE_BINARY_DIR}/bin/smpicxx + ${CMAKE_BINARY_DIR}/bin/smpirun + DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) + if(SMPI_FORTRAN) + install(PROGRAMS + ${CMAKE_BINARY_DIR}/bin/smpif90 + ${CMAKE_BINARY_DIR}/bin/smpiff + DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) + endif() +endif() install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) @@ -58,28 +72,25 @@ add_custom_target(simgrid_update_xml ALL ) # libraries -install(TARGETS simgrid +install(TARGETS simgrid DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -if(enable_smpi) - install(TARGETS smpi - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -endif() - if(enable_lib_static AND NOT WIN32) install(TARGETS simgrid_static DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) - if(enable_smpi) - install(TARGETS smpi_static - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) - endif() endif() if(enable_java) - install(TARGETS SG_java + if(enable_lib_in_jar) + set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_FULL_JAR}") + else() + set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_JAR}") + endif() + install(TARGETS simgrid-java DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) - install(FILES ${SIMGRID_JAR} - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/) + install(FILES ${SIMGRID_JAR_TO_INSTALL} + DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/ + RENAME simgrid.jar) endif() # include files @@ -127,11 +138,10 @@ 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/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/smpicxx 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 @@ -149,11 +159,19 @@ add_custom_target(uninstall 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.h COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/simgrid_config.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 remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/tesh.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpicc.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpicxx.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpirun.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpiff.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpif90.1 + + COMMAND ${CMAKE_COMMAND} -E echo "uninstall man ok" WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" ) @@ -177,13 +195,18 @@ set(source_to_pack ${headers_to_install} ${source_of_generated_headers} ${BINDINGS_SRC} - ${GTNETS_SRC} ${JEDULE_SRC} ${JMSG_C_SRC} ${JMSG_JAVA_SRC} + ${JSURF_SWIG_SRC} + ${JSURF_SWIG_SRC_EXTRA} + ${JSURF_C_SRC} ${LUA_SRC} + ${MC_SRC_BASE} ${MC_SRC} + ${MC_SIMGRID_MC_SRC} ${MSG_SRC} + ${S4U_SRC} ${NS3_SRC} ${RNGSTREAM_SRC} ${SIMDAG_SRC} @@ -198,7 +221,6 @@ set(source_to_pack ${CMAKE_SOURCE_FILES} ${EXAMPLES_CMAKEFILES_TXT} ${TESHSUITE_CMAKEFILES_TXT} - ${TESTSUITE_CMAKEFILES_TXT} ${TOOLS_CMAKEFILES_TXT} ${DOC_FIGS} ${DOC_IMG} @@ -228,7 +250,6 @@ add_custom_target(dist-dir 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/ ) -add_dependencies(dist-dir simgrid_documentation) add_dependencies(dist-dir maintainer_files) set(dirs_in_tarball "") @@ -251,13 +272,14 @@ foreach(file ${source_to_pack}) # 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}/ + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} ${PROJECT_NAME}-${release_version}/${file_location} ) endforeach(file ${source_to_pack}) add_custom_command( TARGET dist-dir COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile + COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion ) ###################################### @@ -298,7 +320,7 @@ set(CMAKE_BINARY_TEST_DIR ${CMAKE_BINARY_DIR}) # Allow to test the "make dist" add_custom_target(distcheck COMMAND ${CMAKE_COMMAND} -E echo "XXX compare archive with git repository" - COMMAND ${CMAKE_HOME_DIRECTORY}/tools/check_dist_archive -batch ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz + COMMAND ${CMAKE_HOME_DIRECTORY}/tools/internal/check_dist_archive -batch ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy" COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} @@ -319,7 +341,7 @@ add_custom_target(distcheck 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 + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ctest --output-on-failure 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 @@ -327,9 +349,6 @@ 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 @@ -372,11 +391,4 @@ add_custom_target(maintainer-clean WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ) -add_custom_target(supernovae-clean - 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}" - ) - - include(CPack)