diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-06-30 13:23:07 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2017-06-30 13:23:07 +0000 |
| commit | 932a3ad6c59a36cded615fa024822c88b200b4ff (patch) | |
| tree | 54132112405ad1cc31ffc9045f55522ebaf778a6 | |
| parent | Fix and clean clean some icons. (diff) | |
| parent | Merge branch 'master' of gitlab.com:inkscape/inkscape (diff) | |
| download | inkscape-932a3ad6c59a36cded615fa024822c88b200b4ff.tar.gz inkscape-932a3ad6c59a36cded615fa024822c88b200b4ff.zip | |
Merge branch 'master' of https://gitlab.com/inkscape/inkscape
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 20 |
2 files changed, 22 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8daaabe3b..7bd6294ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,9 +151,11 @@ endif() # ----------------------------------------------------------------------------- # Dist Target # ----------------------------------------------------------------------------- -if(EXISTS ${CMAKE_SOURCE_DIR}/.bzr/) - execute_process(COMMAND - bzr revno --tree ${CMAKE_SOURCE_DIR} +if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) + 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() @@ -161,11 +163,10 @@ else() 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 + COMMAND sed -i "s/unknown//" 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 + && 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}") # ----------------------------------------------------------------------------- diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 2e23925c4..12b8a26d8 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -11,14 +11,22 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") -if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) - execute_process(COMMAND - bzr revno --tree ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) +if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) + + 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 - bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src + git status -s ${INKSCAPE_SOURCE_DIR}/src OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") |