From c98c58833999a8b96a2d94e2363478a71bbb1ee5 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 12 Jan 2019 13:29:17 -0800 Subject: cmake: Replace dist target with logic from the 0.92.3 branch This was producing nearly empty tarballs, with incorrect internal root paths. The replacement logic is C/P from what we shipped 0.92.3 with. --- CMakeScripts/Dist.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Dist.cmake b/CMakeScripts/Dist.cmake index 9b40d36c8..c04a91067 100644 --- a/CMakeScripts/Dist.cmake +++ b/CMakeScripts/Dist.cmake @@ -12,16 +12,18 @@ include(CMakeScripts/inkscape-version.cmake) # 'dist' - generate source release tarball # ----------------------------------------------------------------------------- +message("INKSCAPE_DIST_PREFIX: ${INKSCAPE_DIST_PREFIX}") add_custom_target(dist COMMAND sed -i "s/unknown/${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake - && tar cfz ${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz ${CMAKE_SOURCE_DIR}/doc --exclude=".*" --exclude-vcs-ignores - || git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake - COMMAND git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake # duplicate to make sure we actually revert in case of error + COMMAND sed -i "/VER_GITREV=/d" src/Makefile.am + COMMAND sed -i "s/..VER_GITREV/ ${INKSCAPE_REVISION}/" src/Makefile.am + COMMAND git commit -m "RELEASE" CMakeScripts/inkscape-version.cmake src/Makefile.am + 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}" VERBATIM) - # ----------------------------------------------------------------------------- # 'dist-win' - Windows Targets # ----------------------------------------------------------------------------- -- cgit v1.2.3