Redo the way to install simgrid.

[simgrid.git] / buildtools / Cmake / src / CMakeDistrib.txt

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 8ebffaf..83a7266 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -3,7 +3,7 @@ set(simgrid_version "3.3.5")
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
-set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}_rev_${SVN_VERSION}${GIT_VERSION}")
+set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}${GIT_DATE}")
 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
 
 set(to_svg     
@@ -17,6 +17,7 @@ set(to_svg
        ${GTNETS_SRC}
        ${SURF_SRC}
        ${SIMIX_SRC}
+       ${TRACING_SRC}
        ${MSG_SRC}
        ${SIMDAG_SRC}
        ${GRAS_COMMON_SRC}
@@ -39,7 +40,9 @@ set(to_svg
        ${PROJECT_DIRECTORY}/./README.IEEE
        ${PROJECT_DIRECTORY}/./TODO
        ${PROJECT_DIRECTORY}/./src/smpi/smpicc.in
+       ${PROJECT_DIRECTORY}/./src/smpi/smpicc
        ${PROJECT_DIRECTORY}/./src/smpi/smpirun.in
+       ${PROJECT_DIRECTORY}/./src/smpi/smpirun
        ${PROJECT_DIRECTORY}/./src/bindings/ruby/simgrid_ruby.c
        ${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h
        ${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h
@@ -57,6 +60,7 @@ install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
 DESTINATION "/doc/"
 PATTERN ".svn" EXCLUDE 
 PATTERN ".git" EXCLUDE 
+PATTERN "*.o" EXCLUDE
 PATTERN "*~" EXCLUDE
 )
 
@@ -64,13 +68,17 @@ PATTERN "*~" EXCLUDE
 install(DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/"
 DESTINATION "/buildtools/Cmake/"
 PATTERN ".svn" EXCLUDE 
-PATTERN ".git" EXCLUDE 
+PATTERN ".git" EXCLUDE
+PATTERN "*.o" EXCLUDE
 PATTERN "*~" EXCLUDE
 )
 
 set(CPACK_SET_DESTDIR on)
 set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 
+string(REPLACE ";" "\t" install_HEADERS "${install_HEADERS}")
+string(REPLACE ";" "\t" install_libs "${install_libs}")
+
 add_custom_target(install-simgrid
 COMMAND mkdir -p ${prefix}
 COMMAND mkdir -p ${prefix}/lib
@@ -78,12 +86,13 @@ COMMAND mkdir -p ${prefix}/include
 COMMAND mkdir -p ${prefix}/doc
 COMMAND mkdir -p ${prefix}/doc/simgrid
 COMMAND mkdir -p ${prefix}/doc/simgrid/html
-COMMAND cp -rf ${PROJECT_DIRECTORY}/src/.libs/* ${prefix}/lib/
+COMMAND cp ${install_libs} ${prefix}/lib
 COMMAND echo "install lib ok"
-COMMAND cp -rf ${PROJECT_DIRECTORY}/include/ ${prefix}
-COMMAND echo "install include ok"
 COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ ${prefix}/doc/simgrid
 COMMAND echo "install doc ok"
+COMMAND cp --parent ${install_HEADERS} ${prefix}
+COMMAND echo "install include ok"
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}/./"
 )
 
 add_custom_target(uninstall
@@ -93,7 +102,8 @@ COMMAND echo "TODO"
 
 add_custom_target(html
 COMMAND echo "Make the html doc"
-COMMAND cmake ./
+COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
+COMMAND cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./
 COMMAND rm -rf ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake
@@ -110,11 +120,10 @@ add_custom_target(distcheck
 COMMAND make package
 COMMAND rm -rf ${PROJECT_DIRECTORY}/_CPack_Packages
 COMMAND tar xvf ${CPACK_PACKAGE_FILE_NAME}.tar.bz2
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME}
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && cmake -Ddisable_java=on .
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make test
-COMMAND rm -rf ${CPACK_PACKAGE_FILE_NAME}
+COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && cmake .
+COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && make
+COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && make test
+COMMAND rm -rf ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )