From: navarrop Date: Thu, 25 Mar 2010 14:04:53 +0000 (+0000) Subject: Add necessary files to distrib. X-Git-Tag: SVN~367 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a321c6c29f2ef6c7de3dfd00f6ce8e454bde0ab6 Add necessary files to distrib. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7373 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/.gitignore b/.gitignore index 45ce6d05fd..f5fa8d17c9 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,8 @@ buildtools/Cmake/src/tmp_gras_config.h.in conftestval cmake_install.cmake CMakeFiles +install_manifest.txt +_CPack_Packages/ bibtex2html-1.02/ doc/all_bib.html diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index c505b89204..6930171d73 100644 --- 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}") +set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}_rev_${SVN_VERSION}${GIT_VERSION}") set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP set(to_svg @@ -38,6 +38,11 @@ set(to_svg ${PROJECT_DIRECTORY}/./README ${PROJECT_DIRECTORY}/./README.IEEE ${PROJECT_DIRECTORY}/./TODO + ${PROJECT_DIRECTORY}/./src/smpi/smpicc.in + ${PROJECT_DIRECTORY}/./src/smpi/smpirun.in + ${PROJECT_DIRECTORY}/./src/bindings/ruby/simgrid_ruby.c + ${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h + ${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h ) foreach(file ${to_svg}) diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt index d3a97b79a8..067f1bbb27 100644 --- a/buildtools/Cmake/src/CMakeOption.txt +++ b/buildtools/Cmake/src/CMakeOption.txt @@ -17,6 +17,8 @@ option(enable_compile_optimizations "" off) option(enable_maintainer_mode "Permit to make flex and flexml files." off) option(supernovae "Supernovae mode." off) +mark_as_advanced(LUA_LIB_PATH_1) +mark_as_advanced(LUA_LIB_PATH_2) mark_as_advanced(HAVE_LUA5_1_LAUXLIB_H) mark_as_advanced(HAVE_LUA5_1_LUALIB_H) mark_as_advanced(CLEAR gtnets_path) @@ -41,4 +43,5 @@ mark_as_advanced(SED_EXE) mark_as_advanced(SET_MAKE) mark_as_advanced(SH_EXE) mark_as_advanced(SVN) +mark_as_advanced(GIT) mark_as_advanced(VALGRIND_PATH)