diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-10-04 22:47:28 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-10-04 23:06:12 +0000 |
| commit | d66f93532dde68f3c4cc844dd529717ab5c1a7d3 (patch) | |
| tree | 3486ffc920b717409e8d7356b8cb9268635381bb /CMakeScripts | |
| parent | Fix typos (diff) | |
| download | inkscape-d66f93532dde68f3c4cc844dd529717ab5c1a7d3.tar.gz inkscape-d66f93532dde68f3c4cc844dd529717ab5c1a7d3.zip | |
update cmake packaging script
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigCPack.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/Dist.cmake | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/CMakeScripts/ConfigCPack.cmake b/CMakeScripts/ConfigCPack.cmake index 7ce39ca6f..8e8866416 100644 --- a/CMakeScripts/ConfigCPack.cmake +++ b/CMakeScripts/ConfigCPack.cmake @@ -19,7 +19,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${INKSCAPE_VERSION_PATCH}) set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/share/branding/inkscape.ico") set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}~${INKSCAPE_VERSION_SUFFIX}") -set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj*/;cscope.*") +set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj*/;cscope.*;.gitlab*;.coveragerc;*.md;") set(INKSCAPE_CPACK_PREFIX ${PROJECT_NAME}-${INKSCAPE_VERSION}_${INKSCAPE_REVISION_DATE}_${INKSCAPE_REVISION_HASH}) set(CPACK_SOURCE_PACKAGE_FILE_NAME ${INKSCAPE_CPACK_PREFIX}) set(CPACK_PACKAGE_FILE_NAME ${INKSCAPE_CPACK_PREFIX}) diff --git a/CMakeScripts/Dist.cmake b/CMakeScripts/Dist.cmake index 21797d582..bbdec59b1 100644 --- a/CMakeScripts/Dist.cmake +++ b/CMakeScripts/Dist.cmake @@ -14,11 +14,10 @@ include(CMakeScripts/inkscape-version.cmake) message("INKSCAPE_DIST_PREFIX: ${INKSCAPE_DIST_PREFIX}") add_custom_target(dist - COMMAND sed -i "s/unknown/${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake - COMMAND git commit -m "RELEASE" CMakeScripts/inkscape-version.cmake - COMMAND git config tar.bz2.command bzip2 - COMMAND git archive --prefix=${INKSCAPE_DIST_PREFIX}/ -o ${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2 HEAD - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + COMMAND sed -i "s/unknown/${INKSCAPE_REVISION}/" ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake + COMMAND cmake --build ${CMAKE_BINARY_DIR} --target package_source + COMMAND git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" VERBATIM) |