diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-11-07 22:36:49 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-11-07 22:36:49 +0000 |
| commit | 4f04836cc3fea4211d8cb4f25eb44c27c0751366 (patch) | |
| tree | 84c994f322a7585a264ec347bd3bb7b88ca1cd5b | |
| parent | 1639832 Blend and blur unspected results (diff) | |
| download | inkscape-4f04836cc3fea4211d8cb4f25eb44c27c0751366.tar.gz inkscape-4f04836cc3fea4211d8cb4f25eb44c27c0751366.zip | |
annotate custom builds, and add correct revno into make dist tarballs
(bzr r15223)
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 300af32a7..8e914863e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,10 +114,21 @@ endif() # ----------------------------------------------------------------------------- # Dist Target # ----------------------------------------------------------------------------- +if(EXISTS ${CMAKE_SOURCE_DIR}/.bzr/) + execute_process(COMMAND + bzr revno --tree ${CMAKE_SOURCE_DIR} + 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 bzr export --root=${INKSCAPE_DIST_PREFIX} - "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" + 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}") # ----------------------------------------------------------------------------- diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 2155e0013..bbf222b32 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -7,13 +7,23 @@ # We should extract the version from build.xml # but for now just hard code + 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) + + execute_process(COMMAND + bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src + OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") + string(CONCAT INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM}) + endif() endif() message("revision is " ${INKSCAPE_REVISION}) |