From e67f5a9a4b03ef81a4be31005fe8bde1968ec168 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 30 Mar 2010 16:12:21 +0000 Subject: [PATCH] Add time and date to distrib. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7402 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/src/CMakeCompleteInFiles.txt | 5 +++++ buildtools/Cmake/src/CMakeDistrib.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt index 604a449dc2..d78ea8ce83 100644 --- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt +++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt @@ -270,6 +270,11 @@ endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) find_file(GIT ".git" ${PROJECT_DIRECTORY}) exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION") + exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE") + STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE}) + STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE}) + STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE}) + message("GIT_DATE : ${GIT_DATE}") endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) ################################### diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index 53cf30ce23..632cbee1d8 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}${GIT_VERSION}") +set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}${GIT_DATE}") set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP set(to_svg -- 2.20.1