This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b278af8e08066537fa4eab38b3001e1c0df9f8d8 (commit)
via 21de0cc48524e171b19df5f39eaf16543c34c2ae (commit)
from 33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b278af8e08066537fa4eab38b3001e1c0df9f8d8
commit b278af8e08066537fa4eab38b3001e1c0df9f8d8
Merge: 33fbedf 21de0cc
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Jan 20 14:45:09 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jan 20 14:45:09 2017 -0500
Merge topic 'cpack-stgz-minimal-test' into next
21de0cc4 fixup! CPack/STGZ: minimalistic packages test
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21de0cc48524e171b19df5f39eaf16543c34c2ae
commit 21de0cc48524e171b19df5f39eaf16543c34c2ae
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Jan 20 20:44:39 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Jan 20 20:44:39 2017 +0100
fixup! CPack/STGZ: minimalistic packages test
diff --git a/Modules/CPack.STGZ_Header.sh.in b/Modules/CPack.STGZ_Header.sh.in
index dee576f..c615851 100755
--- a/Modules/CPack.STGZ_Header.sh.in
+++ b/Modules/CPack.STGZ_Header.sh.in
@@ -130,7 +130,10 @@ echo ""
use_new_tail_syntax="-n"
tail $use_new_tail_syntax +1 "$0" > /dev/null 2> /dev/null ||
use_new_tail_syntax=""
-tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd
"${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the
@CPACK_PACKAGE_FILE_NAME@"
+extractor="pax -r"
+command -v pax > /dev/null 2> /dev/null || extractor="tar xf -"
+
+tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd
"${toplevel}" && ${extractor}) || cpack_echo_exit "Problem unpacking the
@CPACK_PACKAGE_FILE_NAME@"
echo "Unpacking finished successfully"
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
index 75036db..96be71b 100644
--- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -5,9 +5,22 @@ function(getPackageContent FILE RESULT_VAR)
file(REMOVE_RECURSE "${path_}/content")
file(MAKE_DIRECTORY "${path_}/content")
execute_process(COMMAND ${FILE} --prefix=${path_}/content --include-subdir
- ERROR_QUIET
+ RESULT_VARIABLE extract_result_
+ ERROR_VARIABLE extract_error_
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(extract_result_)
+ find_program(TAIL_EXECUTABLE tail)
+ find_program(PAX_EXECUTABLE pax)
+ find_program(GTAR_EXECUTABLE gtar)
+ find_program(TAR_EXECUTABLE tar)
+ find_program(GUNZIP_EXECUTABLE gunzip)
+
+ message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_error_}';"
+ "'${TAIL_EXECUTABLE}'; '${PAX_EXECUTABLE}'; '${GTAR_EXECUTABLE}';"
+ "'${TAR_EXECUTABLE}'; '${GUNZIP_EXECUTABLE}'")
+ endif()
+
file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
"${path_}/content" "${path_}/content/*")
-----------------------------------------------------------------------
Summary of changes:
Modules/CPack.STGZ_Header.sh.in | 5 ++++-
Tests/RunCMake/CPack/STGZ/Helpers.cmake | 15 ++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
