diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-30 13:20:13 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-30 13:20:13 +0000 |
| commit | 7811297f0ad86acaad0477096dd919f51e18b3e7 (patch) | |
| tree | cee6cbf6324f65bb21be7b54c7d8c1795af4dd99 | |
| parent | Fix revno (diff) | |
| download | inkscape-7811297f0ad86acaad0477096dd919f51e18b3e7.tar.gz inkscape-7811297f0ad86acaad0477096dd919f51e18b3e7.zip | |
Fix revno with git
| -rw-r--r-- | CMakeLists.txt | 19 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 16 |
2 files changed, 22 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 35871ee28..7bd6294ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,21 +152,22 @@ endif() # Dist Target # ----------------------------------------------------------------------------- if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) - execute_process(COMMAND - git describe + execute_process( + COMMAND git show --format=format:"%ad %h" --date=short + COMMAND head -n 1 + COMMAND tr "\n" " " OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) else() set(INKSCAPE_REVISION "unknown") endif() set(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}") -#add_custom_target(dist -# COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake -# && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake -# && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX} -# "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" -# && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake -# WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") +add_custom_target(dist + COMMAND sed -i "s/unknown//" CMakeScripts/inkscape-version.cmake + && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake + && tar cfz ${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz ${CMAKE_SOURCE_DIR} --exclude=".*" --exclude-vcs-ignores + && git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") # ----------------------------------------------------------------------------- # Uninstall Target diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 65903c47b..12b8a26d8 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -12,10 +12,18 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) - execute_process(COMMAND - git describe ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) + + execute_process(COMMAND git describe + COMMAND tr "\n" " " + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} + OUTPUT_VARIABLE INKSCAPE_REV1) + execute_process(COMMAND git show --format=format:%ad --date=short + COMMAND head -n 1 + COMMAND tr "\n" " " + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} + OUTPUT_VARIABLE INKSCAPE_REV2 + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(INKSCAPE_REVISION ${INKSCAPE_REV1} ${INKSCAPE_REV2}) execute_process(COMMAND git status -s ${INKSCAPE_SOURCE_DIR}/src |