[Cmake-commits] CMake branch, next, updated. v3.7.2-2285-g69cd1ce
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 69cd1ce190268342cc570569afbba1fc6038822e (commit)
via 624709c824a2d7a75a36dc23551377bdc2aee648 (commit)
via 1c93eb683b182b1f0bbdcbd39fc50ad48cc57739 (commit)
from f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9 (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=69cd1ce190268342cc570569afbba1fc6038822e
commit 69cd1ce190268342cc570569afbba1fc6038822e
Merge: f6bdf63 624709c
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Jan 22 16:09:08 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Jan 22 16:09:08 2017 -0500
Merge topic 'cpack-stgz-minimal-test' into next
624709c8 CPack/STGZ: minimalistic packages test
1c93eb68 CPack/STGZ prefer pax for extraction
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=624709c824a2d7a75a36dc23551377bdc2aee648
commit 624709c824a2d7a75a36dc23551377bdc2aee648
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Jan 19 23:02:07 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Jan 22 22:07:16 2017 +0100
CPack/STGZ: minimalistic packages test
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d2465c4..a43e47b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -345,7 +345,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
add_RunCMake_test(CompilerLauncher)
endif()
-add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP")
+add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ")
# add a test to make sure symbols are exported from a shared library
# for MSVC compilers CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS property is used
add_RunCMake_test(AutoExportDll)
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index ebaf792..65399db 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -16,7 +16,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true
"COMPONENT")
run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
-run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP" false
"MONOLITHIC;COMPONENT")
+run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ" false
"MONOLITHIC;COMPONENT")
run_cpack_test_subtests(PACKAGE_CHECKSUM
"invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false "COMPONENT")
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
new file mode 100644
index 000..08224d3
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -0,0 +1,64 @@
+set(ALL_FILES_GLOB "*.sh")
+
+function(getPackageContent FILE RESULT_VAR)
+ get_filename_component(path_ "${FILE}" DIRECTORY)
+ file(REMOVE_RECURSE "${path_}/content")
+ file(MAKE_DIRECTORY "${path_}/content")
+ execute_process(COMMAND ${FILE} --prefix=${path_}/content --include-subdir
+ RESULT_VARIABLE extract_result_
+ ERROR_VARIABLE extract_error_
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ if(extract_result_)
+message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_result_}';"
+ " '${extract_error_}'.")
+ endif()
+
+ file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
+ "${path_}/content" "${path_}/content/*")
+
+ set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(getPackageNameGlobexpr NAME COMPONENT VERSION REVISION FILE_NO
RESULT_VAR)
+ if(COMPONENT)
+set(COMPONENT "-${COMPONENT}")
+ endif()
+
+ set(${RESULT_VAR} "${NAME}-${VERSION}-*${COMPONENT}.sh" PARENT_SCOPE)
+endfunction()
+
+function(getPackageContentList FILE RESULT_VAR)
+ getPackageContent("${FILE}" package_content_)
+
+ set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(toExpectedContentList FILE_NO CONTENT_VAR)
+ findExpectedFile("${FILE
[Cmake-commits] CMake branch, next, updated. v3.7.2-2278-g639429c
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 639429cb85ed679c38223c7be1c4a0dfd3b3de39 (commit)
via 82eb1702d16723c4f997ded593cbe7cb0ca75999 (commit)
from bb234a4b50ecca06c00ab4f4cebdd44261f25653 (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=639429cb85ed679c38223c7be1c4a0dfd3b3de39
commit 639429cb85ed679c38223c7be1c4a0dfd3b3de39
Merge: bb234a4 82eb170
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Jan 21 03:36:09 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Jan 21 03:36:09 2017 -0500
Merge topic 'cpack-stgz-minimal-test' into next
82eb1702 fixup! CPack/STGZ: minimalistic packages test
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82eb1702d16723c4f997ded593cbe7cb0ca75999
commit 82eb1702d16723c4f997ded593cbe7cb0ca75999
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Jan 21 09:34:54 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Jan 21 09:34:54 2017 +0100
fixup! CPack/STGZ: minimalistic packages test
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
index 96be71b..08224d3 100644
--- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -10,15 +10,8 @@ function(getPackageContent FILE RESULT_VAR)
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}'")
+message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_result_}';"
+ " '${extract_error_}'.")
endif()
file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
diff --git a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
index 46e7757..3b015ca 100644
--- a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
@@ -1,6 +1,11 @@
function(get_test_prerequirements found_var config_file)
if(EXISTS "/bin/sh")
-file(WRITE "${config_file}" "")
-set(${found_var} true PARENT_SCOPE)
+#gunzip is not part of posix so we should not rely on it being installed
+find_program(GUNZIP_EXECUTABLE gunzip)
+
+if(GUNZIP_EXECUTABLE)
+ file(WRITE "${config_file}" "")
+ set(${found_var} true PARENT_SCOPE)
+endif()
endif()
endfunction()
---
Summary of changes:
Tests/RunCMake/CPack/STGZ/Helpers.cmake | 11 ++-
Tests/RunCMake/CPack/STGZ/Prerequirements.cmake |9 +++--
2 files changed, 9 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.2-2270-gb278af8
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
[Cmake-commits] CMake branch, next, updated. v3.7.2-2233-ge9ae0ad
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 e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983 (commit)
via a802ddd628292cf772674d2ee02772ec832d0422 (commit)
via f5fae345e4a0f9f54b69424552f7d85aa85ba907 (commit)
from cba760da8de27c311918f2d33ff7f27193f6e6af (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=e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983
commit e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983
Merge: cba760d a802ddd
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Jan 19 17:04:34 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 19 17:04:34 2017 -0500
Merge topic 'cpack-stgz-minimal-test' into next
a802ddd6 CPack/STGZ: minimalistic packages test
f5fae345 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a802ddd628292cf772674d2ee02772ec832d0422
commit a802ddd628292cf772674d2ee02772ec832d0422
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Jan 19 23:02:07 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Jan 19 23:02:07 2017 +0100
CPack/STGZ: minimalistic packages test
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d2465c4..a43e47b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -345,7 +345,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
add_RunCMake_test(CompilerLauncher)
endif()
-add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP")
+add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ")
# add a test to make sure symbols are exported from a shared library
# for MSVC compilers CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS property is used
add_RunCMake_test(AutoExportDll)
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index ebaf792..65399db 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -16,7 +16,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true
"COMPONENT")
run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
-run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP" false
"MONOLITHIC;COMPONENT")
+run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ" false
"MONOLITHIC;COMPONENT")
run_cpack_test_subtests(PACKAGE_CHECKSUM
"invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false "COMPONENT")
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
new file mode 100644
index 000..75036db
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -0,0 +1,58 @@
+set(ALL_FILES_GLOB "*.sh")
+
+function(getPackageContent FILE RESULT_VAR)
+ get_filename_component(path_ "${FILE}" DIRECTORY)
+ file(REMOVE_RECURSE "${path_}/content")
+ file(MAKE_DIRECTORY "${path_}/content")
+ execute_process(COMMAND ${FILE} --prefix=${path_}/content --include-subdir
+ ERROR_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
+ "${path_}/content" "${path_}/content/*")
+
+ set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(getPackageNameGlobexpr NAME COMPONENT VERSION REVISION FILE_NO
RESULT_VAR)
+ if(COMPONENT)
+set(COMPONENT "-${COMPONENT}")
+ endif()
+
+ set(${RESULT_VAR} "${NAME}-${VERSION}-*${COMPONENT}.sh" PARENT_SCOPE)
+endfunction()
+
+function(getPackageContentList FILE RESULT_VAR)
+ getPackageContent("${FILE}" package_content_)
+
+ set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(toExpectedContentList FILE_NO CONTENT_VAR)
+ findExpectedFile("${FILE_NO}" "file_")
+
+ get_filename_component(prefix_ "${file_}" NAME)
+ # NAME_WE removes everything after the dot and dot is in version so replace
instead
+ string(REPLACE ".sh" "" prefix_ "$
[Cmake-commits] CMake branch, next, updated. v3.7.1-1966-g63a8770
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 63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 (commit)
via af77368ed3d81c877fc19a64831aff380cf4646e (commit)
from da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 (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=63a8770f08d0bcb239ceaaa18f5a6ee99af38be2
commit 63a8770f08d0bcb239ceaaa18f5a6ee99af38be2
Merge: da90f24 af77368
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 12:48:49 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 12:48:49 2017 -0500
Merge topic 'cpack-rpm-user-binary-spec-file-test' into next
af77368e CPack/RPM test for using custom binary spec file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af77368ed3d81c877fc19a64831aff380cf4646e
commit af77368ed3d81c877fc19a64831aff380cf4646e
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 18:47:52 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Jan 10 18:47:52 2017 +0100
CPack/RPM test for using custom binary spec file
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index af44182..ebaf792 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ include(RunCMake)
include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
# run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP
"PACKAGING_TYPES"
+run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT")
run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT")
run_cpack_test(DEBUGINFO "RPM" true "COMPONENT")
run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT")
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
new file mode 100644
index 000..694dc00
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+ set(EXPECTED_FILES_COUNT "2")
+ set(EXPECTED_FILE_1_COMPONENT "test")
+ set(EXPECTED_FILE_2_COMPONENT "test2")
+ set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
+endif()
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
new file mode 100644
index 000..e6d86d0
--- /dev/null
+++
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
@@ -0,0 +1,2 @@
+^CPackRPM: Will use USER specified spec file:
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
+CPackRPM: Will use GENERATED spec
file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
new file mode 100644
index 000..d7bb7af
--- /dev/null
+++
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
@@ -0,0 +1 @@
+CPackRPM: Will use USER specified spec file:
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
new file mode 100644
index 000..db0ac6f
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
@@ -0,0 +1,80 @@
+# -*- rpm-spec -*-
+BuildRoot:
%_topdir/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
+Summary:@CPACK_RPM_PACKAGE_SUMMARY@
+Name: @CPACK_RPM_PACKAGE_NAME@
+Version:@CPACK_RPM_PACKAGE_VERSION@
+Release:@CPACK_RPM_PACKAGE_RELEASE@
+License:@CPACK_RPM_PACKAGE_LICENSE@
+Group: @CPACK_RPM_PACKAGE_GROUP@
+Vendor: @CPACK_RPM_PACKAGE_VENDOR@
+
+@TMP_RPM_URL@
+@TMP_RPM_REQUIRES@
+@TMP_RPM_REQUIRES_PRE@
+@TMP_RPM_REQUIRES_POST@
+@TMP_RPM_REQUIRES_PREUN@
+@TMP_RPM_REQUIRES_POSTUN@
+@TMP_RPM_PROVIDES@
+@TMP_RPM_OBSOLETES@
+@TMP_RPM_CONFLICTS@
+@TMP_RPM_SUGGESTS@
+@TMP_RP
[Cmake-commits] CMake branch, next, updated. v3.7.1-1928-gf14f487
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 f14f4875429bcc4445ec06328f42d3243bd36892 (commit)
via adbf72280d1eb823402c4cc7f2c27ec0ef16062a (commit)
via aff368bb8456694e2550e2f69451456728ab31eb (commit)
from 8dc707a2ffd830f95271275808b645a372e7cebd (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=f14f4875429bcc4445ec06328f42d3243bd36892
commit f14f4875429bcc4445ec06328f42d3243bd36892
Merge: 8dc707a adbf722
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 02:41:09 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 02:41:09 2017 -0500
Merge topic 'cpack-test-extra-std-out-err-file-overloads' into next
adbf7228 CPack test additional std out/err regex file overloads
aff368bb CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adbf72280d1eb823402c4cc7f2c27ec0ef16062a
commit adbf72280d1eb823402c4cc7f2c27ec0ef16062a
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Dec 23 23:26:45 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Jan 10 08:40:16 2017 +0100
CPack test additional std out/err regex file overloads
Added std out/std err expected regex file name
overloads for packaging type.
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 89da610..f883c69 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,7 +60,11 @@ function(run_cpack_test_common_ TEST_NAME types build
SUBTEST_SUFFIX source PACK
)
foreach(o out err)
- if(SUBTEST_SUFFIX AND EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+ if(SUBTEST_SUFFIX AND EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
+ elseif(EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
+set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
+ elseif(SUBTEST_SUFFIX AND EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
elseif(EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index f51d254..7c98f69 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,8 +155,18 @@ VerifyResult.cmake script also automatically prints out
standard output and
standard error from CPack execution phase that is compared with
'/-stdout.txt' regular expression and
and '/-stderr.txt' regular expresson respectively.
-NOTE: For subtests generator name can also be suffixed with subtest name and in
- such case subtest file is preferred.
+NOTE: For subtests generator name can also be suffixed with subtest name and/or
+ packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the
+ preferences of which file will be used are as follows:
+- generator name + packaging type + subtest name
+- generator name + packaging type
+- generator name + subtest name
+- generator name
+- default generator
+ File name format:
'---std.txt'
+where can either be 'out' or 'err'.
+ File name format: '--std.txt'
+where can either be 'out' or 'err'.
File name format: '--std.txt' where
can either be 'out' or 'err'.
NOTE: If none of the comparison files are present then the default generator
@@ -223,3 +233,4 @@ To add a new generator we must
- if needed add 'default_expected_std.txt' files where is either
'out' or 'err' which will contain default expected output of package
generation regular expression.
+- add generator to list of other CPack generators in RunCMake/CMakeLists.txt
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Tests/RunCMake/CPack/CPackTestHelpe
[Cmake-commits] CMake branch, next, updated. v3.7.1-1925-g8dc707a
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 8dc707a2ffd830f95271275808b645a372e7cebd (commit)
via 574c81e28cef6737adc1619ce3b44b43bdcf308b (commit)
from 1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2 (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=8dc707a2ffd830f95271275808b645a372e7cebd
commit 8dc707a2ffd830f95271275808b645a372e7cebd
Merge: 1f2f6e0 574c81e
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 02:38:12 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 02:38:12 2017 -0500
Merge topic 'cpack-rpm-user-binary-spec-file-fix' into next
574c81e2 CPack/RPM fix - custom binary spec file handling
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=574c81e28cef6737adc1619ce3b44b43bdcf308b
commit 574c81e28cef6737adc1619ce3b44b43bdcf308b
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 08:37:14 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Jan 10 08:37:14 2017 +0100
CPack/RPM fix - custom binary spec file handling
Fixes #16507
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 0640630..673aaea 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2269,8 +2269,8 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
# We should generate a USER spec file template:
# - either because the user asked for it :
CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
# - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
+set(RPMBUILD_FLAGS "-bb")
if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT
CPACK_RPM_USER_BINARY_SPECFILE)
- set(RPMBUILD_FLAGS "-bb")
file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
"# -*- rpm-spec -*-
---
Summary of changes:
Modules/CPackRPM.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1923-g1f2f6e0
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 1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2 (commit)
via 23435daa22f650a1a6509025fb2d38e8714f8ceb (commit)
via 9a0bf4d558cfd16917d2cb5c41a754740f159c98 (commit)
via d9775228dabb1424d2f8d1a250c5a0e6ffad47b1 (commit)
from 18e54de628127ac7dd948f473db3977c350c4bca (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=1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2
commit 1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2
Merge: 18e54de 23435da
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 02:31:41 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 02:31:41 2017 -0500
Merge topic 'cpack-rpm-user-bin-spec-file-fix' into next
23435daa Revert "CPack/RPM fix - custom binary spec file handling"
9a0bf4d5 Revert "CPack test additional std out/err regex file overloads"
d9775228 Revert "CPack/RPM test - custom binary spec file handling"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23435daa22f650a1a6509025fb2d38e8714f8ceb
commit 23435daa22f650a1a6509025fb2d38e8714f8ceb
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 08:28:17 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Jan 10 08:28:17 2017 +0100
Revert "CPack/RPM fix - custom binary spec file handling"
This reverts commit e0bfd3f4f565ea936f665a461380079573521916.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index e1bcb48..5021c41 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2470,12 +2470,11 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
endforeach()
endif()
-set(RPMBUILD_FLAGS "-bb")
-
# We should generate a USER spec file template:
# - either because the user asked for it :
CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
# - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT
CPACK_RPM_USER_BINARY_SPECFILE)
+ set(RPMBUILD_FLAGS "-bb")
file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
"# -*- rpm-spec -*-
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a0bf4d558cfd16917d2cb5c41a754740f159c98
commit 9a0bf4d558cfd16917d2cb5c41a754740f159c98
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 08:28:16 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Jan 10 08:28:16 2017 +0100
Revert "CPack test additional std out/err regex file overloads"
This reverts commit 4ce8a4d0a18702cf228beaa6a9ecc7b38e355751.
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index f883c69..89da610 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,11 +60,7 @@ function(run_cpack_test_common_ TEST_NAME types build
SUBTEST_SUFFIX source PACK
)
foreach(o out err)
- if(SUBTEST_SUFFIX AND EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
-set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
- elseif(EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
-set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
- elseif(SUBTEST_SUFFIX AND EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+ if(SUBTEST_SUFFIX AND EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
elseif(EXISTS
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
set(RunCMake-std${o}-file
"tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index 7c98f69..f51d254 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,18 +155,8 @@ VerifyResult.cmake script also automatically prints out
standard output and
standard error from CPack execution phase that is compared with
'/-stdout.txt' regular expression and
and '/-stderr.txt' reg
[Cmake-commits] CMake branch, next, updated. v3.7.1-1919-g18e54de
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 18e54de628127ac7dd948f473db3977c350c4bca (commit)
via 699ce812f43553bb6b6732141d62e77716ad8726 (commit)
via 4ce8a4d0a18702cf228beaa6a9ecc7b38e355751 (commit)
via e0bfd3f4f565ea936f665a461380079573521916 (commit)
from 2d08b225f78c13781887dc26ff3a3ce621394262 (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=18e54de628127ac7dd948f473db3977c350c4bca
commit 18e54de628127ac7dd948f473db3977c350c4bca
Merge: 2d08b22 699ce81
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jan 10 02:25:10 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 02:25:10 2017 -0500
Merge topic 'cpack-rpm-user-bin-spec-file-fix' into next
699ce812 CPack/RPM test - custom binary spec file handling
4ce8a4d0 CPack test additional std out/err regex file overloads
e0bfd3f4 CPack/RPM fix - custom binary spec file handling
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=699ce812f43553bb6b6732141d62e77716ad8726
commit 699ce812f43553bb6b6732141d62e77716ad8726
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Jan 9 21:08:47 2017 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon Jan 9 21:10:16 2017 +0100
CPack/RPM test - custom binary spec file handling
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..d550ec7 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ include(RunCMake)
include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
# run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP
"PACKAGING_TYPES"
+run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT")
run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT")
run_cpack_test(DEBUGINFO "RPM" true "COMPONENT")
run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT")
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
new file mode 100644
index 000..694dc00
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+ set(EXPECTED_FILES_COUNT "2")
+ set(EXPECTED_FILE_1_COMPONENT "test")
+ set(EXPECTED_FILE_2_COMPONENT "test2")
+ set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
+endif()
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
new file mode 100644
index 000..e6d86d0
--- /dev/null
+++
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
@@ -0,0 +1,2 @@
+^CPackRPM: Will use USER specified spec file:
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
+CPackRPM: Will use GENERATED spec
file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
new file mode 100644
index 000..d7bb7af
--- /dev/null
+++
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
@@ -0,0 +1 @@
+CPackRPM: Will use USER specified spec file:
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
new file mode 100644
index 000..db0ac6f
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
@@ -0,0 +1,80 @@
+# -*- rpm-spec -*-
+BuildRoot:
%_topdir/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
+Summary:@CPACK_RPM_PACKAGE_SUMMARY@
+Name: @CPACK_RPM_PACKAGE_NAME@
+Version:@CPACK_RPM_PACKAGE_VERSION@
+Release:@CPACK_RPM_PACKAGE_RELEASE@
+License:@CPACK_RPM_PACKAGE_LICENSE@
+Group: @CPACK_RPM_PACKAGE_GROUP@
+Vendor: @CPACK_RPM_PACKAGE_VENDOR@
+
+@T
[Cmake-commits] CMake branch, next, updated. v3.7.1-1853-g1890504
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 1890504c1220777f247462f00d9889a6d242e4bd (commit)
via 36bc7e4c3f91c560df8051afedddea3f49474264 (commit)
from 6d47003d339c0be17efe467fe06bc97294479e73 (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=1890504c1220777f247462f00d9889a6d242e4bd
commit 1890504c1220777f247462f00d9889a6d242e4bd
Merge: 6d47003 36bc7e4
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Dec 25 04:55:00 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Dec 25 04:55:00 2016 -0500
Merge topic 'cpack-new-tests' into next
36bc7e4c store old locale to a temporary variable
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36bc7e4c3f91c560df8051afedddea3f49474264
commit 36bc7e4c3f91c560df8051afedddea3f49474264
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Dec 25 10:51:34 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Dec 25 10:51:34 2016 +0100
store old locale to a temporary variable
On Windows XP 32 bit setLocale seems to
cause old pointer invalidation and causes
program crash in destructor.
This was causing CPackZIP to crash so to
fix it we copy the value into a temporary
variable.
diff --git a/Source/cmLocale.h b/Source/cmLocale.h
index e8e751d..cca7cf5 100644
--- a/Source/cmLocale.h
+++ b/Source/cmLocale.h
@@ -6,10 +6,11 @@
#include
#include
+#include
class cmLocaleRAII
{
- const char* OldLocale;
+ std::string OldLocale;
public:
cmLocaleRAII()
@@ -17,7 +18,7 @@ public:
{
setlocale(LC_CTYPE, "");
}
- ~cmLocaleRAII() { setlocale(LC_CTYPE, this->OldLocale); }
+ ~cmLocaleRAII() { setlocale(LC_CTYPE, this->OldLocale.c_str()); }
};
#endif
---
Summary of changes:
Source/cmLocale.h |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1851-g6d47003
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 6d47003d339c0be17efe467fe06bc97294479e73 (commit)
via 4227f29a67b30f2512af767c785559ce14cabe70 (commit)
via 26265218e2ca78135f128e80e5ff71adaf5677a8 (commit)
from 6bfcb004e409915032522b831124b758b1ba5403 (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=6d47003d339c0be17efe467fe06bc97294479e73
commit 6d47003d339c0be17efe467fe06bc97294479e73
Merge: 6bfcb00 4227f29
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Dec 23 17:41:52 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Dec 23 17:41:52 2016 -0500
Merge topic 'cpack-rpm-user-bin-spec-file-fix' into next
4227f29a CPack custom binary spec file handling fix
26265218 CPack test additional std out/err regex file overloads
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4227f29a67b30f2512af767c785559ce14cabe70
commit 4227f29a67b30f2512af767c785559ce14cabe70
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Dec 23 23:28:30 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Dec 23 23:40:34 2016 +0100
CPack custom binary spec file handling fix
Fixes #16507
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 5021c41..e1bcb48 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2470,11 +2470,12 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
endforeach()
endif()
+set(RPMBUILD_FLAGS "-bb")
+
# We should generate a USER spec file template:
# - either because the user asked for it :
CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
# - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT
CPACK_RPM_USER_BINARY_SPECFILE)
- set(RPMBUILD_FLAGS "-bb")
file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
"# -*- rpm-spec -*-
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..d550ec7 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ include(RunCMake)
include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
# run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP
"PACKAGING_TYPES"
+run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT")
run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT")
run_cpack_test(DEBUGINFO "RPM" true "COMPONENT")
run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT")
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
new file mode 100644
index 000..694dc00
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+ set(EXPECTED_FILES_COUNT "2")
+ set(EXPECTED_FILE_1_COMPONENT "test")
+ set(EXPECTED_FILE_2_COMPONENT "test2")
+ set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
+endif()
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
new file mode 100644
index 000..e6d86d0
--- /dev/null
+++
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
@@ -0,0 +1,2 @@
+^CPackRPM: Will use USER specified spec file:
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
+CPackRPM: Will use GENERATED spec
file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$
diff --git
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
new file mode 100644
index 000..d7bb7af
--- /dev/null
+++
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
@@ -0,0 +1 @@
+CPackRPM: Will use USER specified spec file:
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
b/Test
[Cmake-commits] CMake branch, next, updated. v3.7.1-1848-g6bfcb00
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 6bfcb004e409915032522b831124b758b1ba5403 (commit)
via 05c14ea0a97f3e8a7287f3e0bbc57f91e2a6e490 (commit)
via 5b0a64ebc5d03a4dd0022b87e8e6cb77c3db013b (commit)
via e8e9034596e15dee3c8febe860c2429df512dc10 (commit)
via 65c18b2141fb2553911104e0c10fe74d8daf5b9d (commit)
via 6154a2cddcdb297b1aef20f501fec9af7d7b5262 (commit)
from 01100b9e899c0a8392f3f1c2d29bcde93a29132f (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=6bfcb004e409915032522b831124b758b1ba5403
commit 6bfcb004e409915032522b831124b758b1ba5403
Merge: 01100b9 05c14ea
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Dec 23 15:12:18 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Dec 23 15:12:18 2016 -0500
Merge topic 'cpack-new-tests' into next
05c14ea0 RunCMake.CPack_* add COMPONENT to minimal test
5b0a64eb CPack/Archive minimal tests for more formats
e8e90345 CMake Nightly Date Stamp
65c18b21 CMake Nightly Date Stamp
6154a2cd CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05c14ea0a97f3e8a7287f3e0bbc57f91e2a6e490
commit 05c14ea0a97f3e8a7287f3e0bbc57f91e2a6e490
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Dec 23 21:03:05 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Dec 23 21:03:05 2016 +0100
RunCMake.CPack_* add COMPONENT to minimal test
Add component based packages testing to current
monolithic minimal package tests.
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 7a83bf2..ea6d96b 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -15,7 +15,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true
"COMPONENT")
run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
-run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP" false "MONOLITHIC")
+run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP" false
"MONOLITHIC;COMPONENT")
run_cpack_test_subtests(PACKAGE_CHECKSUM
"invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false "COMPONENT")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b0a64ebc5d03a4dd0022b87e8e6cb77c3db013b
commit 5b0a64ebc5d03a4dd0022b87e8e6cb77c3db013b
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Dec 23 21:01:38 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Dec 23 21:01:38 2016 +0100
CPack/Archive minimal tests for more formats
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index adfd37d..d2465c4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -345,7 +345,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
add_RunCMake_test(CompilerLauncher)
endif()
-add_RunCMake_test_group(CPack "DEB;RPM;TGZ")
+add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP")
# add a test to make sure symbols are exported from a shared library
# for MSVC compilers CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS property is used
add_RunCMake_test(AutoExportDll)
diff --git a/Tests/RunCMake/CPack/7Z/Helpers.cmake
b/Tests/RunCMake/CPack/7Z/Helpers.cmake
new file mode 100644
index 000..f256a42
--- /dev/null
+++ b/Tests/RunCMake/CPack/7Z/Helpers.cmake
@@ -0,0 +1,3 @@
+set(cpack_archive_extension_ "7z")
+
+include("${CMAKE_CURRENT_LIST_DIR}/../ArchiveCommon/common_helpers.cmake")
diff --git a/Tests/RunCMake/CPack/7Z/Prerequirements.cmake
b/Tests/RunCMake/CPack/7Z/Prerequirements.cmake
new file mode 100644
index 000..dbaf682
--- /dev/null
+++ b/Tests/RunCMake/CPack/7Z/Prerequirements.cmake
@@ -0,0 +1,4 @@
+function(get_test_prerequirements found_var config_file)
+ file(WRITE "${config_file}" "")
+ set(${found_var} true PARENT_SCOPE)
+endfunction()
diff --git a/Tests/RunCMake/CPack/7Z/packaging_COMPONENT_default.cmake
b/Tests/RunCMake/CPack/7Z/packagin
[Cmake-commits] CMake branch, next, updated. v3.7.1-1842-g01100b9
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 01100b9e899c0a8392f3f1c2d29bcde93a29132f (commit)
via 6daa2d384ef7f6f9edd5fed18c830168f7496881 (commit)
from 37debbdfda006617a0e83f171d617bb3bfdf44f2 (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=01100b9e899c0a8392f3f1c2d29bcde93a29132f
commit 01100b9e899c0a8392f3f1c2d29bcde93a29132f
Merge: 37debbd 6daa2d3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Dec 23 15:11:40 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Dec 23 15:11:40 2016 -0500
Merge topic 'cpack-deb-md5sums-paths-fix' into next
6daa2d38 CPack/Deb invalid md5sums file fix
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6daa2d384ef7f6f9edd5fed18c830168f7496881
commit 6daa2d384ef7f6f9edd5fed18c830168f7496881
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Dec 20 23:08:52 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Dec 23 21:10:52 2016 +0100
CPack/Deb invalid md5sums file fix
Monolithic deb packages were packaged
with invalid md5sums file as trailing
slash in path was causing string replace
to fail and preserve build path.
Fixes #16517
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 36566a4..5c50da8 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -173,7 +173,11 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) +
this->GetOutputExtension());
// all GROUP in one vs all COMPONENT in one
- localToplevel += "/" + compInstDirName;
+ // if must be here otherwise non component paths have a trailing / while
+ // components don't
+ if (!compInstDirName.empty()) {
+localToplevel += "/" + compInstDirName;
+ }
/* replace the TEMP DIRECTORY with the component one */
this->SetOption("CPACK_TEMPORARY_DIRECTORY", localToplevel.c_str());
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..e104866 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -23,3 +23,4 @@ run_cpack_test_subtests(SINGLE_DEBUGINFO
"no_main_component;one_component;one_co
run_cpack_source_test(SOURCE_PACKAGE "RPM")
run_cpack_test(SUGGESTS "RPM" false "MONOLITHIC")
run_cpack_test(USER_FILELIST "RPM" false "MONOLITHIC")
+run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
new file mode 100644
index 000..6142eb3
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
@@ -0,0 +1,2 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
new file mode 100644
index 000..fbdda9c
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
@@ -0,0 +1,3 @@
+set(whitespaces_ "[\t\n\r ]*")
+set(md5sums_md5sums "^.* usr/foo/CMakeLists\.txt${whitespaces_}$")
+verifyDebControl("${FOUND_FILE_1}" "md5sums" "md5sums")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
new file mode 100644
index 000..15c5892
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
@@ -0,0 +1,5 @@
+install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+ set(CPACK_COMPONENTS_ALL test)
+endif()
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1840-g37debbd
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 37debbdfda006617a0e83f171d617bb3bfdf44f2 (commit) via 803e1735e6bbd394e19e051ca81ee416c6921034 (commit) from 451fea216b47ccd5be8e699e1b08536f573e62b4 (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=37debbdfda006617a0e83f171d617bb3bfdf44f2 commit 37debbdfda006617a0e83f171d617bb3bfdf44f2 Merge: 451fea2 803e173 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Fri Dec 23 15:10:22 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Dec 23 15:10:22 2016 -0500 Merge topic 'cpack-deb-md5sums-paths-fix' into next 803e1735 fixup! confilct with another commit https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=803e1735e6bbd394e19e051ca81ee416c6921034 commit 803e1735e6bbd394e19e051ca81ee416c6921034 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Fri Dec 23 21:09:58 2016 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Fri Dec 23 21:09:58 2016 +0100 fixup! confilct with another commit diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake index 96141e9..e104866 100644 --- a/Tests/RunCMake/CPack/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake @@ -15,7 +15,6 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true "COMPONENT") run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT") run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC") run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT") -run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT") run_cpack_test(MINIMAL "RPM;DEB;TGZ" false "MONOLITHIC") run_cpack_test_subtests(PACKAGE_CHECKSUM "invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC") run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT") @@ -24,3 +23,4 @@ run_cpack_test_subtests(SINGLE_DEBUGINFO "no_main_component;one_component;one_co run_cpack_source_test(SOURCE_PACKAGE "RPM") run_cpack_test(SUGGESTS "RPM" false "MONOLITHIC") run_cpack_test(USER_FILELIST "RPM" false "MONOLITHIC") +run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT") --- Summary of changes: Tests/RunCMake/CPack/RunCMakeTest.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1838-g451fea2
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 451fea216b47ccd5be8e699e1b08536f573e62b4 (commit)
via fb4a45ee9daddfc982e3e85f6f914be93dc51138 (commit)
from e2747bb4fca04ea829223496b39036c2b4627e7b (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=451fea216b47ccd5be8e699e1b08536f573e62b4
commit 451fea216b47ccd5be8e699e1b08536f573e62b4
Merge: e2747bb fb4a45e
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Dec 21 12:20:31 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 21 12:20:31 2016 -0500
Merge topic 'cpack-deb-md5sums-paths-fix' into next
fb4a45ee CPack/Deb invalid md5sums file fix
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb4a45ee9daddfc982e3e85f6f914be93dc51138
commit fb4a45ee9daddfc982e3e85f6f914be93dc51138
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Dec 20 23:08:52 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Dec 21 18:19:40 2016 +0100
CPack/Deb invalid md5sums file fix
Monolithic deb packages were packaged
with invalid md5sums file as trailing
slash in path was causing string replace
to fail and preserve build path.
Fixes #16517
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 36566a4..5c50da8 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -173,7 +173,11 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) +
this->GetOutputExtension());
// all GROUP in one vs all COMPONENT in one
- localToplevel += "/" + compInstDirName;
+ // if must be here otherwise non component paths have a trailing / while
+ // components don't
+ if (!compInstDirName.empty()) {
+localToplevel += "/" + compInstDirName;
+ }
/* replace the TEMP DIRECTORY with the component one */
this->SetOption("CPACK_TEMPORARY_DIRECTORY", localToplevel.c_str());
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..96141e9 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -15,6 +15,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true
"COMPONENT")
run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
+run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT")
run_cpack_test(MINIMAL "RPM;DEB;TGZ" false "MONOLITHIC")
run_cpack_test_subtests(PACKAGE_CHECKSUM
"invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
new file mode 100644
index 000..6142eb3
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
@@ -0,0 +1,2 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
new file mode 100644
index 000..fbdda9c
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
@@ -0,0 +1,3 @@
+set(whitespaces_ "[\t\n\r ]*")
+set(md5sums_md5sums "^.* usr/foo/CMakeLists\.txt${whitespaces_}$")
+verifyDebControl("${FOUND_FILE_1}" "md5sums" "md5sums")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
new file mode 100644
index 000..15c5892
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
@@ -0,0 +1,5 @@
+install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+ set(CPACK_COMPONENTS_ALL test)
+endif()
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1836-ge2747bb
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 e2747bb4fca04ea829223496b39036c2b4627e7b (commit)
via 04f8752d1d46ecc1d55f50fb5dae195390e345b3 (commit)
from a1d713f219bab2475c540af474d80c4949234da0 (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=e2747bb4fca04ea829223496b39036c2b4627e7b
commit e2747bb4fca04ea829223496b39036c2b4627e7b
Merge: a1d713f 04f8752
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Dec 21 12:19:23 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 21 12:19:23 2016 -0500
Merge topic 'cpack-deb-md5sums-paths-fix' into next
04f8752d fixup! CPack/Deb invalid md5sums file fix
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04f8752d1d46ecc1d55f50fb5dae195390e345b3
commit 04f8752d1d46ecc1d55f50fb5dae195390e345b3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Dec 21 18:18:42 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Dec 21 18:18:42 2016 +0100
fixup! CPack/Deb invalid md5sums file fix
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index d45eb78..5c50da8 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -175,8 +175,9 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
// all GROUP in one vs all COMPONENT in one
// if must be here otherwise non component paths have a trailing / while
// components don't
- if (!compInstDirName.empty())
+ if (!compInstDirName.empty()) {
localToplevel += "/" + compInstDirName;
+ }
/* replace the TEMP DIRECTORY with the component one */
this->SetOption("CPACK_TEMPORARY_DIRECTORY", localToplevel.c_str());
---
Summary of changes:
Source/CPack/cmCPackDebGenerator.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1834-ga1d713f
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 a1d713f219bab2475c540af474d80c4949234da0 (commit)
via b8e990fade3ad1e8b4b533ada1e86411a7abf39e (commit)
from b195005741d7ec9f766fd2bd0c3d0287fed7ef78 (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=a1d713f219bab2475c540af474d80c4949234da0
commit a1d713f219bab2475c540af474d80c4949234da0
Merge: b195005 b8e990f
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Dec 20 17:17:14 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Dec 20 17:17:14 2016 -0500
Merge topic 'cpack-deb-md5sums-paths-fix' into next
b8e990fa CPack/Deb invalid md5sums file fix
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8e990fade3ad1e8b4b533ada1e86411a7abf39e
commit b8e990fade3ad1e8b4b533ada1e86411a7abf39e
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Dec 20 23:08:52 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Dec 20 23:08:52 2016 +0100
CPack/Deb invalid md5sums file fix
Monolithic deb packages were packaged
with invalid md5sums file as trailing
slash in path was causing string replace
to fail and preserve build path.
Fixes #16517
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 36566a4..d45eb78 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -173,7 +173,10 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) +
this->GetOutputExtension());
// all GROUP in one vs all COMPONENT in one
- localToplevel += "/" + compInstDirName;
+ // if must be here otherwise non component paths have a trailing / while
+ // components don't
+ if (!compInstDirName.empty())
+localToplevel += "/" + compInstDirName;
/* replace the TEMP DIRECTORY with the component one */
this->SetOption("CPACK_TEMPORARY_DIRECTORY", localToplevel.c_str());
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..96141e9 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -15,6 +15,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true
"COMPONENT")
run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
+run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT")
run_cpack_test(MINIMAL "RPM;DEB;TGZ" false "MONOLITHIC")
run_cpack_test_subtests(PACKAGE_CHECKSUM
"invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
new file mode 100644
index 000..6142eb3
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
@@ -0,0 +1,2 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
new file mode 100644
index 000..fbdda9c
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
@@ -0,0 +1,3 @@
+set(whitespaces_ "[\t\n\r ]*")
+set(md5sums_md5sums "^.* usr/foo/CMakeLists\.txt${whitespaces_}$")
+verifyDebControl("${FOUND_FILE_1}" "md5sums" "md5sums")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
new file mode 100644
index 000..15c5892
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
@@ -0,0 +1,5 @@
+install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+ set(CPACK_COMPONENTS_ALL test)
+endif()
---
Summary of changes:
Source/CPack/cmCPackDebGenerator.cxx |5 -
Tests/RunCMake/CPack/RunCMakeTest.cmake |1 +
Tests/RunC
[Cmake-commits] CMake branch, next, updated. v3.7.1-1832-gb195005
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 b195005741d7ec9f766fd2bd0c3d0287fed7ef78 (commit)
via f7301e6e5f64cb42573ea7128eef3e7ba91a7779 (commit)
from ebb7ff5b9ba490a8645de7092c729f211b8cd464 (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=b195005741d7ec9f766fd2bd0c3d0287fed7ef78
commit b195005741d7ec9f766fd2bd0c3d0287fed7ef78
Merge: ebb7ff5 f7301e6
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Dec 20 15:13:54 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Dec 20 15:13:54 2016 -0500
Merge topic 'cpack-deb-package-version-override-fix' into next
f7301e6e CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7301e6e5f64cb42573ea7128eef3e7ba91a7779
commit f7301e6e5f64cb42573ea7128eef3e7ba91a7779
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Tue Dec 20 14:09:20 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Dec 20 21:07:25 2016 +0100
CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index bee69d9..ddf8b23 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -914,7 +914,7 @@ function(cpack_deb_prepare_package_vars)
extract_so_info("${_FILE}" libname soversion)
if(libname AND soversion)
list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBS_LIST
- "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME}
(${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_PACKAGE_VERSION})")
+ "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME}
(${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY}
${CPACK_DEBIAN_PACKAGE_VERSION})")
else()
message(AUTHOR_WARNING "Shared library '${_FILE}' is missing soname
or soversion. Library will not be added to DEBIAN/shlibs control file.")
endif()
@@ -967,7 +967,7 @@ function(cpack_deb_prepare_package_vars)
# Patch package file name to be in corrent debian format:
# _-_.deb
set(CPACK_OUTPUT_FILE_NAME
-
"${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
+
"${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
else()
cmake_policy(PUSH)
cmake_policy(SET CMP0010 NEW)
---
Summary of changes:
Modules/CPackDeb.cmake |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1640-g4bba79a
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 4bba79ad0ceb753c87c268eb1b66dc3d818223f0 (commit)
via e326d8cf3eb2ac3f98fe5b4783b35c6141c006a9 (commit)
from 09219634e58399eef76e06afd2a74caeb93cf905 (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=4bba79ad0ceb753c87c268eb1b66dc3d818223f0
commit 4bba79ad0ceb753c87c268eb1b66dc3d818223f0
Merge: 0921963 e326d8c
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Dec 7 18:13:21 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 7 18:13:21 2016 -0500
Merge topic 'cpack-deb-missing-file-utility-error' into next
e326d8cf CPack/DEB shlibdep options depend on file utility
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e326d8cf3eb2ac3f98fe5b4783b35c6141c006a9
commit e326d8cf3eb2ac3f98fe5b4783b35c6141c006a9
Author: Henning Meyer <henning.me...@dedrone.com>
AuthorDate: Wed Dec 7 20:45:45 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Dec 7 22:25:06 2016 +0100
CPack/DEB shlibdep options depend on file utility
Missing or missconfigured file utility should not
skip adding dependencies. Instead it should print
out a fatal error message.
Fixes #16486
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 909a12b..bee69d9 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -587,12 +587,21 @@ function(cpack_deb_prepare_package_vars)
file(GLOB_RECURSE FILE_PATHS_ LIST_DIRECTORIES false RELATIVE "${WDIR}"
"${WDIR}/*")
cmake_policy(POP)
+find_program(FILE_EXECUTABLE file)
+if(NOT FILE_EXECUTABLE)
+ message(FATAL_ERROR "CPackDeb: file utility is not available.
CPACK_DEBIAN_PACKAGE_SHLIBDEPS and CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS options
are not available.")
+endif()
+
# get file info so that we can determine if file is executable or not
unset(CPACK_DEB_INSTALL_FILES)
foreach(FILE_ IN LISTS FILE_PATHS_)
- execute_process(COMMAND file "./${FILE_}"
+ execute_process(COMMAND env LC_ALL=C ${FILE_EXECUTABLE} "./${FILE_}"
WORKING_DIRECTORY "${WDIR}"
+RESULT_VARIABLE FILE_RESULT_
OUTPUT_VARIABLE INSTALL_FILE_)
+ if(NOT FILE_RESULT_ EQUAL 0)
+message (FATAL_ERROR "CPackDeb: execution of command:
'${FILE_EXECUTABLE} ./${FILE_}' failed with exit code: ${FILE_RESULT_}")
+ endif()
list(APPEND CPACK_DEB_INSTALL_FILES "${INSTALL_FILE_}")
endforeach()
---
Summary of changes:
Modules/CPackDeb.cmake | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1494-g1301e17
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 1301e17efbcf1a286e96240a0aa4082d134f1ea2 (commit)
via 4e4b786e33cb67250a026efc1bbba6bba8575a07 (commit)
via a5a6f61be37bd7fa6997e40ed43b3450834b265e (commit)
from 3bd5d24975e984b7df2c55855aacaaa291ca35d1 (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=1301e17efbcf1a286e96240a0aa4082d134f1ea2
commit 1301e17efbcf1a286e96240a0aa4082d134f1ea2
Merge: 3bd5d24 4e4b786
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Dec 3 14:42:45 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Dec 3 14:42:45 2016 -0500
Merge topic 'cpack-rpm-user-file-list-with-multiple-directives' into next
4e4b786e CPack/RPM CPACK_RPM_USER_FILELIST change release note
a5a6f61b CPackRPM now supports multiple directives in
CPACK_RPM_USER_FILELIST
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e4b786e33cb67250a026efc1bbba6bba8575a07
commit 4e4b786e33cb67250a026efc1bbba6bba8575a07
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Dec 3 20:38:30 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Dec 3 20:40:29 2016 +0100
CPack/RPM CPACK_RPM_USER_FILELIST change release note
diff --git
a/Help/release/dev/cpack-rpm-user-file-list-with-multiple-directives.rst
b/Help/release/dev/cpack-rpm-user-file-list-with-multiple-directives.rst
new file mode 100644
index 000..ad0154d
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-user-file-list-with-multiple-directives.rst
@@ -0,0 +1,6 @@
+cpack-rpm-user-file-list-with-multiple-directives
+-
+
+* The :module:`CPackRPM` module learned to support
+ multiple directives per file when using
+ :variable:`CPACK_RPM_USER_FILELIST` variable.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5a6f61be37bd7fa6997e40ed43b3450834b265e
commit a5a6f61be37bd7fa6997e40ed43b3450834b265e
Author: Harry Mallon <ha...@codexdigital.com>
AuthorDate: Sat Dec 3 20:31:41 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Dec 3 20:39:05 2016 +0100
CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELIST
* In older version "%dir %attr(-, root, root) foo" would put "%dir foo"
in the final spec file.
* Also added comment to describe this and advise not not to add trailing
slashes to directories in USER_FILELIST.
* Includes test in RunCMake CPack which now passes.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 39697f0..5021c41 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -507,10 +507,12 @@
#
# May be used to explicitly specify ``%()`` file line
# in the spec file. Like ``%config(noreplace)`` or any other directive
-# that be found in the ``%files`` section. Since CPackRPM is generating
-# the list of files (and directories) the user specified files of
-# the ``CPACK_RPM__USER_FILELIST`` list will be removed from
-# the generated list.
+# that be found in the ``%files`` section. You can have multiple directives
+# per line, as in ``%attr(600,root,root) %config(noreplace)``. Since
+# CPackRPM is generating the list of files (and directories) the user
+# specified files of the ``CPACK_RPM__USER_FILELIST`` list will
+# be removed from the generated list. If referring to directories do
+# not add a trailing slash.
#
# .. variable:: CPACK_RPM_CHANGELOG_FILE
#
@@ -2055,7 +2057,8 @@ function(cpack_rpm_generate_package)
set(CPACK_RPM_USER_INSTALL_FILES "")
foreach(F IN LISTS CPACK_RPM_USER_FILELIST_INTERNAL)
string(REGEX REPLACE "%[A-Za-z]+(\\([^()]*\\))? " "" F_PATH ${F})
- string(REGEX MATCH "%[A-Za-z]+(\\([^()]*\\))?" F_PREFIX ${F})
+ string(REGEX MATCH "(%[A-Za-z]+(\\([^()]*\\))? )*" F_PREFIX ${F})
+ string(STRIP ${F_PREFIX} F_PREFIX)
if(CPACK_RPM_PACKAGE_DEBUG)
message("CPackRPM:Debug: F_PREFIX=<${F_PREFIX}>, F_PATH=<${F_PATH}>")
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 092fb47..3077340 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -22,3 +22,4 @@ run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false
"COMPONENT")
run_cpack_test_subtests(SINGLE_DEBUGINFO
"no_main_component;one_component;one_component_main;no_debuginfo;one_component_no_d
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-931-g838fd5c
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 838fd5c3ecc961323affd2a890ff3421edc82f08 (commit)
via b34c045736384fc3ba8574b33211bd75082bc07b (commit)
via cd0423300bea21a5c0747a6aeaefbae24c10ecd8 (commit)
via 228280d8334f2bcac346e5f0d3ea802af7f22862 (commit)
via d8e83ab979b0ccfc4887dbf48c088a72dffb2e96 (commit)
via f52bcc2ac1b3dddeca2320d8320a9406101c732d (commit)
from 996e95b07cd311e88c77d245d5f532d1b6c7fbd4 (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=838fd5c3ecc961323affd2a890ff3421edc82f08
commit 838fd5c3ecc961323affd2a890ff3421edc82f08
Merge: 996e95b b34c045
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Nov 5 07:00:35 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Nov 5 07:00:35 2016 -0400
Merge topic 'cpack-rpm-omit-unsupported-tags' into next
b34c0457 Release text for omitting unsupported tags topic
cd042330 CPack/RPM test for Suggests tag
228280d8 CPack/RPM prevent special tags from being removed
d8e83ab9 CPack/RPM omit unsupported tags
f52bcc2a CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b34c045736384fc3ba8574b33211bd75082bc07b
commit b34c045736384fc3ba8574b33211bd75082bc07b
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Nov 5 11:52:30 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Nov 5 11:53:30 2016 +0100
Release text for omitting unsupported tags topic
diff --git a/Help/release/dev/cpack-rpm-omit-unsupported-tags.rst
b/Help/release/dev/cpack-rpm-omit-unsupported-tags.rst
new file mode 100644
index 000..abcb7a6
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-omit-unsupported-tags.rst
@@ -0,0 +1,8 @@
+cpack-rpm-omit-unsupported-tags
+---
+
+* The :module:`CPackRPM` module learned to omit
+ tags that are not supported by provided
+ rpmbuild tool. If unsupported tags are set
+ they are ignored and a developer warning is
+ printed out.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd0423300bea21a5c0747a6aeaefbae24c10ecd8
commit cd0423300bea21a5c0747a6aeaefbae24c10ecd8
Author: Alexander Adam <alexander.a...@megware.com>
AuthorDate: Sat Nov 5 11:36:12 2016 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Nov 5 11:44:32 2016 +0100
CPack/RPM test for Suggests tag
Suggests tag was not present in older versions
of rpmbuild so we test that the rpm package is
always generated either with Suggests tag present
or skipped if not supported.
diff --git a/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-ExpectedFiles.cmake
new file mode 100644
index 000..02ebb44
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-ExpectedFiles.cmake
@@ -0,0 +1,5 @@
+set(whitespaces_ "[\t\n\r ]*")
+
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_1 "rpm_suggests*.rpm")
+set(EXPECTED_FILE_CONTENT_1 "^/usr/foo${whitespaces_}/usr/foo/CMakeLists.txt$")
diff --git a/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-VerifyResult.cmake
b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-VerifyResult.cmake
new file mode 100644
index 000..32cc6d1
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-VerifyResult.cmake
@@ -0,0 +1,31 @@
+execute_process(COMMAND ${RPMBUILD_EXECUTABLE} --querytags
+OUTPUT_VARIABLE RPMBUILD_CAPS
+RESULT_VARIABLE RPMBUILD_CAPS_RESULT)
+
+if(NOT RPMBUILD_CAPS_RESULT)
+ string(REPLACE "\n" ";" RPMBUILD_CAPS "${RPMBUILD_CAPS}")
+ cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW)
+if(SUGGESTS IN_LIST RPMBUILD_CAPS)
+ set(should_contain_suggests_tag_ true)
+endif()
+ cmake_policy(POP)
+endif()
+
+# Only verify that suggests tag is present only if that tag is supported.
+# If it is not supported the rpm package was corretly generated by ignoring
+# that tag and that was already checked by expected files test.
+if(should_contain_suggests_tag_)
+ execute_process(COMMAND ${RPM_EXECUTABLE} -q --suggests -p "${FOUND_FILE_1}"
+ WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
+ RESULT_VARIABLE rpm_result_
+ OUTPUT_VARIABLE rpm_output_
+ ERROR_VARIABLE error_variable_
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ if(rpm_result_ OR NOT rpm_output_ STREQUAL "libsuggested
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-95-ga01b549
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 a01b5490594eb98063d8354acdd52a03fb46232f (commit)
via 7f15429cc574f90fdd68ee254c28833a4843e2aa (commit)
via 9d2cb3f668dd79def44829c8bd5791e7c242e026 (commit)
via b39bd548f9f1f96a2285e5aff638085352c21f29 (commit)
via bf7d0168bfdfbe1b91bae83dd0091af54e7c4e8a (commit)
via 22605f1e230a187658c57df22b66e1b1ade09a4a (commit)
from 003dceb9f5b416a41ba9ca38c51f24f82e867091 (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=a01b5490594eb98063d8354acdd52a03fb46232f
commit a01b5490594eb98063d8354acdd52a03fb46232f
Merge: 003dceb 7f15429
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Oct 6 02:54:44 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Oct 6 02:54:44 2016 -0400
Merge topic 'cpack-rpm-single-debuginfo' into next
7f15429c CPack/RPM single debuginfo packaging
9d2cb3f6 CPack/RPM learned defining main component
b39bd548 CPack/RPM debuginfo package without binaries
bf7d0168 CPack/RPM debuginfo package objdump error suppression
22605f1e CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f15429cc574f90fdd68ee254c28833a4843e2aa
commit 7f15429cc574f90fdd68ee254c28833a4843e2aa
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Oct 6 08:33:16 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Oct 6 08:47:36 2016 +0200
CPack/RPM single debuginfo packaging
Generate a single debuginfo package even
if components packaging is enabled.
This makes issue #15668 resolution feature complete.
Closes: #15486
diff --git a/Help/release/dev/cpack-rpm-single-debuginfo.rst
b/Help/release/dev/cpack-rpm-single-debuginfo.rst
index 281a988..34a710d 100644
--- a/Help/release/dev/cpack-rpm-single-debuginfo.rst
+++ b/Help/release/dev/cpack-rpm-single-debuginfo.rst
@@ -5,3 +5,7 @@ cpack-rpm-single-debuginfo
which forces generation of a rpm for defined component without component
suffix in filename and package name.
See :variable:`CPACK_RPM_MAIN_COMPONENT` variable.
+
+* The :module:`CPackRPM` module learned to generate a single debuginfo package
+ on demand even if components packagin is used.
+ See :variable:`CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE` variable.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 2c8c0e0..6017ce3 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -803,6 +803,26 @@
# * Mandatory : NO
# * Default : -
#
+# .. variable:: CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE
+#
+# Create a single debuginfo package even if components packaging is set.
+#
+# * Mandatory : NO
+# * Default : OFF
+#
+# When this variable is enabled it produces a single debuginfo package even if
+# component packaging is enabled.
+#
+# When using this feature in combination with components packaging and there
is
+# more than one component this variable requires
:variable:`CPACK_RPM_MAIN_COMPONENT`
+# to be set.
+#
+# .. note::
+#
+# If none of the :variable:`CPACK_RPM__DEBUGINFO_PACKAGE` variables
+# is set then :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is automatically set to
+# ``ON`` when :variable:`CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE` is set.
+#
# Packaging of sources (SRPM)
# ^^^
#
@@ -2076,7 +2096,7 @@ function(cpack_rpm_generate_package)
"CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_DEBUGINFO_PACKAGE"
"CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DEBUGINFO_PACKAGE"
"CPACK_RPM_DEBUGINFO_PACKAGE")
- if(CPACK_RPM_DEBUGINFO_PACKAGE)
+ if(CPACK_RPM_DEBUGINFO_PACKAGE OR (CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE AND
NOT GENERATE_SPEC_PARTS))
cpack_rpm_variable_fallback("CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX"
"CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_BUILD_SOURCE_DIRS_PREFIX"
"CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_BUILD_SOURCE_DIRS_PREFIX"
@@ -2084,9 +2104,81 @@ function(cpack_rpm_generate_package)
if(NOT CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX)
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
"/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}")
endif()
-cpack_rpm_debugsymbol_check("${CPACK_RPM_INSTALL_FILES}" "${WDIR}")
-set(TMP_RPM_DEBUGINFO "
+if(CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE AND GENERATE_SPEC_PARTS)
+ file(WRITE
"${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_COMPONENT}.
[Cmake-commits] CMake branch, next, updated. v3.6.2-2493-g6330c8f
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 6330c8f70b69e8aac2d05846ad509d9972df2090 (commit)
via d068b65db17fa6a07970e6640cb69e265746d1ae (commit)
from afe788b028034d796f0fc121eee557930fa73e75 (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=6330c8f70b69e8aac2d05846ad509d9972df2090
commit 6330c8f70b69e8aac2d05846ad509d9972df2090
Merge: afe788b d068b65
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 26 11:00:53 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 26 11:00:53 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
d068b65d fixup! CPack/RPM debuginfo packages must contain sources
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d068b65db17fa6a07970e6640cb69e265746d1ae
commit d068b65db17fa6a07970e6640cb69e265746d1ae
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 26 16:59:56 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon Sep 26 16:59:56 2016 +0200
fixup! CPack/RPM debuginfo packages must contain sources
diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake
b/Tests/RunCMake/CPack/DEBUGINFO.cmake
index ead7ad1..d98b682 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -1,5 +1,11 @@
set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+# PGI compiler doesn't add build id to binaries by default
+if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+ string(APPEND CMAKE_EXE_LINKER_FLAGS "-Wl,--build-id")
+ string(APPEND CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id")
+endif()
+
set(CPACK_RPM_COMPONENT_INSTALL "ON")
set(CMAKE_BUILD_TYPE Debug)
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
deleted file mode 100644
index fea8db5..000
--- a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-function(get_test_prerequirements found_var)
- # for now PGI compiler is not supported as it doesn't set --build-id
- # required by debuginfo rpm packages
-
- if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
-set(${found_var} true PARENT_SCOPE)
- endif()
-endfunction()
---
Summary of changes:
Tests/RunCMake/CPack/DEBUGINFO.cmake |6 ++
Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake |8
2 files changed, 6 insertions(+), 8 deletions(-)
delete mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.2-2463-ge4d7820
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 e4d782024d3c654c216bbd32d6ad80f43dde5c29 (commit)
via 3c63947c9d645a7b9763b116610cc2c58024f5ab (commit)
from d1bc55fd7228dd433eb457ec2d2dd38721694151 (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=e4d782024d3c654c216bbd32d6ad80f43dde5c29
commit e4d782024d3c654c216bbd32d6ad80f43dde5c29
Merge: d1bc55f 3c63947
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 25 17:55:29 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Sep 25 17:55:29 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
3c63947c fixup! CPack/RPM debuginfo packages must contain sources
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c63947c9d645a7b9763b116610cc2c58024f5ab
commit 3c63947c9d645a7b9763b116610cc2c58024f5ab
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 25 23:54:53 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Sep 25 23:54:53 2016 +0200
fixup! CPack/RPM debuginfo packages must contain sources
diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake
b/Tests/RunCMake/CPack/DEBUGINFO.cmake
index e8d1c85..ead7ad1 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -1,11 +1,5 @@
set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
-# PGI compiler doesn't add build id to binaries by default
-if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
- string(APPEND CMAKE_EXE_LINKER_FLAGS "--build-id")
- string(APPEND CMAKE_SHARED_LINKER_FLAGS "--build-id")
-endif()
-
set(CPACK_RPM_COMPONENT_INSTALL "ON")
set(CMAKE_BUILD_TYPE Debug)
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
new file mode 100644
index 000..fea8db5
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
@@ -0,0 +1,8 @@
+function(get_test_prerequirements found_var)
+ # for now PGI compiler is not supported as it doesn't set --build-id
+ # required by debuginfo rpm packages
+
+ if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+set(${found_var} true PARENT_SCOPE)
+ endif()
+endfunction()
---
Summary of changes:
Tests/RunCMake/CPack/DEBUGINFO.cmake |6 --
Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake |8
2 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.2-2454-g9f79eb5
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 9f79eb5caa5e25b987df8a9ff53b5fc4d84f5e74 (commit)
via 1ef45a30aae240a89893e86e2509d5400da9753f (commit)
via 08147a7feabba4113c29f8e898ebe3047180e4bf (commit)
from 767ee352d0d06913b0a4d013bbdd07a28ba9200e (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=9f79eb5caa5e25b987df8a9ff53b5fc4d84f5e74
commit 9f79eb5caa5e25b987df8a9ff53b5fc4d84f5e74
Merge: 767ee35 1ef45a3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Sep 24 06:13:43 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Sep 24 06:13:43 2016 -0400
Merge topic 'revert-cpack-deb-package-description-fallback' into next
1ef45a30 Revert "CPack/DEB: Make package description variable precedence
match RPM"
08147a7f CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ef45a30aae240a89893e86e2509d5400da9753f
commit 1ef45a30aae240a89893e86e2509d5400da9753f
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Sep 24 12:05:06 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Sep 24 12:05:06 2016 +0200
Revert "CPack/DEB: Make package description variable precedence match RPM"
This reverts commit 332b089ad213a1aa89658fffd8f68c9064c6d3db as multiline
descriptions require special formatting.
diff --git a/Help/release/dev/cpack-deb-package-description-fallback.rst
b/Help/release/dev/cpack-deb-package-description-fallback.rst
deleted file mode 100644
index 71ca821..000
--- a/Help/release/dev/cpack-deb-package-description-fallback.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-cpack-deb-package-description-fallback
---
-
-* The :module:`CPackDeb` module gained a new
- :variable:`CPACK_DEBIAN__PACKAGE_DESCRIPTION`
- variable for component-specific package descriptions.
-
-* The :module:`CPackDeb` module changed its package description
- override rules to match :module:`CPackRPM` module behavior.
- If the :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` variable is set to
- a non-default location then it is preferred to the
- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
- This is a behavior change from previous versions but produces
- more consistent and expected behavior.
- See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 423bb00..1a7b923 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -156,18 +156,16 @@
# * Default : :code:`CPACK_PACKAGE_CONTACT`
#
# .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION
-# CPACK_DEBIAN__PACKAGE_DESCRIPTION
+# CPACK_COMPONENT__DESCRIPTION
#
# The Debian package description
#
# * Mandatory : YES
# * Default :
#
-#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component based
installers only) if set,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default
location,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set,
-#- or "no package description available"
+#- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
+#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
# CPACK_DEBIAN__PACKAGE_SECTION
@@ -831,23 +829,24 @@ function(cpack_deb_prepare_package_vars)
endif()
# Description: (mandatory)
- if(CPACK_DEB_PACKAGE_COMPONENT)
-if(CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION)
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION}")
-elseif(CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_COMPONENT_${_local_component_name}_DESCRIPTION}")
+ if(NOT CPACK_DEB_PACKAGE_COMPONENT)
+if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
+ if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or
CPACK_DEBIAN_PACKAGE_DESCRIPTION")
+ endif()
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
endif()
- endif()
-
- if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
-if(CPACK_PACKAGE_DESCRIPTION_FILE AND NOT
"${CPACK_PACKAGE_DESCRIPTION_FILE}" STREQUAL
"${CMAKE_ROOT}/Templates/CPack.Ge
[Cmake-commits] CMake branch, next, updated. v3.6.2-2451-g767ee35
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 767ee352d0d06913b0a4d013bbdd07a28ba9200e (commit) via d706b72896951ceaeca3696e4269f72259666fc3 (commit) via 9b1ea67715caba54f89de2d3b5acaa9628d2dee1 (commit) via 9a417c2f68666a8002ef0116bdd2a4ae398d72cc (commit) via 18840638560e6826e01e00a88b6949e137f04dfc (commit) from 6294b8bf002dfc7e2ae4edb671c3a87c8affae80 (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=767ee352d0d06913b0a4d013bbdd07a28ba9200e commit 767ee352d0d06913b0a4d013bbdd07a28ba9200e Merge: 6294b8b d706b72 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sat Sep 24 05:59:44 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Sep 24 05:59:44 2016 -0400 Merge topic 'cpack-rpm-debuginfo-sources' into next d706b728 fixup! CPack/RPM debuginfo packages must contain sources 9b1ea677 CPack/RPM debuginfo packaging documentation 9a417c2f CPack/RPM debuginfo directories to sources 18840638 CPack/RPM debuginfo packages must contain sources https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d706b72896951ceaeca3696e4269f72259666fc3 commit d706b72896951ceaeca3696e4269f72259666fc3 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sat Sep 24 10:09:15 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sat Sep 24 11:58:55 2016 +0200 fixup! CPack/RPM debuginfo packages must contain sources diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake b/Tests/RunCMake/CPack/DEBUGINFO.cmake index ead7ad1..e8d1c85 100644 --- a/Tests/RunCMake/CPack/DEBUGINFO.cmake +++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake @@ -1,5 +1,11 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH 1) +# PGI compiler doesn't add build id to binaries by default +if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI") + string(APPEND CMAKE_EXE_LINKER_FLAGS "--build-id") + string(APPEND CMAKE_SHARED_LINKER_FLAGS "--build-id") +endif() + set(CPACK_RPM_COMPONENT_INSTALL "ON") set(CMAKE_BUILD_TYPE Debug) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b1ea67715caba54f89de2d3b5acaa9628d2dee1 commit 9b1ea67715caba54f89de2d3b5acaa9628d2dee1 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Thu Sep 22 19:24:25 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sat Sep 24 11:58:43 2016 +0200 CPack/RPM debuginfo packaging documentation diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index ac2ddc0..9ed60d3 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -60,14 +60,6 @@ # * Mandatory : YES # * Default : :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` # -# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE -# CPACK_RPM__DEBUGINFO_PACKAGE -# -# Option to additionally generate debuginfo RPM package(s). -# -# * Mandatory : NO -# * Default : OFF -# # .. variable:: CPACK_RPM_PACKAGE_NAME # CPACK_RPM__PACKAGE_NAME # @@ -707,6 +699,96 @@ # package installation may cause initial symbolic link to point to an # invalid location. # +# Packaging of debug information +# ^^ +# +# Debuginfo packages contain debug symbols and sources for debugging packaged +# binaries. +# +# .. note:: +# +# Currently multiple debuginfo packages are generated if component based +# packaging is used - one debuginfo package per component. This duplicates +# sources if multiple binaries are using them. This is a side effect of +# how CPackRPM currently generates component packages and will be addressed +# in later versions of the generator. +# +# Debuginfo RPM packaging has it's own set of variables: +# +# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE +# CPACK_RPM__DEBUGINFO_PACKAGE +# +# Enable generation of debuginfo RPM package(s). +# +# * Mandatory : NO +# * Default : OFF +# +# .. note:: +# +# Binaries must contain debug symbols before packaging so use either ``Debug`` +# or ``RelWithDebInfo`` for :variable:`CMAKE_BUILD_TYPE` variable value. +# +# .. note:: +# +# Packages generated from packages without binary files, with binary files but +# without execute permissions or without debug symbols will be empty. +# +# .. variable:: CPACK_BUILD_SOURCE_DIRS +# +# Provides locations of root directories of source files from which binaries +# were built. +# +# * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set +# * Default : - +# +# .. note:: +# +# For CMake project :variable:`CPACK_BUILD_SOU
[Cmake-commits] CMake branch, next, updated. v3.6.2-2446-g6294b8b
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 6294b8bf002dfc7e2ae4edb671c3a87c8affae80 (commit)
via 784abda5e5995c4e29c6ded3d3f72619d3510a14 (commit)
via afb7f17e888484cdd3db4e16c7a473a557fbe53a (commit)
via b4b740b6003f25d36799af6de429151c65f7b49b (commit)
from 9041fb2470a9df8ce922bb0c8e591e99b98fd5fd (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=6294b8bf002dfc7e2ae4edb671c3a87c8affae80
commit 6294b8bf002dfc7e2ae4edb671c3a87c8affae80
Merge: 9041fb2 784abda
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Sep 24 05:57:11 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Sep 24 05:57:11 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
784abda5 fixup! CPack/RPM debuginfo packaging documentation
afb7f17e fixup! CPack/RPM debuginfo packages must contain sources
b4b740b6 fixup! CPack/RPM debuginfo packages must contain sources
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=784abda5e5995c4e29c6ded3d3f72619d3510a14
commit 784abda5e5995c4e29c6ded3d3f72619d3510a14
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Sep 24 11:01:11 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Sep 24 11:56:13 2016 +0200
fixup! CPack/RPM debuginfo packaging documentation
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 8e4aeaf..9ed60d3 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -752,11 +752,13 @@
# :variable:`CPACK_BUILD_SOURCE_DIRS` will not be present in debuginfo
package.
#
# .. variable:: CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
+# CPACK_RPM__BUILD_SOURCE_DIRS_PREFIX
#
# Prefix of location where sources will be placed during package installation.
#
# * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
-# * Default : "/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}"
+# * Default : "/usr/src/debug/" and
+#for component packaging
"/usr/src/debug/-"
#
# .. note::
#
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afb7f17e888484cdd3db4e16c7a473a557fbe53a
commit afb7f17e888484cdd3db4e16c7a473a557fbe53a
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Sep 24 10:26:59 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat Sep 24 11:56:08 2016 +0200
fixup! CPack/RPM debuginfo packages must contain sources
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index d880b24..8e4aeaf 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2056,8 +2056,12 @@ function(cpack_rpm_generate_package)
"CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DEBUGINFO_PACKAGE"
"CPACK_RPM_DEBUGINFO_PACKAGE")
if(CPACK_RPM_DEBUGINFO_PACKAGE)
+cpack_rpm_variable_fallback("CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX"
+ "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_BUILD_SOURCE_DIRS_PREFIX"
+ "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_BUILD_SOURCE_DIRS_PREFIX"
+ "CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX")
if(NOT CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX)
- set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
"/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}")
+ set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
"/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}")
endif()
cpack_rpm_debugsymbol_check("${CPACK_RPM_INSTALL_FILES}" "${WDIR}")
@@ -2373,7 +2377,7 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
execute_process(
COMMAND "${RPMBUILD_EXECUTABLE}" ${RPMBUILD_FLAGS}
--define "_topdir ${CPACK_RPM_DIRECTORY}"
- --buildroot
"%_topdir/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}" #
TODO should I remove this variable? or change the path?
+ --buildroot
"%_topdir/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
--target "${CPACK_RPM_PACKAGE_ARCHITECTURE}"
"${CPACK_RPM_BINARY_SPECFILE}"
WORKING_DIRECTORY
"${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4b740b6003f25d36799af6de429151c65f7b49b
commit b4b740b6003f25d36799af6de429151c65f7b49b
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat Sep 24
[Cmake-commits] CMake branch, next, updated. v3.6.2-2388-g36ab119
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 36ab1194b924d7b1702993bd250003167bb3ecb1 (commit)
via e677ecdf19c64fff2f0307ffcc5becf7a7d8b63f (commit)
from a11ba9ee3bc679320d48f207535584cbb14a0e8a (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=36ab1194b924d7b1702993bd250003167bb3ecb1
commit 36ab1194b924d7b1702993bd250003167bb3ecb1
Merge: a11ba9e e677ecd
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 22 13:52:23 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 22 13:52:23 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
e677ecdf CPack/RPM debuginfo packaging documentation
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e677ecdf19c64fff2f0307ffcc5becf7a7d8b63f
commit e677ecdf19c64fff2f0307ffcc5becf7a7d8b63f
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 22 19:24:25 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Sep 22 19:51:53 2016 +0200
CPack/RPM debuginfo packaging documentation
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 95904f7..d880b24 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -60,14 +60,6 @@
# * Mandatory : YES
# * Default : :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
#
-# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE
-# CPACK_RPM__DEBUGINFO_PACKAGE
-#
-# Option to additionally generate debuginfo RPM package(s).
-#
-# * Mandatory : NO
-# * Default : OFF
-#
# .. variable:: CPACK_RPM_PACKAGE_NAME
# CPACK_RPM__PACKAGE_NAME
#
@@ -707,6 +699,94 @@
# package installation may cause initial symbolic link to point to an
# invalid location.
#
+# Packaging of debug information
+# ^^
+#
+# Debuginfo packages contain debug symbols and sources for debugging packaged
+# binaries.
+#
+# .. note::
+#
+# Currently multiple debuginfo packages are generated if component based
+# packaging is used - one debuginfo package per component. This duplicates
+# sources if multiple binaries are using them. This is a side effect of
+# how CPackRPM currently generates component packages and will be addressed
+# in later versions of the generator.
+#
+# Debuginfo RPM packaging has it's own set of variables:
+#
+# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE
+# CPACK_RPM__DEBUGINFO_PACKAGE
+#
+# Enable generation of debuginfo RPM package(s).
+#
+# * Mandatory : NO
+# * Default : OFF
+#
+# .. note::
+#
+# Binaries must contain debug symbols before packaging so use either ``Debug``
+# or ``RelWithDebInfo`` for :variable:`CMAKE_BUILD_TYPE` variable value.
+#
+# .. note::
+#
+# Packages generated from packages without binary files, with binary files but
+# without execute permissions or without debug symbols will be empty.
+#
+# .. variable:: CPACK_BUILD_SOURCE_DIRS
+#
+# Provides locations of root directories of source files from which binaries
+# were built.
+#
+# * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
+# * Default : -
+#
+# .. note::
+#
+# For CMake project :variable:`CPACK_BUILD_SOURCE_DIRS` is set by default to
+# point to :variable:`CMAKE_SOURCE_DIR` and :variable:`CMAKE_BINARY_DIR`
paths.
+#
+# .. note::
+#
+# Sources with path prefixes that do not fall under any location provided with
+# :variable:`CPACK_BUILD_SOURCE_DIRS` will not be present in debuginfo
package.
+#
+# .. variable:: CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
+#
+# Prefix of location where sources will be placed during package installation.
+#
+# * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
+# * Default : "/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}"
+#
+# .. note::
+#
+# Each source path prefix is additionaly suffixed by ``src_`` where
+# index is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS`
+# variable. This produces ``/src_``
+# replacement path.
+# Limitation is that replaced path part must be shorter or of equal
+# length than the length of its replacement. If that is not the case either
+# :variable:`CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX` variable has to be set to
+# a shorter path or source directories must be placed on a longer path.
+#
+# .. variable:: CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS
+#
+# Directories containing sources that should be excluded from debuginfo
packages.
+#
+# * Mandatory : NO
+# * Default : "/usr /usr/src /usr/src/debug"
+#
+# Listed paths are owned by other RPM packages and sh
[Cmake-commits] CMake branch, next, updated. v3.6.2-2386-ga11ba9e
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 a11ba9ee3bc679320d48f207535584cbb14a0e8a (commit)
via 04310070588df956f8a925e3ca873ca290a3bd99 (commit)
from 11d9a18decaffe6cd8941f7e578c54b0b77c579f (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=a11ba9ee3bc679320d48f207535584cbb14a0e8a
commit a11ba9ee3bc679320d48f207535584cbb14a0e8a
Merge: 11d9a18 0431007
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 22 13:44:09 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 22 13:44:09 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
04310070 fixup! CPack/RPM debuginfo packaging documentation
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04310070588df956f8a925e3ca873ca290a3bd99
commit 04310070588df956f8a925e3ca873ca290a3bd99
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 22 19:43:49 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Sep 22 19:43:49 2016 +0200
fixup! CPack/RPM debuginfo packaging documentation
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 4ae0382..d880b24 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -760,15 +760,33 @@
#
# .. note::
#
-# Each source path prefix is additionaly suffixed by ``src_${index_}`` where
-# index_ is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS`
-# variable. This produces
``${CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX}/src_${index_}``
+# Each source path prefix is additionaly suffixed by ``src_`` where
+# index is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS`
+# variable. This produces ``/src_``
# replacement path.
# Limitation is that replaced path part must be shorter or of equal
# length than the length of its replacement. If that is not the case either
# :variable:`CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX` variable has to be set to
# a shorter path or source directories must be placed on a longer path.
#
+# .. variable:: CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS
+#
+# Directories containing sources that should be excluded from debuginfo
packages.
+#
+# * Mandatory : NO
+# * Default : "/usr /usr/src /usr/src/debug"
+#
+# Listed paths are owned by other RPM packages and should therefore not be
+# deleted on debuginfo package uninstallation.
+#
+# .. variable:: CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS_ADDITION
+#
+# Paths that should be appended to
:variable:`CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS`
+# for exclusion.
+#
+# * Mandatory : NO
+# * Default : -
+#
# Packaging of sources (SRPM)
# ^^^
#
---
Summary of changes:
Modules/CPackRPM.cmake | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.2-2384-g11d9a18
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 11d9a18decaffe6cd8941f7e578c54b0b77c579f (commit)
via fea1abfaa20f9c290c9f695a461bc0be5ce1ada3 (commit)
via 9c109672631853c5393b68de5febd3a59ee57760 (commit)
from 513509a2e233824225ce57a6487c26c2e28847fb (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=11d9a18decaffe6cd8941f7e578c54b0b77c579f
commit 11d9a18decaffe6cd8941f7e578c54b0b77c579f
Merge: 513509a fea1abf
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 22 13:25:27 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 22 13:25:27 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
fea1abfa CPack/RPM debuginfo packaging documentation
9c109672 CPack/RPM debuginfo directories to sources
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fea1abfaa20f9c290c9f695a461bc0be5ce1ada3
commit fea1abfaa20f9c290c9f695a461bc0be5ce1ada3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 22 19:24:25 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Sep 22 19:24:25 2016 +0200
CPack/RPM debuginfo packaging documentation
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 95904f7..4ae0382 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -60,14 +60,6 @@
# * Mandatory : YES
# * Default : :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
#
-# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE
-# CPACK_RPM__DEBUGINFO_PACKAGE
-#
-# Option to additionally generate debuginfo RPM package(s).
-#
-# * Mandatory : NO
-# * Default : OFF
-#
# .. variable:: CPACK_RPM_PACKAGE_NAME
# CPACK_RPM__PACKAGE_NAME
#
@@ -707,6 +699,76 @@
# package installation may cause initial symbolic link to point to an
# invalid location.
#
+# Packaging of debug information
+# ^^
+#
+# Debuginfo packages contain debug symbols and sources for debugging packaged
+# binaries.
+#
+# .. note::
+#
+# Currently multiple debuginfo packages are generated if component based
+# packaging is used - one debuginfo package per component. This duplicates
+# sources if multiple binaries are using them. This is a side effect of
+# how CPackRPM currently generates component packages and will be addressed
+# in later versions of the generator.
+#
+# Debuginfo RPM packaging has it's own set of variables:
+#
+# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE
+# CPACK_RPM__DEBUGINFO_PACKAGE
+#
+# Enable generation of debuginfo RPM package(s).
+#
+# * Mandatory : NO
+# * Default : OFF
+#
+# .. note::
+#
+# Binaries must contain debug symbols before packaging so use either ``Debug``
+# or ``RelWithDebInfo`` for :variable:`CMAKE_BUILD_TYPE` variable value.
+#
+# .. note::
+#
+# Packages generated from packages without binary files, with binary files but
+# without execute permissions or without debug symbols will be empty.
+#
+# .. variable:: CPACK_BUILD_SOURCE_DIRS
+#
+# Provides locations of root directories of source files from which binaries
+# were built.
+#
+# * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
+# * Default : -
+#
+# .. note::
+#
+# For CMake project :variable:`CPACK_BUILD_SOURCE_DIRS` is set by default to
+# point to :variable:`CMAKE_SOURCE_DIR` and :variable:`CMAKE_BINARY_DIR`
paths.
+#
+# .. note::
+#
+# Sources with path prefixes that do not fall under any location provided with
+# :variable:`CPACK_BUILD_SOURCE_DIRS` will not be present in debuginfo
package.
+#
+# .. variable:: CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
+#
+# Prefix of location where sources will be placed during package installation.
+#
+# * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
+# * Default : "/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}"
+#
+# .. note::
+#
+# Each source path prefix is additionaly suffixed by ``src_${index_}`` where
+# index_ is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS`
+# variable. This produces
``${CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX}/src_${index_}``
+# replacement path.
+# Limitation is that replaced path part must be shorter or of equal
+# length than the length of its replacement. If that is not the case either
+# :variable:`CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX` variable has to be set to
+# a shorter path or source directories must be placed on a longer path.
+#
# Packaging of sources (SRPM)
# ^^^
#
https:/
[Cmake-commits] CMake branch, next, updated. v3.6.2-2355-gb0e23de
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 b0e23de782c19caefdfbbb96a1582eed5817d8cc (commit)
via dea14afba41ae1af58be0b897557bd0a7c0b3329 (commit)
via 555ef1e235e62236870b27adb1b6c384313bd792 (commit)
from e893a4c791898dc49281d04dc56a0354afc6ca1a (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=b0e23de782c19caefdfbbb96a1582eed5817d8cc
commit b0e23de782c19caefdfbbb96a1582eed5817d8cc
Merge: e893a4c dea14af
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 22 02:57:33 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 22 02:57:33 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
dea14afb CPack/RPM debuginfo packages must contain sources
555ef1e2 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dea14afba41ae1af58be0b897557bd0a7c0b3329
commit dea14afba41ae1af58be0b897557bd0a7c0b3329
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 20 00:41:33 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Sep 22 08:54:36 2016 +0200
CPack/RPM debuginfo packages must contain sources
Issue #15668 fix was missing relevant source
files in debuginfo package.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 99f22ec..50d9fc3 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -604,6 +604,8 @@ if(CMAKE_OSX_SYSROOT)
_cpack_set_default(CPACK_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_PATH}")
endif()
+_cpack_set_default(CPACK_BUILD_SOURCE_DIRS
"${CMAKE_SOURCE_DIR};${CMAKE_BINARY_DIR}")
+
if(DEFINED CPACK_COMPONENTS_ALL)
if(CPACK_MONOLITHIC_INSTALL)
message("CPack warning: both CPACK_COMPONENTS_ALL and
CPACK_MONOLITHIC_INSTALL have been set.\nDefaulting to a monolithic
installation.")
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index d78f7fa..5b1eec8 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1321,13 +1321,37 @@ endif()
# We need to check if the binaries were compiled with debug symbols
# because without them the package will be useless
function(cpack_rpm_debugsymbol_check INSTALL_FILES WORKING_DIR)
+ if(NOT CPACK_BUILD_SOURCE_DIRS)
+message(FATAL_ERROR "CPackRPM: CPACK_BUILD_SOURCE_DIRS variable is not
set!"
+ " Required for debuginfo packaging. See documentation of"
+ " CPACK_RPM_DEBUGINFO_PACKAGE variable for details.")
+ endif()
+
# With objdump we should check the debug symbols
find_program(OBJDUMP_EXECUTABLE objdump)
if(NOT OBJDUMP_EXECUTABLE)
-message(WARNING "CPackRPM: objdump binary could not be found!")
+message(FATAL_ERROR "CPackRPM: objdump binary could not be found!"
+ " Required for debuginfo packaging. See documentation of"
+ " CPACK_RPM_DEBUGINFO_PACKAGE variable for details.")
endif()
+ # With debugedit we prepare source files list
+ find_program(DEBUGEDIT_EXECUTABLE debugedit "/usr/lib/rpm/")
+ if(NOT DEBUGEDIT_EXECUTABLE)
+message(FATAL_ERROR "CPackRPM: debugedit binary could not be found!"
+ " Required for debuginfo packaging. See documentation of"
+ " CPACK_RPM_DEBUGINFO_PACKAGE variable for details.")
+ endif()
+
+ unset(mkdir_list_)
+ unset(cp_list_)
+ unset(additional_sources_)
+
foreach(F IN LISTS INSTALL_FILES)
+if(IS_DIRECTORY "${WORKING_DIR}/${F}" OR IS_SYMLINK "${WORKING_DIR}/${F}")
+ continue()
+endif()
+
execute_process(COMMAND "${OBJDUMP_EXECUTABLE}" -h ${WORKING_DIR}/${F}
WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}"
RESULT_VARIABLE OBJDUMP_EXEC_RESULT
@@ -1335,11 +1359,70 @@ function(cpack_rpm_debugsymbol_check INSTALL_FILES
WORKING_DIR)
# Check that if the given file was executable or not
if(NOT OBJDUMP_EXEC_RESULT)
string(FIND "${OBJDUMP_OUT}" "debug" FIND_RESULT)
- if(NOT FIND_RESULT GREATER -1)
+ if(FIND_RESULT GREATER -1)
+set(index_ 0)
+foreach(source_dir_ IN LISTS CPACK_BUILD_SOURCE_DIRS)
+ string(LENGTH "${source_dir_}" source_dir_len_)
+ string(LENGTH "${CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX}/src_${index_}"
debuginfo_dir_len)
+ if(source_dir_len_ LESS debuginfo_dir_len)
+message(FATAL_ERROR "CPackRPM: source dir path '${source_dir_}' is&quo
[Cmake-commits] CMake branch, next, updated. v3.6.2-2330-ge713f05
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 e713f05af166c0f359c0ffb361503df37c330056 (commit)
via ccd5f19c24fec74584f4148b0fa27b4ad46d4211 (commit)
from 41124690a9d66963ec4d80f53d74be1b00da2fd7 (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=e713f05af166c0f359c0ffb361503df37c330056
commit e713f05af166c0f359c0ffb361503df37c330056
Merge: 4112469 ccd5f19
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 20 15:16:14 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 20 15:16:14 2016 -0400
Merge topic 'runcmake-cpack-test-framework-fix' into next
ccd5f19c runcmake-cpack-test-framework-fix
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccd5f19c24fec74584f4148b0fa27b4ad46d4211
commit ccd5f19c24fec74584f4148b0fa27b4ad46d4211
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 20 21:08:36 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 20 21:08:36 2016 +0200
runcmake-cpack-test-framework-fix
Fix for conflicting RunCMake.CPack test
framework changes caused by commits
'cpack-rpm-srpm-package' and
'cpack.hash_computing'
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 7c2c9c6..7e6b4b1 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -1,72 +1,6 @@
cmake_policy(SET CMP0057 NEW)
-function(run_cpack_test_common_for_merge_ TEST_NAME types build source)
- if(TEST_TYPE IN_LIST types)
-set(RunCMake_TEST_NO_CLEAN TRUE)
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-build")
-
- # TODO this should be executed only once per ctest run (not per generator)
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-
-if(EXISTS
"${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake")
-
include("${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake")
-
- set(FOUND_PREREQUIREMENTS false)
- get_test_prerequirements("FOUND_PREREQUIREMENTS"
- "${TEST_CONFIG_DIR}/${type}_config.cmake")
-
- # skip the test if prerequirements are not met
- if(NOT FOUND_PREREQUIREMENTS)
-message(STATUS "${TEST_NAME} - SKIPPED")
-return()
- endif()
-endif()
-
-# execute cmake
-set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
-run_cmake(${TEST_NAME})
-
-# execute optional build step
-if(build)
- run_cmake_command(${TEST_NAME}-Build "${CMAKE_COMMAND}" --build
"${RunCMake_TEST_BINARY_DIR}")
-endif()
-
-if(source)
- set(pack_params_ -G ${TEST_TYPE} --config ./CPackSourceConfig.cmake)
- FILE(APPEND ${RunCMake_TEST_BINARY_DIR}/CPackSourceConfig.cmake
-"\nset(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS
\"-DRunCMake_TEST:STRING=${TEST_NAME}\")")
-else()
- unset(pack_params_)
-endif()
-# execute cpack
-execute_process(
- COMMAND ${CMAKE_CPACK_COMMAND} ${pack_params_}
- WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"
- RESULT_VARIABLE "result_"
- OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
- ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
- )
-
-# verify result
-run_cmake_command(
- ${TEST_TYPE}/${TEST_NAME}
- "${CMAKE_COMMAND}"
--DRunCMake_TEST=${TEST_NAME}
--DGENERATOR_TYPE=${TEST_TYPE}
--DPACKAGING_RESULT=${result_}
-"-Dsrc_dir=${RunCMake_SOURCE_DIR}"
-"-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
-"-Dconfig_file=${config_file}"
--P "${RunCMake_SOURCE_DIR}/VerifyResult.cmake"
- )
- endif()
-endfunction()
-function(run_cpack_source_test TEST_NAME types)
- run_cpack_test_common_for_merge_("${TEST_NAME}" "${types}" false true)
-endfunction()
-
-function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX)
+function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX source)
if(TEST_TYPE IN_LIST types)
set(RunCMake_TEST_NO_CLEAN TRUE)
set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-build")
@@ -106,10 +40,19 @@ function(run_cpack_test_common_ TEST_NAME types
[Cmake-commits] CMake branch, next, updated. v3.6.2-2289-gc569163
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 c569163f4fab72d1e8f7c1f066fe864dcc9335fe (commit)
via 1bb31cc2f89de873ddf84bec65c02266625e84fa (commit)
from 056a10260dbf914602c7162c8c6d7b5addace1bb (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=c569163f4fab72d1e8f7c1f066fe864dcc9335fe
commit c569163f4fab72d1e8f7c1f066fe864dcc9335fe
Merge: 056a102 1bb31cc
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 19 18:18:29 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 19 18:18:29 2016 -0400
Merge topic 'cpack-rpm-policy-warnings' into next
1bb31cc2 cpack-rpm-policy-warnings
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bb31cc2f89de873ddf84bec65c02266625e84fa
commit 1bb31cc2f89de873ddf84bec65c02266625e84fa
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 20 00:17:54 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 20 00:17:54 2016 +0200
cpack-rpm-policy-warnings
For older versions of CMake minimum
required version CMP0007 policy
warning was printed out.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 36caac6..90b3943 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -847,7 +847,10 @@ function(cpack_rpm_prepare_content_list)
set(_DISTINCT_PATH "${_RPM_RELOCATION_PREFIX}")
string(REPLACE "/" ";" _CPACK_RPM_PACKAGE_PREFIX_ELEMS "
${_RPM_RELOCATION_PREFIX}")
-list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+cmake_policy(PUSH)
+ cmake_policy(SET CMP0007 NEW)
+ list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+cmake_policy(POP)
unset(_TMP_LIST)
# Now generate all of the parent dirs of the relocation path
foreach(_PREFIX_PATH_ELEM ${_CPACK_RPM_PACKAGE_PREFIX_ELEMS})
---
Summary of changes:
Modules/CPackRPM.cmake |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.2-2287-g056a102
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 056a10260dbf914602c7162c8c6d7b5addace1bb (commit)
via 0ba6b21650c0f9db147c390c76c0495b2c445a6e (commit)
from 2040474e9dbc9fe8a3cc955c3564d48f0afb3664 (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=056a10260dbf914602c7162c8c6d7b5addace1bb
commit 056a10260dbf914602c7162c8c6d7b5addace1bb
Merge: 2040474 0ba6b21
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 19 17:53:23 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 19 17:53:23 2016 -0400
Merge topic 'cpack-rpm-srpm-package' into next
0ba6b216 cpack-rpm-srpm-package
diff --cc Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 5a35acd,d09fafe..7c2c9c6
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@@ -1,6 -1,72 +1,72 @@@
cmake_policy(SET CMP0057 NEW)
+ function(run_cpack_test_common_for_merge_ TEST_NAME types build source)
+ if(TEST_TYPE IN_LIST types)
+ set(RunCMake_TEST_NO_CLEAN TRUE)
+ set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-build")
+
+ # TODO this should be executed only once per ctest run (not per
generator)
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+ if(EXISTS
"${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake")
+
include("${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake")
+
+ set(FOUND_PREREQUIREMENTS false)
+ get_test_prerequirements("FOUND_PREREQUIREMENTS"
+ "${TEST_CONFIG_DIR}/${type}_config.cmake")
+
+ # skip the test if prerequirements are not met
+ if(NOT FOUND_PREREQUIREMENTS)
+ message(STATUS "${TEST_NAME} - SKIPPED")
+ return()
+ endif()
+ endif()
+
+ # execute cmake
+ set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
+ run_cmake(${TEST_NAME})
+
+ # execute optional build step
+ if(build)
+ run_cmake_command(${TEST_NAME}-Build "${CMAKE_COMMAND}" --build
"${RunCMake_TEST_BINARY_DIR}")
+ endif()
+
+ if(source)
+ set(pack_params_ -G ${TEST_TYPE} --config ./CPackSourceConfig.cmake)
+ FILE(APPEND ${RunCMake_TEST_BINARY_DIR}/CPackSourceConfig.cmake
+ "\nset(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS
\"-DRunCMake_TEST:STRING=${TEST_NAME}\")")
+ else()
+ unset(pack_params_)
+ endif()
+
+ # execute cpack
+ execute_process(
+ COMMAND ${CMAKE_CPACK_COMMAND} ${pack_params_}
+ WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"
+ RESULT_VARIABLE "result_"
+ OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
+ ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
+ )
+
+ # verify result
+ run_cmake_command(
+ ${TEST_TYPE}/${TEST_NAME}
+ "${CMAKE_COMMAND}"
+ -DRunCMake_TEST=${TEST_NAME}
+ -DGENERATOR_TYPE=${TEST_TYPE}
+ -DPACKAGING_RESULT=${result_}
+ "-Dsrc_dir=${RunCMake_SOURCE_DIR}"
+ "-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
+ "-Dconfig_file=${config_file}"
+ -P "${RunCMake_SOURCE_DIR}/VerifyResult.cmake"
+ )
+ endif()
+ endfunction()
+ function(run_cpack_source_test TEST_NAME types)
+ run_cpack_test_common_for_merge_("${TEST_NAME}" "${types}" false true)
+ endfunction()
-function(run_cpack_test TEST_NAME types build)
+function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX)
if(TEST_TYPE IN_LIST types)
set(RunCMake_TEST_NO_CLEAN TRUE)
set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-build")
diff --cc Tests/RunCMake/CPack/VerifyResult.cmake
index 238cbfd,fc929e3..8bc2a58
--- a/Tests/RunCMake/CPack/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/VerifyResult.cmake
@@@ -8,10 -8,10 +8,10 @@@ file(READ "${bin_dir}/test_error.txt" e
file(READ "${config_file}" config_file_content)
set(output_error_message
- "\nCPack output: '${output}'\nCPack error: '${error}';\nconfig file:
'${config_file_content}'")
+ "\nCPack output: '${output}'\nCPack error: '${error}';\nCPack result:
'${PACKAGING_RESULT}';\nconfig file: '${config_file_content}'")
# check that expected gen
[Cmake-commits] CMake branch, next, updated. v3.6.1-1819-gea86f38
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 ea86f387bd68596159f38b18863072769cf3df58 (commit)
via 25899e8a9dcc633b6e7495a87299354a14cb834a (commit)
from ce7f0cbce58b4688991df6db0e00b93b53d2 (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=ea86f387bd68596159f38b18863072769cf3df58
commit ea86f387bd68596159f38b18863072769cf3df58
Merge: ce7f0cb 25899e8
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 6 13:51:22 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 6 13:51:22 2016 -0400
Merge topic 'cpack-deb-package-description-fallback' into next
25899e8a cpack-deb-package-description-fallback
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25899e8a9dcc633b6e7495a87299354a14cb834a
commit 25899e8a9dcc633b6e7495a87299354a14cb834a
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 5 23:58:33 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 6 19:49:41 2016 +0200
cpack-deb-package-description-fallback
Breaking change of fallback variable precedence
for CPACK_DEBIAN_PACKAGE_DESCRIPTION that matches
CPackRPM behavior as much as possible.
Closes: #16272
diff --git a/Help/release/dev/cpack-deb-package-description-fallback
b/Help/release/dev/cpack-deb-package-description-fallback
new file mode 100644
index 000..6300dfc
--- /dev/null
+++ b/Help/release/dev/cpack-deb-package-description-fallback
@@ -0,0 +1,11 @@
+cpack-deb-package-description-fallback
+--
+
+* The :module:`CPackDeb` module learned new package description
+ override rules to match :module:`CPackRPM` module behavior.
+ **Breaking change**: If :variable:`CPACK_PACKAGE_DESCRIPTION_FILE`
+ variable is set to non default location then it is prefered to
+ :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
+ Also a new :variable:`CPACK_DEBIAN__PACKAGE_DESCRIPTION`
+ was introduced for component based packaging.
+ See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 1a7b923..423bb00 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -156,16 +156,18 @@
# * Default : :code:`CPACK_PACKAGE_CONTACT`
#
# .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION
-# CPACK_COMPONENT__DESCRIPTION
+# CPACK_DEBIAN__PACKAGE_DESCRIPTION
#
# The Debian package description
#
# * Mandatory : YES
# * Default :
#
-#- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
-#
+#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component based
installers only) if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default
location,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set,
+#- or "no package description available"
#
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
# CPACK_DEBIAN__PACKAGE_SECTION
@@ -829,24 +831,23 @@ function(cpack_deb_prepare_package_vars)
endif()
# Description: (mandatory)
- if(NOT CPACK_DEB_PACKAGE_COMPONENT)
-if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
- if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or
CPACK_DEBIAN_PACKAGE_DESCRIPTION")
- endif()
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
+ if(CPACK_DEB_PACKAGE_COMPONENT)
+if(CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION)
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION}")
+elseif(CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_COMPONENT_${_local_component_name}_DESCRIPTION}")
endif()
- else()
-set(component_description_var
CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
-
-# component description overrides package description
-if(${component_description_var})
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${${component_description_var}})
-elseif(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
- if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or
[Cmake-commits] CMake branch, next, updated. v3.6.1-1817-gce7f0cb
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 ce7f0cbce58b4688991df6db0e00b93b53d2 (commit) via a1fc9467271de8614be7c44e4b42613c7e5e2c58 (commit) from 345e669b0663a23876c815d46463ea90685bd110 (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=ce7f0cbce58b4688991df6db0e00b93b53d2 commit ce7f0cbce58b4688991df6db0e00b93b53d2 Merge: 345e669 a1fc946 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue Sep 6 13:49:17 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Sep 6 13:49:17 2016 -0400 Merge topic 'cpack-deb-package-description-fallback' into next a1fc9467 fixup! cpack-deb-package-description-fallback https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1fc9467271de8614be7c44e4b42613c7e5e2c58 commit a1fc9467271de8614be7c44e4b42613c7e5e2c58 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue Sep 6 19:48:36 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue Sep 6 19:48:36 2016 +0200 fixup! cpack-deb-package-description-fallback diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 1032dfc..423bb00 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -163,8 +163,7 @@ # * Mandatory : YES # * Default : # -#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component -# based installers only) if set, +#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component based installers only) if set, #- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default location, #- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set, #- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set, --- Summary of changes: Modules/CPackDeb.cmake |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1815-g345e669
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 345e669b0663a23876c815d46463ea90685bd110 (commit)
via 9afe1ed94c46071b5ec0b3ef288493d355de75db (commit)
from d7cc6846e9bfce3f59161ee1485b181039276d6a (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=345e669b0663a23876c815d46463ea90685bd110
commit 345e669b0663a23876c815d46463ea90685bd110
Merge: d7cc684 9afe1ed
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 6 13:41:38 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 6 13:41:38 2016 -0400
Merge topic 'cpack-deb-package-description-fallback' into next
9afe1ed9 cpack-deb-package-description-fallback
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9afe1ed94c46071b5ec0b3ef288493d355de75db
commit 9afe1ed94c46071b5ec0b3ef288493d355de75db
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 5 23:58:33 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 6 19:39:43 2016 +0200
cpack-deb-package-description-fallback
Breaking change of fallback variable precedence
for CPACK_DEBIAN_PACKAGE_DESCRIPTION that matches
CPackRPM behavior as much as possible.
Closes: #16272
diff --git a/Help/release/dev/cpack-deb-package-description-fallback
b/Help/release/dev/cpack-deb-package-description-fallback
new file mode 100644
index 000..6300dfc
--- /dev/null
+++ b/Help/release/dev/cpack-deb-package-description-fallback
@@ -0,0 +1,11 @@
+cpack-deb-package-description-fallback
+--
+
+* The :module:`CPackDeb` module learned new package description
+ override rules to match :module:`CPackRPM` module behavior.
+ **Breaking change**: If :variable:`CPACK_PACKAGE_DESCRIPTION_FILE`
+ variable is set to non default location then it is prefered to
+ :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
+ Also a new :variable:`CPACK_DEBIAN__PACKAGE_DESCRIPTION`
+ was introduced for component based packaging.
+ See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 1a7b923..1032dfc 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -156,16 +156,19 @@
# * Default : :code:`CPACK_PACKAGE_CONTACT`
#
# .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION
-# CPACK_COMPONENT__DESCRIPTION
+# CPACK_DEBIAN__PACKAGE_DESCRIPTION
#
# The Debian package description
#
# * Mandatory : YES
# * Default :
#
-#- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
-#
+#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component
+# based installers only) if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default
location,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set,
+#- or "no package description available"
#
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
# CPACK_DEBIAN__PACKAGE_SECTION
@@ -829,24 +832,23 @@ function(cpack_deb_prepare_package_vars)
endif()
# Description: (mandatory)
- if(NOT CPACK_DEB_PACKAGE_COMPONENT)
-if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
- if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or
CPACK_DEBIAN_PACKAGE_DESCRIPTION")
- endif()
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
+ if(CPACK_DEB_PACKAGE_COMPONENT)
+if(CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION)
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION}")
+elseif(CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_COMPONENT_${_local_component_name}_DESCRIPTION}")
endif()
- else()
-set(component_description_var
CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
-
-# component description overrides package description
-if(${component_description_var})
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${${component_description_var}})
-elseif(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
- if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or
[Cmake-commits] CMake branch, next, updated. v3.6.1-1794-gd16d98e
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 d16d98e86a084508666fd9768b779ae0ce96763a (commit)
via 87a944984abeacbc984e3197f7bcfe54faf6aaad (commit)
from ed5cd9993461fabf38e9986dc52b304cd5f2830b (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=d16d98e86a084508666fd9768b779ae0ce96763a
commit d16d98e86a084508666fd9768b779ae0ce96763a
Merge: ed5cd99 87a9449
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 5 18:24:15 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 5 18:24:15 2016 -0400
Merge topic 'cpack-deb-package-description-fallback' into next
87a94498 fixup! cpack-deb-package-description-fallback
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87a944984abeacbc984e3197f7bcfe54faf6aaad
commit 87a944984abeacbc984e3197f7bcfe54faf6aaad
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 6 00:23:41 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 6 00:23:41 2016 +0200
fixup! cpack-deb-package-description-fallback
Default description file path is set by CPack.cmake
script so handle the case when that script is
not used.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index cbba186..25c25ae 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -167,7 +167,8 @@
# based installers only) if set,
#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default
location,
#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default location content
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set,
+#- or "no package description available"
#
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
# CPACK_DEBIAN__PACKAGE_SECTION
@@ -826,8 +827,10 @@ function(cpack_deb_prepare_package_vars)
file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}"
CPACK_DEBIAN_PACKAGE_DESCRIPTION)
elseif(CPACK_PACKAGE_DESCRIPTION_SUMMARY)
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-else() # use default package description file content
+elseif(CPACK_PACKAGE_DESCRIPTION_FILE) # use default package description
file content
file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}"
CPACK_DEBIAN_PACKAGE_DESCRIPTION)
+else()
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "no package description available")
endif()
endif()
---
Summary of changes:
Modules/CPackDeb.cmake |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1792-ged5cd99
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 ed5cd9993461fabf38e9986dc52b304cd5f2830b (commit)
via d3c1b906906bd6abab1d42fc1166e117b7ce8567 (commit)
from 8752d765ae63edd5153a0547727989a4efe4d809 (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=ed5cd9993461fabf38e9986dc52b304cd5f2830b
commit ed5cd9993461fabf38e9986dc52b304cd5f2830b
Merge: 8752d76 d3c1b90
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 5 17:59:22 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 5 17:59:22 2016 -0400
Merge topic 'cpack-deb-package-description-fallback' into next
d3c1b906 cpack-deb-package-description-fallback
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3c1b906906bd6abab1d42fc1166e117b7ce8567
commit d3c1b906906bd6abab1d42fc1166e117b7ce8567
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 5 23:58:33 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon Sep 5 23:58:33 2016 +0200
cpack-deb-package-description-fallback
Breaking change of fallback variable precedence
for CPACK_DEBIAN_PACKAGE_DESCRIPTION that matches
CPackRPM behavior as much as possible.
See Issue #16272
diff --git a/Help/release/dev/cpack-deb-package-description-fallback
b/Help/release/dev/cpack-deb-package-description-fallback
new file mode 100644
index 000..6300dfc
--- /dev/null
+++ b/Help/release/dev/cpack-deb-package-description-fallback
@@ -0,0 +1,11 @@
+cpack-deb-package-description-fallback
+--
+
+* The :module:`CPackDeb` module learned new package description
+ override rules to match :module:`CPackRPM` module behavior.
+ **Breaking change**: If :variable:`CPACK_PACKAGE_DESCRIPTION_FILE`
+ variable is set to non default location then it is prefered to
+ :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
+ Also a new :variable:`CPACK_DEBIAN__PACKAGE_DESCRIPTION`
+ was introduced for component based packaging.
+ See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index c9678d6..cbba186 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -156,16 +156,18 @@
# * Default : :code:`CPACK_PACKAGE_CONTACT`
#
# .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION
-# CPACK_COMPONENT__DESCRIPTION
+# CPACK_DEBIAN__PACKAGE_DESCRIPTION
#
# The Debian package description
#
# * Mandatory : YES
# * Default :
#
-#- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
-#
+#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component
+# based installers only) if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default
location,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default location content
#
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
# CPACK_DEBIAN__PACKAGE_SECTION
@@ -811,24 +813,21 @@ function(cpack_deb_prepare_package_vars)
endif()
# Description: (mandatory)
- if(NOT CPACK_DEB_PACKAGE_COMPONENT)
-if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
- if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or
CPACK_DEBIAN_PACKAGE_DESCRIPTION")
- endif()
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
+ if(CPACK_DEB_PACKAGE_COMPONENT)
+if(CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION)
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION}")
+elseif(CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_COMPONENT_${_local_component_name}_DESCRIPTION}")
endif()
- else()
-set(component_description_var
CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
-
-# component description overrides package description
-if(${component_description_var})
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${${component_description_var}})
-elseif(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
- if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or
CPACK_DEBIAN_PACKAGE_DESCRIPTION or ${component_descript
[Cmake-commits] CMake branch, next, updated. v3.6.1-1764-g083f180
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 083f1806004094f87741ba58655d7536dc05aa1d (commit)
via 0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23 (commit)
from ed02aa4047c6e5aff30d1cb20ab29678399379c4 (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=083f1806004094f87741ba58655d7536dc05aa1d
commit 083f1806004094f87741ba58655d7536dc05aa1d
Merge: ed02aa4 0d7c971
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 4 17:10:07 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Sep 4 17:10:07 2016 -0400
Merge topic 'cpack-deb-long-filenames' into next
0d7c9712 fixup! cpack-deb-long-filenames
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23
commit 0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 4 23:09:53 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Sep 4 23:09:53 2016 +0200
fixup! cpack-deb-long-filenames
diff --git a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
index 169be1c..0452343 100644
--- a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
@@ -6,6 +6,9 @@ file(MAKE_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/info")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/available" "")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/status" "")
+# some programs used by fakeroot require sbin in path so we should not
+# leave this to chance (programs: ldconfig and start-stop-daemon)
+set(ENV{PATH} "$ENV{PATH}:/usr/local/sbin:/usr/sbin:/sbin")
execute_process(COMMAND ${FAKEROOT_EXECUTABLE} ${DPKG_EXECUTABLE}
-i --force-not-root --root=${CMAKE_CURRENT_BINARY_DIR}/root_dir
---
Summary of changes:
Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake |3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1762-ged02aa4
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 ed02aa4047c6e5aff30d1cb20ab29678399379c4 (commit)
via e42a39918f784d671ce7f51d9269cc754e263e44 (commit)
from b8ececb4b62f0fe2bb3fa7000bf00df327d76de5 (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=ed02aa4047c6e5aff30d1cb20ab29678399379c4
commit ed02aa4047c6e5aff30d1cb20ab29678399379c4
Merge: b8ececb e42a399
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 4 15:15:09 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Sep 4 15:15:09 2016 -0400
Merge topic 'cpack-deb-long-filenames' into next
e42a3991 cpack-deb-long-filenames
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e42a39918f784d671ce7f51d9269cc754e263e44
commit e42a39918f784d671ce7f51d9269cc754e263e44
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 4 21:13:24 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Sep 4 21:13:24 2016 +0200
cpack-deb-long-filenames
Support for long filenames in deb
packages. See Issue #14332
diff --git a/Help/release/dev/cpack-deb-long-filenames.rst
b/Help/release/dev/cpack-deb-long-filenames.rst
new file mode 100644
index 000..6113eaf
--- /dev/null
+++ b/Help/release/dev/cpack-deb-long-filenames.rst
@@ -0,0 +1,6 @@
+cpack-deb-long-filenames
+
+
+* The :module:`CPackDeb` module learned to support long file names
+ when archive format is set to GNU tar.
+ See :variable:`CPACK_DEBIAN_ARCHIVE_TYPE`
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index c9678d6..1a7b923 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -177,6 +177,24 @@
#
# See https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
#
+# .. variable:: CPACK_DEBIAN_ARCHIVE_TYPE
+#
+# The archive format used for creating the Debian package.
+#
+# * Mandatory : YES
+# * Default : "paxr"
+#
+# Possible values are:
+#
+# - paxr
+# - gnutar
+#
+# .. note::
+#
+#Default pax archive format is the most portable format and generates
+#packages that do not treat sparse files specially.
+#GNU tar format on the other hand supports longer filenames.
+#
# .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE
#
# The compression used for creating the Debian package.
@@ -842,12 +860,24 @@ function(cpack_deb_prepare_package_vars)
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
endif()
+ if(CPACK_DEBIAN_ARCHIVE_TYPE)
+set(archive_types_ "paxr;gnutar")
+cmake_policy(PUSH)
+ cmake_policy(SET CMP0057 NEW)
+ if(NOT CPACK_DEBIAN_ARCHIVE_TYPE IN_LIST archive_types_)
+message(FATAL_ERROR "CPACK_DEBIAN_ARCHIVE_TYPE set to unsupported"
+ "type ${CPACK_DEBIAN_ARCHIVE_TYPE}")
+ endif()
+cmake_policy(POP)
+ else()
+set(CPACK_DEBIAN_ARCHIVE_TYPE "paxr")
+ endif()
+
# Compression: (recommended)
if(NOT CPACK_DEBIAN_COMPRESSION_TYPE)
set(CPACK_DEBIAN_COMPRESSION_TYPE "gzip")
endif()
-
# Recommends:
# You should set: CPACK_DEBIAN_PACKAGE_RECOMMENDS
@@ -1000,6 +1030,7 @@ function(cpack_deb_prepare_package_vars)
set(GEN_CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}"
PARENT_SCOPE)
set(GEN_CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_DEBIAN_PACKAGE_DESCRIPTION}" PARENT_SCOPE)
set(GEN_CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}"
PARENT_SCOPE)
+ set(GEN_CPACK_DEBIAN_ARCHIVE_TYPE "${CPACK_DEBIAN_ARCHIVE_TYPE}"
PARENT_SCOPE)
set(GEN_CPACK_DEBIAN_COMPRESSION_TYPE "${CPACK_DEBIAN_COMPRESSION_TYPE}"
PARENT_SCOPE)
set(GEN_CPACK_DEBIAN_PACKAGE_RECOMMENDS "${CPACK_DEBIAN_PACKAGE_RECOMMENDS}"
PARENT_SCOPE)
set(GEN_CPACK_DEBIAN_PACKAGE_SUGGESTS "${CPACK_DEBIAN_PACKAGE_SUGGESTS}"
PARENT_SCOPE)
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 1f3ac51..b960c0a 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -419,6 +419,12 @@ int cmCPackDebGenerator::createDeb()
<< debian_compression_type << std::endl);
}
+ const char* debian_archive_type =
+this->GetOption("GEN_CPACK_DEBIAN_ARCHIVE_TYPE");
+ if (!debian_archive_type) {
+debian_archive_type = "paxr";
+ }
+
std::string filename_data_tar =
strGenWDIR + "/data.tar
[Cmake-commits] CMake branch, next, updated. v3.6.1-1471-g81bb94a
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 81bb94aff906c89cd7bc0cf070df1c34c0a4086b (commit) via 11ad59ca59a7d1372588f14f681211a2ab3ea71f (commit) from 33ab8bdd0aad3e44e8d85a730daca64c26ad71b1 (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=81bb94aff906c89cd7bc0cf070df1c34c0a4086b commit 81bb94aff906c89cd7bc0cf070df1c34c0a4086b Merge: 33ab8bd 11ad59c Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Thu Aug 25 16:21:14 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Aug 25 16:21:14 2016 -0400 Merge topic 'cpack-rpm-debuginfo-pkg' into next 11ad59ca fixup! cpack-rpm-debuginfo https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11ad59ca59a7d1372588f14f681211a2ab3ea71f commit 11ad59ca59a7d1372588f14f681211a2ab3ea71f Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Thu Aug 25 22:20:51 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Thu Aug 25 22:20:51 2016 +0200 fixup! cpack-rpm-debuginfo diff --git a/Help/release/dev/cpack-rpm-debuginfo-pkg.rst b/Help/release/dev/cpack-rpm-debuginfo-pkg.rst index f02a162..8b37fe4 100644 --- a/Help/release/dev/cpack-rpm-debuginfo-pkg.rst +++ b/Help/release/dev/cpack-rpm-debuginfo-pkg.rst @@ -1,5 +1,5 @@ cpack-rpm-debuginfo-pkg --- +--- * The :module:`CPackRPM` module learned to generate debuginfo packages on demand. See :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` --- Summary of changes: Help/release/dev/cpack-rpm-debuginfo-pkg.rst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1453-g5a38fe2
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 5a38fe2135c8f421e79027ff0f5d6525c6c4449f (commit)
via a6d9d783b45dcec84dd16b2fb0f0bef53c0b2487 (commit)
via bc8c0add7f799ad5775e4f229256832e17156b68 (commit)
from f80a4113e66cc5e83367af25c96faeaaa95d7a46 (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=5a38fe2135c8f421e79027ff0f5d6525c6c4449f
commit 5a38fe2135c8f421e79027ff0f5d6525c6c4449f
Merge: f80a411 a6d9d78
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Aug 25 13:17:28 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Aug 25 13:17:28 2016 -0400
Merge topic 'cpack-rpm-debuginfo-pkg' into next
a6d9d783 cpack-rpm-debuginfo
bc8c0add CPack RPM debuginfo packages generation
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6d9d783b45dcec84dd16b2fb0f0bef53c0b2487
commit a6d9d783b45dcec84dd16b2fb0f0bef53c0b2487
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Aug 25 18:35:42 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Aug 25 18:36:09 2016 +0200
cpack-rpm-debuginfo
test and release notes
diff --git a/Help/release/dev/cpack-rpm-debuginfo-pkg.rst
b/Help/release/dev/cpack-rpm-debuginfo-pkg.rst
new file mode 100644
index 000..f02a162
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-debuginfo-pkg.rst
@@ -0,0 +1,6 @@
+cpack-rpm-debuginfo-pkg
+--
+
+* The :module:`CPackRPM` module learned to generate debuginfo
+ packages on demand. See :variable:`CPACK_RPM_DEBUGINFO_PACKAGE`
+ and its per component version.
diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake
b/Tests/RunCMake/CPack/DEBUGINFO.cmake
new file mode 100644
index 000..2a65b7f
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -0,0 +1,26 @@
+set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+
+set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+set(CMAKE_BUILD_TYPE Debug)
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
+"int test_lib();\n")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"
+"#include \"test_lib.hpp\"\nint test_lib() {return 0;}\n")
+add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
+"#include \"test_lib.hpp\"\nint main() {return test_lib();}\n")
+add_executable(test_prog "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
+target_link_libraries(test_prog test_lib)
+
+install(TARGETS test_prog DESTINATION foo COMPONENT applications)
+install(FILES CMakeLists.txt DESTINATION bar COMPONENT headers)
+install(TARGETS test_lib DESTINATION bas COMPONENT libs)
+
+set(CPACK_RPM_APPLICATIONS_FILE_NAME "RPM-DEFAULT")
+set(CPACK_RPM_APPLICATIONS_DEBUGINFO_PACKAGE ON)
+set(CPACK_RPM_LIBS_DEBUGINFO_PACKAGE ON)
+
+set(CPACK_PACKAGE_NAME "debuginfo")
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-ExpectedFiles.cmake
new file mode 100644
index 000..265ca92
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/DEBUGINFO-ExpectedFiles.cmake
@@ -0,0 +1,14 @@
+set(whitespaces_ "[\t\n\r ]*")
+
+set(EXPECTED_FILES_COUNT "5")
+set(EXPECTED_FILE_1 "debuginfo-applications-0*.rpm")
+set(EXPECTED_FILE_CONTENT_1 "^/usr/foo${whitespaces_}/usr/foo/test_prog$")
+set(EXPECTED_FILE_2 "debuginfo*-headers.rpm")
+set(EXPECTED_FILE_CONTENT_2 "^/usr/bar${whitespaces_}/usr/bar/CMakeLists.txt$")
+set(EXPECTED_FILE_3 "debuginfo*-libs.rpm")
+set(EXPECTED_FILE_CONTENT_3 "^/usr/bas${whitespaces_}/usr/bas/libtest_lib.so$")
+
+set(EXPECTED_FILE_4 "debuginfo-applications-debuginfo*.rpm")
+set(EXPECTED_FILE_CONTENT_4 ".*")
+set(EXPECTED_FILE_5 "debuginfo-libs-debuginfo*.rpm")
+set(EXPECTED_FILE_CONTENT_5 ".*")
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt
new file mode 100644
index 000..557ef3d
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt
@@ -0,0 +1,3 @@
+^CPackRPM: Will use GENERATED spec file:
.*/Tests/RunCMake/RPM/CPack/DEBUGINFO-build/_CPack_Packages/.*/RPM/SPECS/debuginfo-applications.spec
+CPackRPM: Will use GENERATED spec file:
.*/Tests/RunCMake/RPM/CPack/DEBUGINFO-build/_CPack_Packages/.*/RPM/SPECS/debuginfo-headers.spec
+CPackRPM: Will use GENERATED spec file:
.*/Tests/RunCMake/RPM/CPack/DEBUGINFO-buil
[Cmake-commits] CMake branch, next, updated. v3.6.0-782-gad63450
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 ad634507d0155978a0744b5d3b896e696aecc5e1 (commit)
via 49df5d480045ea77295825f2968ec57c4146b5d8 (commit)
from 4ba010d93f20335ca5e643c0f1ec196a5a6efc6b (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=ad634507d0155978a0744b5d3b896e696aecc5e1
commit ad634507d0155978a0744b5d3b896e696aecc5e1
Merge: 4ba010d 49df5d4
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Jul 11 14:55:21 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jul 11 14:55:21 2016 -0400
Merge topic 'cpack-rpm-debug-logging-fix' into next
49df5d48 Debug logging should only print if requested for
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49df5d480045ea77295825f2968ec57c4146b5d8
commit 49df5d480045ea77295825f2968ec57c4146b5d8
Author: Harry Mallon <ha...@codexdigital.com>
AuthorDate: Mon Jul 11 20:53:31 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon Jul 11 20:53:31 2016 +0200
Debug logging should only print if requested for
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7706bbc..7a1cbef 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -859,7 +859,9 @@ function(cpack_rpm_prepare_content_list)
if(NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share
/usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
- message("CPackRPM:Debug: Adding
${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+ if(CPACK_RPM_PACKAGE_DEBUG)
+message("CPackRPM:Debug: Adding
${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+ endif()
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST
"${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
endif()
endif()
---
Summary of changes:
Modules/CPackRPM.cmake |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-418-gb661d4a
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 b661d4a77011f4407b4770a7ee166b557b61893e (commit)
via 4a104822359a60795f237f848ec00c736638eac9 (commit)
via 5c6ffd2d6dcc1954966638ee0044f4481fb47cb6 (commit)
via d6378091361623a9018925b9cfb2708f6a0183f4 (commit)
from 828c035c635523af3348082650c2a47d53619239 (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=b661d4a77011f4407b4770a7ee166b557b61893e
commit b661d4a77011f4407b4770a7ee166b557b61893e
Merge: 828c035 4a10482
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Jun 19 16:36:55 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Jun 19 16:36:55 2016 -0400
Merge topic 'cpack-deb-test-fixes' into next
4a104822 CPack/Deb test regex variable name was invalid and did not test
preinst script
5c6ffd2d CPack/Deb fix tests for SELinux-enabled systems
d6378091 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a104822359a60795f237f848ec00c736638eac9
commit 4a104822359a60795f237f848ec00c736638eac9
Author: Patrick mail6543210 <mail6543...@yahoo.com.tw>
AuthorDate: Sun Jun 19 22:28:19 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Jun 19 22:36:05 2016 +0200
CPack/Deb test regex variable name was invalid and did not test preinst
script
diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
index 5b6ae73..85e137f 100644
--- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
@@ -6,13 +6,13 @@ set(foo_prerm_permissions_regex "-rwxr-xr-x\.? .*")
verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm")
set(bar_preinst "^echo bar_preinst$")
-set(bar_prerm_permissions_regex "-rwx--\.? .*")
+set(bar_preinst_permissions_regex "-rwx--\.? .*")
set(bar_prerm "^echo bar_prerm$")
set(bar_prerm_permissions_regex "-rwx--\.? .*")
verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm")
set(bas_preinst "^echo default_preinst$")
-set(bas_prerm_permissions_regex "-rwxr-xr-x\.? .*")
+set(bas_preinst_permissions_regex "-rwxr-xr-x\.? .*")
set(bas_prerm "^echo default_prerm$")
set(bas_prerm_permissions_regex "-rwxr-xr-x\.? .*")
verifyDebControl("${FOUND_FILE_3}" "bas" "preinst;prerm")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c6ffd2d6dcc1954966638ee0044f4481fb47cb6
commit 5c6ffd2d6dcc1954966638ee0044f4481fb47cb6
Author: Patrick mail6543210 <mail6543...@yahoo.com.tw>
AuthorDate: Sun Jun 19 22:19:56 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Jun 19 22:35:42 2016 +0200
CPack/Deb fix tests for SELinux-enabled systems
diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
index 5f929ff..5b6ae73 100644
--- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
@@ -1,17 +1,18 @@
set(foo_preinst "^echo default_preinst$")
-set(foo_preinst_permissions_regex "-rwxr-xr-x .*")
+# NOTE: optional dot at the end of permissions regex is for SELinux enabled
systems
+set(foo_preinst_permissions_regex "-rwxr-xr-x\.? .*")
set(foo_prerm "^echo default_prerm$")
-set(foo_prerm_permissions_regex "-rwxr-xr-x .*")
+set(foo_prerm_permissions_regex "-rwxr-xr-x\.? .*")
verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm")
set(bar_preinst "^echo bar_preinst$")
-set(bar_prerm_permissions_regex "-rwx-- .*")
+set(bar_prerm_permissions_regex "-rwx--\.? .*")
set(bar_prerm "^echo bar_prerm$")
-set(bar_prerm_permissions_regex "-rwx-- .*")
+set(bar_prerm_permissions_regex "-rwx--\.? .*")
verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm")
set(bas_preinst "^echo default_preinst$")
-set(bas_prerm_permissions_regex "-rwxr-xr-x .*")
+set(bas_prerm_permissions_regex "-rwxr-xr-x\.? .*")
set(bas_prerm "^echo default_prerm$")
-set(bas_prerm_permissions_regex "-rwxr-xr-x .*")
+set(bas_prerm_permissions_regex "-rwxr-xr-x\
[Cmake-commits] CMake branch, next, updated. v3.5.2-1627-g2fdaa20
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 2fdaa209e13e01fff7186d55c1f11901262534b4 (commit) via 285d4d0a88b83e8ea46d315ed6d60c954e26e661 (commit) from e4bfebdd3f8433b47c265020ab042ebe639765fd (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=2fdaa209e13e01fff7186d55c1f11901262534b4 commit 2fdaa209e13e01fff7186d55c1f11901262534b4 Merge: e4bfebd 285d4d0 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 17:26:23 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue May 31 17:26:23 2016 -0400 Merge topic 'cpack-documentation-improvements' into next 285d4d0a fixup! CPackRPM and CPackDeb documentation improvements https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=285d4d0a88b83e8ea46d315ed6d60c954e26e661 commit 285d4d0a88b83e8ea46d315ed6d60c954e26e661 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 23:25:59 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue May 31 23:25:59 2016 +0200 fixup! CPackRPM and CPackDeb documentation improvements diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 300d710..c9678d6 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -31,6 +31,16 @@ # # List of CPackRPM specific variables: # +# .. variable:: CPACK_DEB_PACKAGE_COMPONENT +# +# Enable component packaging for CPackRPM +# +# * Mandatory : NO +# * Default : OFF +# +# If enabled (ON) multiple packages are generated. By default a single package +# containing files of all components is generated. +# # .. variable:: CPACK_DEBIAN_PACKAGE_NAME # CPACK_DEBIAN__PACKAGE_NAME # diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 8c51b45..d231ff0 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -42,6 +42,16 @@ # # List of CPackRPM specific variables: # +# .. variable:: CPACK_RPM_PACKAGE_COMPONENT +# +# Enable component packaging for CPackRPM +# +# * Mandatory : NO +# * Default : OFF +# +# If enabled (ON) multiple packages are generated. By default a single package +# containing files of all components is generated. +# # .. variable:: CPACK_RPM_PACKAGE_SUMMARY # CPACK_RPM__PACKAGE_SUMMARY # @@ -410,6 +420,7 @@ # cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM # # .. variable:: CPACK_RPM_USER_BINARY_SPECFILE +# CPACK_RPM__USER_BINARY_SPECFILE # # A user provided spec file. # @@ -419,8 +430,6 @@ # May be set by the user in order to specify a USER binary spec file # to be used by CPackRPM instead of generating the file. # The specified file will be processed by configure_file( @ONLY). -# One can provide a component specific file by setting -# :variable:`CPACK_RPM__USER_BINARY_SPECFILE`. # # .. variable:: CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE # @@ -449,7 +458,7 @@ # May be used to embed a pre (un)installation script in the spec file. # The referred script file (or both) will be read and directly # put after the ``%pre`` or ``%preun`` section -# If :variable:`CPACK_RPM_COMPONENT_INSTALL` is set to ON the (un)install +# If :variable:`CPACK_RPM_PACKAGE_COMPONENT` is set to ON the (un)install # script for each component can be overridden with # ``CPACK_RPM__PRE_INSTALL_SCRIPT_FILE`` and # ``CPACK_RPM__PRE_UNINSTALL_SCRIPT_FILE``. @@ -468,7 +477,7 @@ # May be used to embed a post (un)installation script in the spec file. # The referred script file (or both) will be read and directly # put after the ``%post`` or ``%postun`` section. -# If :variable:`CPACK_RPM_COMPONENT_INSTALL` is set to ON the (un)install +# If :variable:`CPACK_RPM_PACKAGE_COMPONENT` is set to ON the (un)install # script for each component can be overridden with # ``CPACK_RPM__POST_INSTALL_SCRIPT_FILE`` and # ``CPACK_RPM__POST_UNINSTALL_SCRIPT_FILE``. --- Summary of changes: Modules/CPackDeb.cmake | 10 ++ Modules/CPackRPM.cmake | 17 + 2 files changed, 23 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.2-1625-ge4bfebd
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 e4bfebdd3f8433b47c265020ab042ebe639765fd (commit) via 7f7326ebd77d9471d0f4c496f7214c118bc8260d (commit) from d85aa5879305fb82da613028dbda41ac66f08c93 (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=e4bfebdd3f8433b47c265020ab042ebe639765fd commit e4bfebdd3f8433b47c265020ab042ebe639765fd Merge: d85aa58 7f7326e Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 17:08:01 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue May 31 17:08:01 2016 -0400 Merge topic 'cpack-documentation-improvements' into next 7f7326eb CPackRPM and CPackDeb documentation improvements https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f7326ebd77d9471d0f4c496f7214c118bc8260d commit 7f7326ebd77d9471d0f4c496f7214c118bc8260d Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 22:06:39 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue May 31 23:06:38 2016 +0200 CPackRPM and CPackDeb documentation improvements diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index ebeb387..300d710 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -2,29 +2,34 @@ # CPackDeb # # -# The builtin (binary) CPack Deb generator (Unix only) +# The built in (binary) CPack Deb generator (Unix only) # # Variables specific to CPack Debian (DEB) generator # ^^ # -# CPackDeb may be used to create Deb package using CPack. -# CPackDeb is a CPack generator thus it uses the ``CPACK_XXX`` variables -# used by CPack : https://cmake.org/Wiki/CMake:CPackConfiguration. -# CPackDeb generator should work on any linux host but it will produce -# better deb package when Debian specific tools 'dpkg-xxx' are usable on +# CPackDeb may be used to create Deb package using :module:`CPack`. +# CPackDeb is a :module:`CPack` generator thus it uses the ``CPACK_XXX`` +# variables used by :module:`CPack`. +# +# CPackDeb generator should work on any Linux host but it will produce +# better deb package when Debian specific tools ``dpkg-xxx`` are usable on # the build system. # # CPackDeb has specific features which are controlled by the specifics # :code:`CPACK_DEBIAN_XXX` variables. # # :code:`CPACK_DEBIAN__` variables may be used in order to have -# **component** specific values. Note however that refers to the -# **grouping name** written in upper case. It may be either a component name or -# a component GROUP name. +# **component** specific values. Note however that refers to +# the **grouping name** written in upper case. It may be either a component name +# or a component GROUP name. +# +# Here are some CPackDeb wiki resources that are here for historic reasons and +# are no longer maintained but may still prove useful: +# +# - https://cmake.org/Wiki/CMake:CPackConfiguration +# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 # -# You'll find a detailed usage on the wiki: -# https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 . -# However as a handy reminder here comes the list of specific variables: +# List of CPackRPM specific variables: # # .. variable:: CPACK_DEBIAN_PACKAGE_NAME # CPACK_DEBIAN__PACKAGE_NAME @@ -55,7 +60,7 @@ # # _-_.deb # -# Alternatively provided package file name must end with ".deb" suffix. +# Alternatively provided package file name must end with ``.deb`` suffix. # # .. note:: # @@ -98,7 +103,6 @@ # * Default : Output of :code:`dpkg --print-architecture` (or :code:`i386` #if :code:`dpkg` is not found) # -# # .. variable:: CPACK_DEBIAN_PACKAGE_DEPENDS # CPACK_DEBIAN__PACKAGE_DEPENDS # @@ -141,7 +145,6 @@ # * Mandatory : YES # * Default : :code:`CPACK_PACKAGE_CONTACT` # -# # .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION # CPACK_COMPONENT__DESCRIPTION # @@ -160,19 +163,23 @@ # Set Section control field e.g. admin, devel, doc, ... # # * Mandatory : YES -# * Default : 'devel' +# * Default : "devel" # # See https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections # -# # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE # # The compression used for creating the Debian package. -# Possible values are: lzma, xz, bzip2 and gzip. # # * Mandatory : YES -# * Default : 'gzip' +# * Default : "gzip" +# +# Possible values are:
[Cmake-commits] CMake branch, next, updated. v3.5.2-1623-gd85aa58
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 d85aa5879305fb82da613028dbda41ac66f08c93 (commit) via 6d7243240c0a1ad807207c6bfd3d6392a658f7ef (commit) from d975bf0ecbf8e10f745585f82397f07aa161fdf9 (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=d85aa5879305fb82da613028dbda41ac66f08c93 commit d85aa5879305fb82da613028dbda41ac66f08c93 Merge: d975bf0 6d72432 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 17:06:17 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue May 31 17:06:17 2016 -0400 Merge topic 'cpack-documentation-improvements' into next 6d724324 fixup! CPackRPM and CPackDeb documentation improvements https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d7243240c0a1ad807207c6bfd3d6392a658f7ef commit 6d7243240c0a1ad807207c6bfd3d6392a658f7ef Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 23:05:50 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue May 31 23:05:50 2016 +0200 fixup! CPackRPM and CPackDeb documentation improvements diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 30b65c2..300d710 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -170,6 +170,10 @@ # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE # # The compression used for creating the Debian package. +# +# * Mandatory : YES +# * Default : "gzip" +# # Possible values are: # # - lzma @@ -177,9 +181,6 @@ # - bzip2 # - gzip # -# * Mandatory : YES -# * Default : "gzip" -# # .. variable:: CPACK_DEBIAN_PACKAGE_PRIORITY # CPACK_DEBIAN__PACKAGE_PRIORITY # --- Summary of changes: Modules/CPackDeb.cmake |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.2-1621-gd975bf0
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 d975bf0ecbf8e10f745585f82397f07aa161fdf9 (commit) via e9985b3c34609f1385123768f9bb44ce314d51b8 (commit) from b13304569f05d26976ab92a973e000a3eda1a3f5 (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=d975bf0ecbf8e10f745585f82397f07aa161fdf9 commit d975bf0ecbf8e10f745585f82397f07aa161fdf9 Merge: b133045 e9985b3 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 16:30:32 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue May 31 16:30:32 2016 -0400 Merge topic 'cpack-documentation-improvements' into next e9985b3c fixup! CPackRPM and CPackDeb documentation improvements https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9985b3c34609f1385123768f9bb44ce314d51b8 commit e9985b3c34609f1385123768f9bb44ce314d51b8 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 22:30:16 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue May 31 22:30:16 2016 +0200 fixup! CPackRPM and CPackDeb documentation improvements diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 866e275..30b65c2 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -25,8 +25,9 @@ # # Here are some CPackDeb wiki resources that are here for historic reasons and # are no longer maintained but may still prove useful: -# https://cmake.org/Wiki/CMake:CPackConfiguration -# https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 +# +# - https://cmake.org/Wiki/CMake:CPackConfiguration +# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 # # List of CPackRPM specific variables: # @@ -380,7 +381,7 @@ # * Default : OFF # # Allows to generate shlibs control file automatically. Compatibility is defined by -# CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY variable value. +# :variable:`CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY` variable value. # # .. note:: # @@ -390,6 +391,8 @@ # # .. variable:: CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY # +# Compatibility policy for auto-generated shlibs control file. +# # * Mandatory : NO # * Default : "=" # diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 4e68555..8c51b45 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -36,8 +36,9 @@ # # Here are some CPackRPM wiki resources that are here for historic reasons and # are no longer maintained but may still prove useful: -# https://cmake.org/Wiki/CMake:CPackConfiguration -# https://cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29 +# +# - https://cmake.org/Wiki/CMake:CPackConfiguration +# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29 # # List of CPackRPM specific variables: # @@ -375,6 +376,8 @@ # # .. variable:: CPACK_RPM_SPEC_INSTALL_POST # +# Deprecated - use :variable:`CPACK_RPM_POST_INSTALL_SCRIPT_FILE` instead. +# # * Mandatory : NO # * Default : - # * Deprecated: YES @@ -438,6 +441,8 @@ # .. variable:: CPACK_RPM_PRE_INSTALL_SCRIPT_FILE # CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE # +# Path to file containing pre (un)install script. +# # * Mandatory : NO # * Default : - # @@ -455,6 +460,8 @@ # .. variable:: CPACK_RPM_POST_INSTALL_SCRIPT_FILE # CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE # +# Path to file containing post (un)install script. +# # * Mandatory : NO # * Default : - # @@ -520,6 +527,8 @@ # # .. variable:: CPACK_RPM_RELOCATION_PATHS # +# Packages relocation paths list. +# # * Mandatory : NO # * Default : - # @@ -541,15 +550,19 @@ # # .. variable:: CPACK_RPM__PACKAGE_PREFIX # +# Per component relocation path install prefix. +# # * Mandatory : NO # * Default : CPACK_PACKAGING_INSTALL_PREFIX # -# May be used to set per component CPACK_PACKAGING_INSTALL_PREFIX for -# relocatable RPM packages. +# May be used to set per component :variable:`CPACK_PACKAGING_INSTALL_PREFIX` +# for relocatable RPM packages. # # .. variable:: CPACK_RPM_NO_INSTALL_PREFIX_RELOCATION # CPACK_RPM_NO__INSTALL_PREFIX_RELOCATION # +# Removal of default install prefix from relocation paths list. +# # * Mandatory : NO # * Default : CPACK_PACKAGING_INSTALL_PREFIX or CPACK_RPM__PACKAGE_PREFIX #are treated as one of relocation paths --- Summary of changes: Modules/CPackDeb.cmake |9 ++--- Modules/CPackRPM
[Cmake-commits] CMake branch, next, updated. v3.5.2-1619-gb133045
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 b13304569f05d26976ab92a973e000a3eda1a3f5 (commit) via 35998cba3771984b9923cb20a71a1abc1928bbcf (commit) from db87c9ddc46e8da39e282d5f1670584368aafb7e (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=b13304569f05d26976ab92a973e000a3eda1a3f5 commit b13304569f05d26976ab92a973e000a3eda1a3f5 Merge: db87c9d 35998cb Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 16:07:23 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue May 31 16:07:23 2016 -0400 Merge topic 'cpack-documentation-improvements' into next 35998cba CPackRPM and CPackDeb documentation improvements https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35998cba3771984b9923cb20a71a1abc1928bbcf commit 35998cba3771984b9923cb20a71a1abc1928bbcf Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 22:06:39 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue May 31 22:06:39 2016 +0200 CPackRPM and CPackDeb documentation improvements diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index ebeb387..866e275 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -2,29 +2,33 @@ # CPackDeb # # -# The builtin (binary) CPack Deb generator (Unix only) +# The built in (binary) CPack Deb generator (Unix only) # # Variables specific to CPack Debian (DEB) generator # ^^ # -# CPackDeb may be used to create Deb package using CPack. -# CPackDeb is a CPack generator thus it uses the ``CPACK_XXX`` variables -# used by CPack : https://cmake.org/Wiki/CMake:CPackConfiguration. -# CPackDeb generator should work on any linux host but it will produce -# better deb package when Debian specific tools 'dpkg-xxx' are usable on +# CPackDeb may be used to create Deb package using :module:`CPack`. +# CPackDeb is a :module:`CPack` generator thus it uses the ``CPACK_XXX`` +# variables used by :module:`CPack`. +# +# CPackDeb generator should work on any Linux host but it will produce +# better deb package when Debian specific tools ``dpkg-xxx`` are usable on # the build system. # # CPackDeb has specific features which are controlled by the specifics # :code:`CPACK_DEBIAN_XXX` variables. # # :code:`CPACK_DEBIAN__` variables may be used in order to have -# **component** specific values. Note however that refers to the -# **grouping name** written in upper case. It may be either a component name or -# a component GROUP name. +# **component** specific values. Note however that refers to +# the **grouping name** written in upper case. It may be either a component name +# or a component GROUP name. +# +# Here are some CPackDeb wiki resources that are here for historic reasons and +# are no longer maintained but may still prove useful: +# https://cmake.org/Wiki/CMake:CPackConfiguration +# https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 # -# You'll find a detailed usage on the wiki: -# https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 . -# However as a handy reminder here comes the list of specific variables: +# List of CPackRPM specific variables: # # .. variable:: CPACK_DEBIAN_PACKAGE_NAME # CPACK_DEBIAN__PACKAGE_NAME @@ -55,7 +59,7 @@ # # _-_.deb # -# Alternatively provided package file name must end with ".deb" suffix. +# Alternatively provided package file name must end with ``.deb`` suffix. # # .. note:: # @@ -98,7 +102,6 @@ # * Default : Output of :code:`dpkg --print-architecture` (or :code:`i386` #if :code:`dpkg` is not found) # -# # .. variable:: CPACK_DEBIAN_PACKAGE_DEPENDS # CPACK_DEBIAN__PACKAGE_DEPENDS # @@ -141,7 +144,6 @@ # * Mandatory : YES # * Default : :code:`CPACK_PACKAGE_CONTACT` # -# # .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION # CPACK_COMPONENT__DESCRIPTION # @@ -160,19 +162,22 @@ # Set Section control field e.g. admin, devel, doc, ... # # * Mandatory : YES -# * Default : 'devel' +# * Default : "devel" # # See https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections # -# # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE # # The compression used for creating the Debian package. -# Possible values are: lzma, xz, bzip2 and gzip. +# Possible values are: # -# * Mandatory : YES -# * Default : 'gzip' +# - lzma +# - xz +# - bzip2 +# - gzip # +# * Mand
[Cmake-commits] CMake branch, next, updated. v3.5.2-1527-g75f46e9
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 75f46e9143a5022405dffb5c1abd10355b4fee09 (commit)
via 4f3b97063f724f5e0a2902e8d2c104012b52b7f5 (commit)
from 3565b58ea8f6f54c9c8d3f6187361def72944672 (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=75f46e9143a5022405dffb5c1abd10355b4fee09
commit 75f46e9143a5022405dffb5c1abd10355b4fee09
Merge: 3565b58 4f3b970
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon May 23 14:24:15 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon May 23 14:24:15 2016 -0400
Merge topic 'cpack-deb-component-depends' into next
4f3b9706 CPack/Deb prevent accidental component dependencies
diff --cc Help/release/dev/cpack-deb-imporvements.rst
index d3cb52c,9e45aa5..63312b5
--- a/Help/release/dev/cpack-deb-imporvements.rst
+++ b/Help/release/dev/cpack-deb-imporvements.rst
@@@ -11,10 -11,14 +11,11 @@@ cpack-deb-imporvement
* The :module:`CPackDeb` module learned how to generate dependencies between
Debian packages if multi-component setup is used and
:variable:`CPACK_COMPONENT__DEPENDS` variables are set.
- This breaks compatibility with previous versions.
+ For backward compatibility this feature is disabled by default. See
+ :variable:`CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS`.
-* The :module:`CPackDeb` module learned how to set the package release number
- (``DebianRevisionNumber`` in package file name). See
- :variable:`CPACK_DEBIAN_PACKAGE_RELEASE`.
-
-* The :module:`CPackDeb` module now generates properly-named Debian packages::
+* The :module:`CPackDeb` module learned how to set custom package file names
+ including how to generate properly-named Debian packages::
_-_.deb
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f3b97063f724f5e0a2902e8d2c104012b52b7f5
commit 4f3b97063f724f5e0a2902e8d2c104012b52b7f5
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon May 23 20:21:32 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon May 23 20:21:32 2016 +0200
CPack/Deb prevent accidental component dependencies
Prevent accidental inter component dependency setting
since this is a breaking feature in situations where
another CPack module is already using the feature.
It should be enabled if desired since it can cause
issues when upgrading only one of the components
for e.g. configuration instead of all the components
at once.
diff --git a/Help/release/dev/cpack-deb-imporvements.rst
b/Help/release/dev/cpack-deb-imporvements.rst
index 4fd35b8..9e45aa5 100644
--- a/Help/release/dev/cpack-deb-imporvements.rst
+++ b/Help/release/dev/cpack-deb-imporvements.rst
@@ -11,7 +11,8 @@ cpack-deb-imporvements
* The :module:`CPackDeb` module learned how to generate dependencies between
Debian packages if multi-component setup is used and
:variable:`CPACK_COMPONENT__DEPENDS` variables are set.
- This breaks compatibility with previous versions.
+ For backward compatibility this feature is disabled by default. See
+ :variable:`CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS`.
* The :module:`CPackDeb` module learned how to set the package release number
(``DebianRevisionNumber`` in package file name). See
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index d93d924..70bf81d 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -100,6 +100,13 @@
#
#set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.1-6), libc6 (< 2.4)")
#
+# .. variable:: CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS
+#
+# Sets inter component dependencies if listed with
+# :variable:`CPACK_COMPONENT__DEPENDS` variables.
+#
+# * Mandatory : NO
+# * Default : -
#
# .. variable:: CPACK_DEBIAN_PACKAGE_MAINTAINER
#
@@ -713,20 +720,23 @@ function(cpack_deb_prepare_package_vars)
endif()
endif()
endforeach()
-set(COMPONENT_DEPENDS "")
-foreach (_PACK ${CPACK_COMPONENT_${_local_component_name}_DEPENDS})
- get_component_package_name(_PACK_NAME "${_PACK}")
+
+if(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS)
+ set(COMPONENT_DEPENDS "")
+ foreach (_PACK ${CPACK_COMPONENT_${_local_component_name}_DEPENDS})
+get_component_package_name(_PACK_NAME "${_PACK}")
+if(COMPONENT_DEPENDS)
+ set(COMPONENT_DEPENDS "${_PACK_NAME} (=
${CPACK_DEBIAN_PACKAGE_VERSION}), ${COMPONENT_DEPENDS}")
+else()
+ set(COMPONENT_DEPENDS "${_PACK_NAME} (=
${CPACK_
[Cmake-commits] CMake branch, next, updated. v3.5.2-1525-g3565b58
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 3565b58ea8f6f54c9c8d3f6187361def72944672 (commit)
via adbd3985f89f19d9de867a75321465d6e181908d (commit)
from cd153d4e1865c3e1d5ac30277d6a0c15447a7bf8 (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=3565b58ea8f6f54c9c8d3f6187361def72944672
commit 3565b58ea8f6f54c9c8d3f6187361def72944672
Merge: cd153d4 adbd398
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon May 23 13:57:36 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon May 23 13:57:36 2016 -0400
Merge topic 'cpack-deb-different-package-names' into next
adbd3985 CPack/Deb possibility to change package name
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adbd3985f89f19d9de867a75321465d6e181908d
commit adbd3985f89f19d9de867a75321465d6e181908d
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon May 23 19:51:33 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon May 23 19:55:46 2016 +0200
CPack/Deb possibility to change package name
This patch preserves backward compatibility of
deb package names with previous CMake versions
but similarly to CPack/RPM allows to change
package name format and supports DEB-DEFAULT
setting that produces proper Debian package names.
diff --git a/Help/release/dev/cpack-deb-imporvements.rst
b/Help/release/dev/cpack-deb-imporvements.rst
index 4fd35b8..d3cb52c 100644
--- a/Help/release/dev/cpack-deb-imporvements.rst
+++ b/Help/release/dev/cpack-deb-imporvements.rst
@@ -13,15 +13,19 @@ cpack-deb-imporvements
:variable:`CPACK_COMPONENT__DEPENDS` variables are set.
This breaks compatibility with previous versions.
-* The :module:`CPackDeb` module learned how to set the package release number
- (``DebianRevisionNumber`` in package file name). See
- :variable:`CPACK_DEBIAN_PACKAGE_RELEASE`.
-
-* The :module:`CPackDeb` module now generates properly-named Debian packages::
+* The :module:`CPackDeb` module learned how to set custom package file names
+ including how to generate properly-named Debian packages::
_-_.deb
- This breaks compatibility with previous versions.
+ For backward compatibility this feature is disabled by default. See
+ :variable:`CPACK_DEBIAN_FILE_NAME` and
+ :variable:`CPACK_DEBIAN__FILE_NAME`.
+
+* The :module:`CPackDeb` module learned how to set the package release number
+ (``DebianRevisionNumber`` in package file name when used in combination with
+ ``DEB-DEFAULT`` value set by :variable:`CPACK_DEBIAN_FILE_NAME`). See
+ :variable:`CPACK_DEBIAN_PACKAGE_RELEASE`.
* The :module:`CPackDeb` module learned how to set the package architecture
per-component. See
:variable:`CPACK_DEBIAN__PACKAGE_ARCHITECTURE`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index d93d924..f7cd7aa 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -42,6 +42,32 @@
#
# See
https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Source
#
+# .. variable:: CPACK_DEBIAN_FILE_NAME
+# CPACK_DEBIAN__FILE_NAME
+#
+# Package file name.
+#
+# * Mandatory : YES
+# * Default : ``[-].deb``
+#
+# This may be set to ``DEB-DEFAULT`` to allow CPackDeb to generate package
file
+# name by itself in deb format::
+#
+#
_-_.deb
+#
+# Alternatively provided package file name must end with ".deb" suffix.
+#
+# .. note::
+#
+#Preferred setting of this variable is ``DEB-DEFAULT`` but for backward
+#compatibility with CPackDeb in CMake prior to version 3.6 this feature
+#is disabled by default.
+#
+# .. note::
+#
+#By using non default filenames duplicate names may occur. Duplicate files
+#get overwritten and it is up to the packager to set the variables in a
+#manner that will prevent such errors.
#
# .. variable:: CPACK_DEBIAN_PACKAGE_VERSION
#
@@ -466,6 +492,17 @@ if(NOT UNIX)
message(FATAL_ERROR "CPackDeb.cmake may only be used under UNIX.")
endif()
+function(cpack_deb_variable_fallback OUTPUT_VAR_NAME)
+ set(FALLBACK_VAR_NAMES ${ARGN})
+
+ foreach(variable_name IN LISTS FALLBACK_VAR_NAMES)
+if(${variable_name})
+ set(${OUTPUT_VAR_NAME} "${${variable_name}}" PARENT_SCOPE)
+ break()
+endif()
+ endforeach()
+endfunction()
+
function(get_component_package_name var component)
string(TOUPPER "${component}" component_upcase)
if(CPACK_DEBIAN_${component_upcase}_PACKAGE_NAME)
@@ -878,13 +915,32 @@ function(cpack_deb_prepare_pack
[Cmake-commits] CMake branch, next, updated. v3.5.2-1409-gbf71c37
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 bf71c37095f7aafb7942386196fdb470a79f13fb (commit)
via 44ee2d717a0f0552d4d1d5978c473d60625a0b3c (commit)
from d758f127cf059e974f9e88c9e0e70a1db352bef3 (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=bf71c37095f7aafb7942386196fdb470a79f13fb
commit bf71c37095f7aafb7942386196fdb470a79f13fb
Merge: d758f12 44ee2d7
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat May 14 21:03:04 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat May 14 21:03:04 2016 -0400
Merge topic 'cpack-rpm-different-package-names' into next
44ee2d71 CPack/RPM different package names
diff --cc Tests/RunCMake/CPack/RunCMakeTest.cmake
index f143150,d34e751..759295f
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@@ -10,8 -10,6 +10,9 @@@ run_cpack_test(DEB_EXTRA "DEB" false
run_cpack_test(DEPENDENCIES "RPM;DEB" true)
run_cpack_test(EMPTY_DIR "RPM;DEB;TGZ" true)
run_cpack_test(COMPONENTS_EMPTY_DIR "RPM;DEB;TGZ" true)
+ run_cpack_test(RPM_CUSTOM_NAMES "RPM" true)
run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false)
+run_cpack_test(RPM_DIST "RPM" false)
run_cpack_test(INSTALL_SCRIPTS "RPM" false)
+run_cpack_test(DEB_GENERATE_SHLIBS "DEB" true)
+run_cpack_test(DEB_GENERATE_SHLIBS_LDCONFIG "DEB" true)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44ee2d717a0f0552d4d1d5978c473d60625a0b3c
commit 44ee2d717a0f0552d4d1d5978c473d60625a0b3c
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun May 15 03:01:34 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun May 15 03:01:34 2016 +0200
CPack/RPM different package names
Packagers may now set their own rpm package
file names or request that rpmbuild tool
chooses one for them. It also supports handing
of situations where one spec file may produce
multiple rpm packages.
diff --git a/Help/release/dev/cpack-rpm-different-package-names.rst
b/Help/release/dev/cpack-rpm-different-package-names.rst
new file mode 100644
index 000..48679e1
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-different-package-names.rst
@@ -0,0 +1,9 @@
+cpack-rpm-different-package-names
+-
+
+* The :module:`CPackRPM` module learned how to set user defined package file
+ names, how to specify that rpmbuild should decide on file name format as
+ well as handling of multiple rpm packages generated by a single user defined
+ spec file.
+ See :variable:`CPACK_RPM_PACKAGE_NAME` and
+ :variable:`CPACK_RPM__PACKAGE_NAME`.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 768d64f..dca5f00 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -54,6 +54,30 @@
# * Mandatory : YES
# * Default : CPACK_PACKAGE_NAME
#
+# .. variable:: CPACK_RPM_FILE_NAME
+# CPACK_RPM__FILE_NAME
+#
+# Package file name.
+#
+# * Mandatory : YES
+# * Default : ``[-].rpm`` with spaces
+#replaced by '-'
+#
+# This may be set to ``RPM-DEFAULT`` to allow rpmbuild tool to generate
package
+# file name by itself.
+# Alternatively provided package file name must end with ".rpm" suffix.
+#
+# .. note::
+#
+#By using user provided spec file, rpm macro extensions such as for
+#generating debuginfo packages or by simply using multiple components more
+#than one rpm file may be generated, either from a single spec file or from
+#multiple spec files (each component execution produces it's own spec
file).
+#In such cases duplicate file names may occur as a result of this variable
+#setting or spec file content structure. Duplicate files get overwritten
+#and it is up to the packager to set the variables in a manner that will
+#prevent such errors.
+#
# .. variable:: CPACK_RPM_PACKAGE_VERSION
#
# The RPM package version.
@@ -1534,8 +1558,6 @@ function(cpack_rpm_generate_package)
file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SPECS)
file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SRPMS)
- #set(CPACK_RPM_FILE_NAME
"${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
- set(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}")
# it seems rpmbuild can't handle spaces in the path
# neither escaping (as below) nor putting quotes around the p
[Cmake-commits] CMake branch, next, updated. v3.5.2-1407-gd758f12
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 d758f127cf059e974f9e88c9e0e70a1db352bef3 (commit)
via f5089cfccd96f2c94838faa1736fa452ae4bb853 (commit)
via f7003a60557e828f08ee893c5da78b24423b5223 (commit)
from 35e272d8abbedcaa2ea60db978fcb4b458d14777 (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=d758f127cf059e974f9e88c9e0e70a1db352bef3
commit d758f127cf059e974f9e88c9e0e70a1db352bef3
Merge: 35e272d f5089cf
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sat May 14 14:22:35 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat May 14 14:22:35 2016 -0400
Merge topic 'cpack-rpm-adding-dist-to-release-tag' into next
f5089cfc CPack/RPM adding dist to release tag test
f7003a60 CPack/RPM release dist tag support
diff --cc Tests/RunCMake/CPack/RunCMakeTest.cmake
index 2e358f0,7f756c4..f143150
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@@ -11,6 -11,5 +11,7 @@@ run_cpack_test(DEPENDENCIES "RPM;DEB" t
run_cpack_test(EMPTY_DIR "RPM;DEB;TGZ" true)
run_cpack_test(COMPONENTS_EMPTY_DIR "RPM;DEB;TGZ" true)
run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false)
+ run_cpack_test(RPM_DIST "RPM" false)
run_cpack_test(INSTALL_SCRIPTS "RPM" false)
+run_cpack_test(DEB_GENERATE_SHLIBS "DEB" true)
+run_cpack_test(DEB_GENERATE_SHLIBS_LDCONFIG "DEB" true)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5089cfccd96f2c94838faa1736fa452ae4bb853
commit f5089cfccd96f2c94838faa1736fa452ae4bb853
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed May 11 21:14:26 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sat May 14 20:21:32 2016 +0200
CPack/RPM adding dist to release tag test
Tests and release notes
diff --git a/Help/release/dev/cpack-rpm-adding-dist-to-release-tag.rst
b/Help/release/dev/cpack-rpm-adding-dist-to-release-tag.rst
new file mode 100644
index 000..42599a9
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-adding-dist-to-release-tag.rst
@@ -0,0 +1,7 @@
+cpack-rpm-adding-dist-to-release-tag
+
+
+* The :module:`CPackRPM` module learned how to set RPM ``dist`` tag as part of
+ RPM ``Release:`` tag when enabled (mandatory on some Linux distributions for
+ e.g. on Fedora).
+ See :variable:`CPACK_RPM_PACKAGE_RELEASE_DIST`.
diff --git a/Tests/RunCMake/CPack/RPM/RPM_DIST-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/RPM/RPM_DIST-ExpectedFiles.cmake
new file mode 100644
index 000..3b5a347
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/RPM_DIST-ExpectedFiles.cmake
@@ -0,0 +1,5 @@
+set(whitespaces_ "[\t\n\r ]*")
+
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_1 "rpm_dist*.rpm")
+set(EXPECTED_FILE_CONTENT_1 "^/usr/foo${whitespaces_}/usr/foo/CMakeLists.txt$")
diff --git a/Tests/RunCMake/CPack/RPM/RPM_DIST-VerifyResult.cmake
b/Tests/RunCMake/CPack/RPM/RPM_DIST-VerifyResult.cmake
new file mode 100644
index 000..7375ecc
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/RPM_DIST-VerifyResult.cmake
@@ -0,0 +1,11 @@
+execute_process(COMMAND ${RPMBUILD_EXECUTABLE} -E %{?dist}
+OUTPUT_VARIABLE DIST_TAG
+ERROR_QUIET
+OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(whitespaces_ "[\t\n\r ]*")
+
+getPackageInfo("${FOUND_FILE_1}" "FILE_INFO_")
+if(NOT FILE_INFO_ MATCHES
".*Release${whitespaces_}:${whitespaces_}1${DIST_TAG}")
+ message(FATAL_ERROR "Unexpected Release in '${FOUND_FILE_1}'; file info:
'${FILE_INFO_}'")
+endif()
diff --git a/Tests/RunCMake/CPack/RPM_DIST.cmake
b/Tests/RunCMake/CPack/RPM_DIST.cmake
new file mode 100644
index 000..eb2a123
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM_DIST.cmake
@@ -0,0 +1,4 @@
+install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
+set(CPACK_PACKAGE_NAME "rpm_dist")
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index ee4112d..7f756c4 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -11,4 +11,5 @@ run_cpack_test(DEPENDENCIES "RPM;DEB" true)
run_cpack_test(EMPTY_DIR "RPM;DEB;TGZ" true)
run_cpack_test(COMPONENTS_EMPTY_DIR "RPM;DEB;TGZ" true)
run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false)
+run_cpack_test(RPM
[Cmake-commits] CMake branch, next, updated. v3.5.2-1373-g71fa3a0
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 71fa3a0c2418e3caed26aed3a31bde206c6d7132 (commit)
via a54292903ef9814390fcd4f938a890644d80d231 (commit)
via 1c06f207b1bfac76e7976754971fd94533214461 (commit)
from d33d03fc10466eac6bbbd11fc293604545977ebb (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=71fa3a0c2418e3caed26aed3a31bde206c6d7132
commit 71fa3a0c2418e3caed26aed3a31bde206c6d7132
Merge: d33d03f a542929
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri May 13 10:00:00 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri May 13 10:00:00 2016 -0400
Merge topic 'cpack-deb-improvements' into next
a5429290 fixup! CPack/Deb proper package file naming
1c06f207 fixup! CPack/Deb generation of DEBIAN/shlibs control file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a54292903ef9814390fcd4f938a890644d80d231
commit a54292903ef9814390fcd4f938a890644d80d231
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri May 13 15:52:20 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri May 13 15:52:20 2016 +0200
fixup! CPack/Deb proper package file naming
Don't set an unneeded variable that can cause
problems with package generation (found with
CPack/RPM symlink test while porting).
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 24e06fe..aec06b7 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -205,11 +205,15 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
/* replace the TEMPORARY package file name */
this->SetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME",
packageFileName.c_str());
- // Tell CPackDeb.cmake the path where the component is.
- std::string component_path = "/";
- component_path += compInstDirName;
- this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH",
- component_path.c_str());
+
+ if(!compInstDirName.empty())
+{
+// Tell CPackDeb.cmake the path where the component is.
+std::string component_path = "/";
+component_path += compInstDirName;
+this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH",
+component_path.c_str());
+}
if (!this->ReadListFile("CPackDeb.cmake"))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c06f207b1bfac76e7976754971fd94533214461
commit 1c06f207b1bfac76e7976754971fd94533214461
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri May 13 15:35:57 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri May 13 15:35:57 2016 +0200
fixup! CPack/Deb generation of DEBIAN/shlibs control file
Loosen up the regex to correctly parse data from strings with Asian
characters
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 0711238..d93d924 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -487,7 +487,7 @@ function(extract_so_info shared_object libname version)
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(result EQUAL 0)
- string(REGEX MATCH "\\(SONAME\\) [^\n]*:
\\[([^\n]+)\\.so\\.([^\n]*)\\]\n" soname "${output}")
+ string(REGEX MATCH "\\(SONAME\\)[^\n]*\\[([^\n]+)\\.so\\.([^\n]*)\\]"
soname "${output}")
set(${libname} "${CMAKE_MATCH_1}" PARENT_SCOPE)
set(${version} "${CMAKE_MATCH_2}" PARENT_SCOPE)
else()
---
Summary of changes:
Modules/CPackDeb.cmake |2 +-
Source/CPack/cmCPackDebGenerator.cxx | 14 +-
2 files changed, 10 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.2-1341-g232917e
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 232917e9e311ef44e472aa8b72bb4468f170e9e7 (commit)
via be6e9b384caf5c56887a8eb538fa4af7a9f74c02 (commit)
via 74c32123440a8de96b25d038ec7ac447a78ee769 (commit)
from 0823297845024f9fd0a47a3e8b7b5abbdd647100 (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=232917e9e311ef44e472aa8b72bb4468f170e9e7
commit 232917e9e311ef44e472aa8b72bb4468f170e9e7
Merge: 0823297 be6e9b3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed May 11 18:35:19 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed May 11 18:35:19 2016 -0400
Merge topic 'cpack-deb-improvements' into next
be6e9b38 fixup! CPack/Deb test changes due to breaking changes
74c32123 fixup! CPack/Deb generation of DEBIAN/shlibs control file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be6e9b384caf5c56887a8eb538fa4af7a9f74c02
commit be6e9b384caf5c56887a8eb538fa4af7a9f74c02
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed May 11 22:47:43 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu May 12 00:24:37 2016 +0200
fixup! CPack/Deb test changes due to breaking changes
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index aef1086..7bf42f9 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -9,6 +9,20 @@ function(run_cpack_test TEST_NAME types build)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+if(EXISTS
"${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake")
+
include("${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake")
+
+ set(FOUND_PREREQUIREMENTS false)
+ get_test_prerequirements("FOUND_PREREQUIREMENTS"
+ "${TEST_CONFIG_DIR}/${type}_config.cmake")
+
+ # skip the test if prerequirements are not met
+ if(NOT FOUND_PREREQUIREMENTS)
+message(STATUS "${TEST_NAME} - SKIPPED")
+return()
+ endif()
+endif()
+
# execute cmake
set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
run_cmake(${TEST_NAME})
diff --git a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-Prerequirements.cmake
b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-Prerequirements.cmake
new file mode 100644
index 000..b98065a
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-Prerequirements.cmake
@@ -0,0 +1,7 @@
+function(get_test_prerequirements found_var)
+ find_program(READELF_EXECUTABLE NAMES readelf)
+
+ if(READELF_EXECUTABLE)
+set(${found_var} true PARENT_SCOPE)
+ endif()
+endfunction()
diff --git a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-specifics.cmake
b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-specifics.cmake
deleted file mode 100644
index b87b6ba..000
--- a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-specifics.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEB_COMPONENT_INSTALL "ON")
-
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS "ON")
-set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS "ON")
diff --git
a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-Prerequirements.cmake
b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-Prerequirements.cmake
new file mode 100644
index 000..b98065a
--- /dev/null
+++
b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-Prerequirements.cmake
@@ -0,0 +1,7 @@
+function(get_test_prerequirements found_var)
+ find_program(READELF_EXECUTABLE NAMES readelf)
+
+ if(READELF_EXECUTABLE)
+set(${found_var} true PARENT_SCOPE)
+ endif()
+endfunction()
diff --git
a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-specifics.cmake
b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-specifics.cmake
deleted file mode 100644
index 8b1cc37..000
--- a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-specifics.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEB_COMPONENT_INSTALL "ON")
-
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS "ON")
-set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS "ON")
-set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=")
diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake
b/Tests/RunCMake/CPack/DEB/Helpers.cmake
index f490130..82dbd15 100644
--- a
[Cmake-commits] CMake branch, next, updated. v3.5.2-1319-ga71b39e
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 a71b39e545bdc32fbc9779aa257b331ee36ea1b0 (commit)
via be6a0b5f29ea47a9750d062f4a7197b266f7727a (commit)
via 16ddd0c28c2e855d813032a36c82326ea73c8c96 (commit)
via cba0f70d95de1d637a2e30a05601e4659ff208b0 (commit)
via a6362d8026264e33f2dbc93e2a859e497b8e14f1 (commit)
via f732f307cadb44b458f48cdc5f9e85092726ae1c (commit)
via 2c123998a9d50c0af09c357473f23e97f3c5a0b5 (commit)
via 1f0ae548aa786e0519b0b64f89f948715598beed (commit)
via 3a6d946ee6bf4d6aa8897e81e20ba3676aafd59c (commit)
via fbb72f3befe09b0aa03f0c87cb0eb8de4ba8eca8 (commit)
via 5fdd7d21f432e7a43a0cfa1a26da2d92217c7a60 (commit)
from f39d60ee1b0c19745a58f2861f63a390a1909036 (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=a71b39e545bdc32fbc9779aa257b331ee36ea1b0
commit a71b39e545bdc32fbc9779aa257b331ee36ea1b0
Merge: f39d60e be6a0b5
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue May 10 14:27:35 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 10 14:27:35 2016 -0400
Merge topic 'cpack-deb-improvements' into next
be6a0b5f CPack/Deb cpack-deb-improvements release notes
16ddd0c2 CPack/Deb test changes due to breaking changes
cba0f70d CPack/Deb package release number in file name
a6362d80 CPack/Deb proper package file naming
f732f307 CPack/Deb per-component package architecture
2c123998 CPack/Deb inter package dependencies
1f0ae548 CPack/Deb proper component packages file naming
3a6d946e CPack/Deb generation of postinst and postrm ldconfig files
fbb72f3b CPack/Deb generation of DEBIAN/shlibs control file
5fdd7d21 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be6a0b5f29ea47a9750d062f4a7197b266f7727a
commit be6a0b5f29ea47a9750d062f4a7197b266f7727a
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue May 10 20:20:38 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue May 10 20:20:38 2016 +0200
CPack/Deb cpack-deb-improvements release notes
diff --git a/Help/release/dev/cpack-deb-imporvements.rst
b/Help/release/dev/cpack-deb-imporvements.rst
new file mode 100644
index 000..dc07474
--- /dev/null
+++ b/Help/release/dev/cpack-deb-imporvements.rst
@@ -0,0 +1,23 @@
+cpack-deb-imporvements
+--
+
+* The "CPackDeb" module learned how to generate DEBIAN/shlibs contorl file
+ when package contains shared libraries.
+
+* The "CPackDeb" module learned how to generate DEBIAN/postinst and
+ DEBIAN/postrm files if package installs libraries in ldconfig controlled
+ location (/lib/, /usr/lib/).
+
+* The "CPackDeb" module learned how to generate dependencies between Debian
+ packages if multi-component setup is used and
:variable:`CPACK_COMPONENT__DEPENDS`
+ variables are set (breaks compatibility with previous versions).
+
+* The "CPackDeb" module learned how to set package release number
+ (DebianRevisionNumber in package file name). See
:variable:`CPACK_DEBIAN_PACKAGE_RELEASE`.
+
+* The "CPackDeb" module learned how to generate proper debian package names
+ with format
``_-_.deb``
+ (breaks compatibility with previous versions).
+
+* The "CPackDeb" module learned how to set package architecture per-component.
+ See :variable:`CPACK_DEBIAN__PACKAGE_ARCHITECTURE`.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16ddd0c28c2e855d813032a36c82326ea73c8c96
commit 16ddd0c28c2e855d813032a36c82326ea73c8c96
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue May 10 15:40:48 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue May 10 20:18:03 2016 +0200
CPack/Deb test changes due to breaking changes
New CPack/Deb tests and changes to old tests
as package file names and inter component dependency
detection was changed.
diff --git
a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-depend1.cmake
b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-depend1.cmake
index 26ab19e..70d6edf 100644
--- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-depend1.cmake
+++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-depend1.cmake
@@ -6,7 +6,7 @@
include(${CPackComponentsDEB_SOURCE_DIR}/RunCPackVerifyResult.cmake)
# expected results
-set(expected_file_mask "${CPackComponentsDEB_BINARY_DIR}/MyLib-*.deb")
+set(exp
[Cmake-commits] CMake branch, next, updated. v3.5.1-728-g35bc416
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 35bc416eff0a51f23c6cea368fb2f70d49969b64 (commit)
via 5e5d0abdf2c4b09a5674bd37a8608dbf27707a47 (commit)
from 782205d95d50934d6b493201996459614f2193be (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=35bc416eff0a51f23c6cea368fb2f70d49969b64
commit 35bc416eff0a51f23c6cea368fb2f70d49969b64
Merge: 782205d 5e5d0ab
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Mar 31 11:25:53 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 31 11:25:53 2016 -0400
Merge topic 'cpack-rpm-external-symlink-handling' into next
5e5d0abd CPack/RPM external symlink handling
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e5d0abdf2c4b09a5674bd37a8608dbf27707a47
commit 5e5d0abdf2c4b09a5674bd37a8608dbf27707a47
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Mar 31 07:48:38 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Mar 31 17:23:13 2016 +0200
CPack/RPM external symlink handling
Symbolic links that point to external
location no longer cause cmake to fail
with string out of bounds error but
are instead packaged as non relocatable
symlinks and print out a warning message.
diff --git a/Help/release/dev/cpack-rpm-external-symlink-handling.rst
b/Help/release/dev/cpack-rpm-external-symlink-handling.rst
new file mode 100644
index 000..d9a3d8c
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-external-symlink-handling.rst
@@ -0,0 +1,5 @@
+cpack-rpm-external-symlink-handling
+
+
+* The "CPackRPM" module learned how to correctly handle symlinks
+ that are pointing outside generated packages.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index ae51dc1..713b938 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -599,9 +599,10 @@
# while determining if symlink should be either created or present in a
# post install script - depending on relocation paths.
#
-# Currenty there are a few limitations though:
+# Symbolic links that point to locations outside packaging path produce a
+# warning and are treated as non relocatable permanent symbolic links.
#
-# * Only symbolic links with relative path can be packaged.
+# Currenty there are a few limitations though:
#
# * For component based packaging component interdependency is not checked
# when processing symbolic links. Symbolic links pointing to content of
@@ -1068,13 +1069,28 @@ function(cpack_rpm_prepare_install_files
INSTALL_FILES_LIST WDIR PACKAGE_PREFIXE
get_filename_component(SYMLINK_POINT_
"${SYMLINK_LOCATION_}/${SYMLINK_POINT_}" ABSOLUTE)
endif()
-string(SUBSTRING "${SYMLINK_POINT_}" ${WDR_LEN_} -1 SYMLINK_POINT_WD_)
+# recalculate path length after conversion to canonical form
+string(LENGTH "${SYMLINK_POINT_}" SYMLINK_POINT_LENGTH_)
-cpack_rpm_symlink_get_relocation_prefixes("${F}" "${PACKAGE_PREFIXES}"
"SYMLINK_RELOCATIONS")
-cpack_rpm_symlink_get_relocation_prefixes("${SYMLINK_POINT_WD_}"
"${PACKAGE_PREFIXES}" "POINT_RELOCATIONS")
+if(SYMLINK_POINT_ MATCHES "${WDIR}/.*")
+ # only symlinks that are pointing inside the packaging structure
should be checked for relocation
+ string(SUBSTRING "${SYMLINK_POINT_}" ${WDR_LEN_} -1
SYMLINK_POINT_WD_)
+ cpack_rpm_symlink_get_relocation_prefixes("${F}"
"${PACKAGE_PREFIXES}" "SYMLINK_RELOCATIONS")
+ cpack_rpm_symlink_get_relocation_prefixes("${SYMLINK_POINT_WD_}"
"${PACKAGE_PREFIXES}" "POINT_RELOCATIONS")
-list(LENGTH SYMLINK_RELOCATIONS SYMLINK_RELOCATIONS_COUNT)
-list(LENGTH POINT_RELOCATIONS POINT_RELOCATIONS_COUNT)
+ list(LENGTH SYMLINK_RELOCATIONS SYMLINK_RELOCATIONS_COUNT)
+ list(LENGTH POINT_RELOCATIONS POINT_RELOCATIONS_COUNT)
+else()
+ # location pointed to is ouside WDR so it should be treated as a
permanent symlink
+ set(SYMLINK_POINT_WD_ "${SYMLINK_POINT_}")
+
+ unset(SYMLINK_RELOCATIONS)
+ unset(POINT_RELOCATIONS)
+ unset(SYMLINK_RELOCATIONS_COUNT)
+ unset(POINT_RELOCATIONS_COUNT)
+
+ message(AUTHOR_WARNING "CPackRPM:Warning: Symbolic link '${F}'
points to location that is outside packag
[Cmake-commits] CMake branch, next, updated. v3.5.1-726-g782205d
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 782205d95d50934d6b493201996459614f2193be (commit)
via d0b28e32628df9191289608f114244042c63a0df (commit)
from 079f8c06e92872f0e59c97733408319504e95326 (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=782205d95d50934d6b493201996459614f2193be
commit 782205d95d50934d6b493201996459614f2193be
Merge: 079f8c0 d0b28e3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Mar 31 11:22:06 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 31 11:22:06 2016 -0400
Merge topic 'cpack-rpm-external-symlink-handling' into next
d0b28e32 fixup: cpack-rpm-external-symlink-handling
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0b28e32628df9191289608f114244042c63a0df
commit d0b28e32628df9191289608f114244042c63a0df
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Mar 31 17:21:30 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Mar 31 17:21:30 2016 +0200
fixup: cpack-rpm-external-symlink-handling
logging consistency fix
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 5c51fac..713b938 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1089,7 +1089,7 @@ function(cpack_rpm_prepare_install_files
INSTALL_FILES_LIST WDIR PACKAGE_PREFIXE
unset(SYMLINK_RELOCATIONS_COUNT)
unset(POINT_RELOCATIONS_COUNT)
- message(WARNING "Symbolic link '${F}' points to location that is
outside packaging path! Link will not be relocatable.")
+ message(AUTHOR_WARNING "CPackRPM:Warning: Symbolic link '${F}'
points to location that is outside packaging path! Link will possibly not be
relocatable.")
endif()
if(SYMLINK_RELOCATIONS_COUNT AND POINT_RELOCATIONS_COUNT)
---
Summary of changes:
Modules/CPackRPM.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.1-704-g77220f1
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 77220f1ad6bf349e51f83d251c2a3a738b2c772a (commit)
via 44eb6c235df7344b60bd85062604b187c9754d07 (commit)
via b290ddf925aee7dca25396035b1b53223d37e9e5 (commit)
via 00e4d1220bb9f3c43bd3d339b0114d2074480bd7 (commit)
from 24d322015972bac129ee752fb45edc485fb17a45 (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=77220f1ad6bf349e51f83d251c2a3a738b2c772a
commit 77220f1ad6bf349e51f83d251c2a3a738b2c772a
Merge: 24d3220 44eb6c2
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Mar 31 01:49:14 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 31 01:49:14 2016 -0400
Merge topic 'cpack-rpm-external-symlink-handling' into next
44eb6c23 CPack/RPM external symlink handling
b290ddf9 CMake Nightly Date Stamp
00e4d122 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44eb6c235df7344b60bd85062604b187c9754d07
commit 44eb6c235df7344b60bd85062604b187c9754d07
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Mar 31 07:48:38 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Mar 31 07:48:38 2016 +0200
CPack/RPM external symlink handling
Symbolic links that point to external
location no longer cause cmake to fail
with string out of bounds error but
are instead packaged as non relocatable
symlinks and print out a warning message.
diff --git a/Help/release/dev/cpack-rpm-external-symlink-handling.rst
b/Help/release/dev/cpack-rpm-external-symlink-handling.rst
new file mode 100644
index 000..d9a3d8c
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-external-symlink-handling.rst
@@ -0,0 +1,5 @@
+cpack-rpm-external-symlink-handling
+
+
+* The "CPackRPM" module learned how to correctly handle symlinks
+ that are pointing outside generated packages.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index ae51dc1..5c51fac 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -599,9 +599,10 @@
# while determining if symlink should be either created or present in a
# post install script - depending on relocation paths.
#
-# Currenty there are a few limitations though:
+# Symbolic links that point to locations outside packaging path produce a
+# warning and are treated as non relocatable permanent symbolic links.
#
-# * Only symbolic links with relative path can be packaged.
+# Currenty there are a few limitations though:
#
# * For component based packaging component interdependency is not checked
# when processing symbolic links. Symbolic links pointing to content of
@@ -1068,13 +1069,28 @@ function(cpack_rpm_prepare_install_files
INSTALL_FILES_LIST WDIR PACKAGE_PREFIXE
get_filename_component(SYMLINK_POINT_
"${SYMLINK_LOCATION_}/${SYMLINK_POINT_}" ABSOLUTE)
endif()
-string(SUBSTRING "${SYMLINK_POINT_}" ${WDR_LEN_} -1 SYMLINK_POINT_WD_)
+# recalculate path length after conversion to canonical form
+string(LENGTH "${SYMLINK_POINT_}" SYMLINK_POINT_LENGTH_)
-cpack_rpm_symlink_get_relocation_prefixes("${F}" "${PACKAGE_PREFIXES}"
"SYMLINK_RELOCATIONS")
-cpack_rpm_symlink_get_relocation_prefixes("${SYMLINK_POINT_WD_}"
"${PACKAGE_PREFIXES}" "POINT_RELOCATIONS")
+if(SYMLINK_POINT_ MATCHES "${WDIR}/.*")
+ # only symlinks that are pointing inside the packaging structure
should be checked for relocation
+ string(SUBSTRING "${SYMLINK_POINT_}" ${WDR_LEN_} -1
SYMLINK_POINT_WD_)
+ cpack_rpm_symlink_get_relocation_prefixes("${F}"
"${PACKAGE_PREFIXES}" "SYMLINK_RELOCATIONS")
+ cpack_rpm_symlink_get_relocation_prefixes("${SYMLINK_POINT_WD_}"
"${PACKAGE_PREFIXES}" "POINT_RELOCATIONS")
-list(LENGTH SYMLINK_RELOCATIONS SYMLINK_RELOCATIONS_COUNT)
-list(LENGTH POINT_RELOCATIONS POINT_RELOCATIONS_COUNT)
+ list(LENGTH SYMLINK_RELOCATIONS SYMLINK_RELOCATIONS_COUNT)
+ list(LENGTH POINT_RELOCATIONS POINT_RELOCATIONS_COUNT)
+else()
+ # location pointed to is ouside WDR so it should be treated as a
permanent symlink
+ set(SYMLINK_POINT_WD_ "${SYMLINK_POINT_}")
+
+ unset(SYMLINK_RELOCATIONS)
+ unset(POINT_RELOCATIONS)
+
[Cmake-commits] CMake branch, next, updated. v3.5.1-673-gae8dbb9
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 ae8dbb9d619d83104c5afa9029b084064ae8c566 (commit)
via 1fe004eac3c5b905cb620580c3258ca3bd455c18 (commit)
from 2d932b45dc63e8fb0f43fdcb9f69a6d020e553da (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=ae8dbb9d619d83104c5afa9029b084064ae8c566
commit ae8dbb9d619d83104c5afa9029b084064ae8c566
Merge: 2d932b4 1fe004e
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Mar 28 18:52:25 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Mar 28 18:52:25 2016 -0400
Merge topic 'cpack-rpm-default-user-and-group' into next
1fe004ea cpack rpm setting of defattr
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fe004eac3c5b905cb620580c3258ca3bd455c18
commit 1fe004eac3c5b905cb620580c3258ca3bd455c18
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Mar 29 00:51:18 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Mar 29 00:51:18 2016 +0200
cpack rpm setting of defattr
RPM supports setting of default user, group,
file and directory permissions that will be
applied for files in package unless specified
per file/dir with attr setting
This is related to bug report 14714
diff --git a/Help/release/dev/cpack-rpm-default-user-and-group.rst
b/Help/release/dev/cpack-rpm-default-user-and-group.rst
new file mode 100644
index 000..7667c7f
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-default-user-and-group.rst
@@ -0,0 +1,9 @@
+cpack-rpm-default-user-and-group
+
+
+* The "CPackRPM" module learned how to set default values for owning user/group
+ and file/directory permissions of package content.
+ See :variable:`CPACK_RPM_DEFAULT_USER`, :variable:`CPACK_RPM_DEFAULT_GROUP`,
+ :variable:`CPACK_RPM_DEFAULT_FILE_PERMISSIONS`,
+ :variable:`CPACK_RPM_DEFAULT_DIR_PERMISSIONS` and their per component
+ counterparts.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7ffec13..ae51dc1 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -531,6 +531,54 @@
# - /usr/share/doc/.*/man/man.*
# - /usr/lib/.*/man/man.*
#
+# .. variable:: CPACK_RPM_DEFAULT_USER
+# CPACK_RPM__DEFAULT_USER
+#
+# default user ownership of RPM content
+#
+# * Mandatory : NO
+# * Default : root
+#
+# Value should be user name and not UID.
+# Note that must be in upper-case.
+#
+# .. variable:: CPACK_RPM_DEFAULT_GROUP
+# CPACK_RPM__DEFAULT_GROUP
+#
+# default group ownership of RPM content
+#
+# * Mandatory : NO
+# * Default : root
+#
+# Value should be group name and not GID.
+# Note that must be in upper-case.
+#
+# .. variable:: CPACK_RPM_DEFAULT_FILE_PERMISSIONS
+# CPACK_RPM__DEFAULT_FILE_PERMISSIONS
+#
+# default permissions used for packaged files
+#
+# * Mandatory : NO
+# * Default : - (system default)
+#
+# Accepted values are lists with PERMISSIONS. Valid permissions
+# are OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ,
+# GROUP_WRITE, GROUP_EXECUTE, WORLD_READ, WORLD_WRITE and WORLD_EXECUTE.
+# Note that must be in upper-case.
+#
+# .. variable:: CPACK_RPM_DEFAULT_DIR_PERMISSIONS
+# CPACK_RPM__DEFAULT_DIR_PERMISSIONS
+#
+# default permissions used for packaged directories
+#
+# * Mandatory : NO
+# * Default : - (system default)
+#
+# Accepted values are lists with PERMISSIONS. Valid permissions
+# are OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ,
+# GROUP_WRITE, GROUP_EXECUTE, WORLD_READ, WORLD_WRITE and WORLD_EXECUTE.
+# Note that must be in upper-case.
+#
# Packaging of Symbolic Links
# ^^^
#
@@ -581,6 +629,35 @@
# Author: Eric Noulard with the help of Alexander Neundorf.
+function(get_unix_permissions_octal_notation PERMISSIONS_VAR RETURN_VAR)
+ set(PERMISSIONS ${${PERMISSIONS_VAR}})
+ list(LENGTH PERMISSIONS PERM_LEN_PRE)
+ list(REMOVE_DUPLICATES PERMISSIONS)
+ list(LENGTH PERMISSIONS PERM_LEN_POST)
+
+ if(NOT ${PERM_LEN_PRE} EQUAL ${PERM_LEN_POST})
+message(FATAL_ERROR "${PERMISSIONS_VAR} contains duplicate values.")
+ endif()
+
+ foreach(PERMISSION_TYPE "OWNER" "GROUP" "WORLD")
+set(${PERMISSION_TYPE}_PERMISSIONS 0)
+
+foreach(PERMISSION ${PERMISSIONS})
+ if("${PERMISSION}" STREQUAL "${PERMISSION_TYPE}_READ")
+math(EXPR ${PERMISSION_TYPE}_PERMISSIONS
"${${PERMISSION_TYPE}_PERMISSIONS} + 4")
+
[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-208-g98ac047
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 98ac0479f2d634c6feb224e2094198587efce9b2 (commit) via e8daee5bd0b68936b89a26e565b010f3387dc158 (commit) from 35e17466e259b1692860454746029cad86a705de (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=98ac0479f2d634c6feb224e2094198587efce9b2 commit 98ac0479f2d634c6feb224e2094198587efce9b2 Merge: 35e1746 e8daee5 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Thu Feb 18 19:43:28 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Feb 18 19:43:28 2016 -0500 Merge topic 'cpack-deb-autodep-ORIGIN-RPATH' into next e8daee5b CPack/Deb $ORIGIN handling in rpath https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8daee5bd0b68936b89a26e565b010f3387dc158 commit e8daee5bd0b68936b89a26e565b010f3387dc158 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Fri Feb 19 01:42:19 2016 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Fri Feb 19 01:42:19 2016 +0100 CPack/Deb $ORIGIN handling in rpath Release not for fix of bug 12431 diff --git a/Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst b/Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst new file mode 100644 index 000..b0d6196 --- /dev/null +++ b/Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst @@ -0,0 +1,6 @@ +cpack-deb-autodep-ORIGIN-RPATH + + +* The "CPackDeb" module learned how to handle ``$ORIGIN`` + in ``CMAKE_INSTALL_RPATH`` when :variable:`CPACK_DEBIAN_PACKAGE_SHLIBDEPS` + is used for dependency auto detection. --- Summary of changes: Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-132-gb7388f1
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 b7388f1342b591056e513338f23097ed4a8b983c (commit) via 7c7efd1ed92e3c423f463c0249e1c05a33ff8049 (commit) from 26ab8b8e7deb6a583de55edc80d59eb91e74a8cd (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=b7388f1342b591056e513338f23097ed4a8b983c commit b7388f1342b591056e513338f23097ed4a8b983c Merge: 26ab8b8 7c7efd1 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Fri Feb 12 20:11:34 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Feb 12 20:11:34 2016 -0500 Merge topic 'cpack-rpm-upper-cased-components' into next 7c7efd1e CPack/RPM support for upper cased component variables https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c7efd1ed92e3c423f463c0249e1c05a33ff8049 commit 7c7efd1ed92e3c423f463c0249e1c05a33ff8049 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sat Feb 13 02:09:32 2016 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sat Feb 13 02:09:32 2016 +0100 CPack/RPM support for upper cased component variables CPACK_* variables expect component name in upper case. CPACK_RPM_* variables expected component name to be in same case as component name. This patch adds support for CPACK_RPM_* variables with upper case component names to match the convention with CPACK_* variables and also preserves same case component names for back compatibility. diff --git a/Help/release/dev/cpack-rpm-upper-cased-components.rst b/Help/release/dev/cpack-rpm-upper-cased-components.rst new file mode 100644 index 000..a5fb233 --- /dev/null +++ b/Help/release/dev/cpack-rpm-upper-cased-components.rst @@ -0,0 +1,15 @@ +cpack-rpm-upper-cased-components + + +* The "CPackRPM" module now supports upper cased component name + in per component CPackRPM specific variables. + E.g. component named ``foo`` now expects component specific + variable to be ``CPACK_RPM_FOO_PACKAGE_NAME`` while before + it expected ``CPACK_RPM_foo_PACKAGE_NAME``. + Upper cased component name part in variables is compatible + with convention used for other CPack variables. + For back compatibility old format of variables is still valid + and prefered if both versions of variable are set, but the + preferred future use is upper cased component names in variables. + New variables that will be added to CPackRPM in later versions + will only support upper cased component variable format. diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 7fb11c3..7ffec13 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -7,25 +7,35 @@ # Variables specific to CPack RPM generator # ^ # -# CPackRPM may be used to create RPM package using CPack. CPackRPM is a -# CPack generator thus it uses the CPACK_XXX variables used by CPack : -# https://cmake.org/Wiki/CMake:CPackConfiguration -# -# However CPackRPM has specific features which are controlled by the -# specifics CPACK_RPM_XXX variables. CPackRPM is a component aware -# generator so when CPACK_RPM_COMPONENT_INSTALL is ON some more -# CPACK_RPM__ variables may be used in order to have -# component specific values. Note however that refers -# to the **grouping name**. This may be either a component name or a -# component GROUP name. Usually those vars correspond to RPM spec file -# entities, one may find information about spec files here -# http://www.rpm.org/wiki/Docs. You'll find a detailed usage of -# CPackRPM on the wiki: -# -# :: +# CPackRPM may be used to create RPM package using CPack. +# CPackRPM is a CPack generator thus it uses the ``CPACK_XXX`` variables +# used by CPack : https://cmake.org/Wiki/CMake:CPackConfiguration. # -# https://cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29 +# CPackRPM has specific features which are controlled by the specifics +# :code:`CPACK_RPM_XXX` variables. # +# :code:`CPACK_RPM__` variables may be used in order to have +# **component** specific values. Note however that refers to the +# **grouping name** written in upper case. It may be either a component name or +# a component GROUP name. Usually those vars correspond to RPM spec file +# entities, one may find information about spec files here +# http://www.rpm.org/wiki/Docs +# +# .. note:: +# +# `` part of variables is prefered to be in upper case (for e.g. if +# component is named `foo` then use `CPACK_RPM_FOO_` variable name format)
[Cmake-commits] CMake branch, next, updated. v3.4.1-1647-g8b8a03f
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 8b8a03fc4a03845c797523d918fc06d408dde2c7 (commit)
via 27e6f74f29084fbdee35eb5a8d309d99d39e66d8 (commit)
via c926efa1398aa2c4ff273dee173d84d0031bcdf6 (commit)
from 88903117356d43bca0ae6e01b5aa3b687bc8a32f (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=8b8a03fc4a03845c797523d918fc06d408dde2c7
commit 8b8a03fc4a03845c797523d918fc06d408dde2c7
Merge: 8890311 27e6f74
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Dec 7 14:22:12 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 7 14:22:12 2015 -0500
Merge topic 'cpack-rpm-percomponent-group-and-name' into next
27e6f74f CPack: Added tests for package name and group controll fields
c926efa1 CPackRPM: Configure RPM package group and name per component
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27e6f74f29084fbdee35eb5a8d309d99d39e66d8
commit 27e6f74f29084fbdee35eb5a8d309d99d39e66d8
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Dec 7 20:13:09 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon Dec 7 20:15:49 2015 +0100
CPack: Added tests for package name and group controll fields
diff --git a/Help/release/dev/cpack-rpm-percomponent-group-and-name.rst
b/Help/release/dev/cpack-rpm-percomponent-group-and-name.rst
new file mode 100644
index 000..146f8ac
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-percomponent-group-and-name.rst
@@ -0,0 +1,7 @@
+cpack-rpm-percomponent-group-and-name
+-
+
+* The :module:`CPackRPM` module learned to set Name and Group
+ control fields per-component.
+ See :variable:`CPACK_RPM__PACKAGE_NAME`
+ and :variable:`CPACK_RPM__PACKAGE_GROUP`.
diff --git a/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-ExpectedFiles.cmake
new file mode 100644
index 000..1f6c11b
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(whitespaces_ "[\t\n\r ]*")
+
+set(EXPECTED_FILES_COUNT "3")
+set(EXPECTED_FILE_1 "per_component*-pkg_1.deb")
+set(EXPECTED_FILE_CONTENT_1
"^.*/usr/foo${whitespaces_}.*/usr/foo/CMakeLists.txt$")
+set(EXPECTED_FILE_2 "per_component*-pkg_2.deb")
+set(EXPECTED_FILE_CONTENT_2
"^.*/usr/foo${whitespaces_}.*/usr/foo/CMakeLists.txt$")
+set(EXPECTED_FILE_3 "per_component*-pkg_3.deb")
+set(EXPECTED_FILE_CONTENT_3
"^.*/usr/foo${whitespaces_}.*/usr/foo/CMakeLists.txt$")
diff --git a/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-VerifyResult.cmake
new file mode 100644
index 000..55293be
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-VerifyResult.cmake
@@ -0,0 +1,18 @@
+function(checkPackageInfo_ TYPE FILE REGEX)
+ set(whitespaces_ "[\t\n\r ]*")
+
+ getPackageInfo("${FILE}" "FILE_INFO_")
+ if(NOT FILE_INFO_ MATCHES "${REGEX}")
+message(FATAL_ERROR "Unexpected ${TYPE} in '${FILE}'; file info:
'${FILE_INFO_}'")
+ endif()
+endfunction()
+
+# check package name
+checkPackageInfo_("name" "${FOUND_FILE_1}"
".*Package${whitespaces_}:${whitespaces_}per_component-pkg_1")
+checkPackageInfo_("name" "${FOUND_FILE_2}"
".*Package${whitespaces_}:${whitespaces_}second")
+checkPackageInfo_("name" "${FOUND_FILE_3}"
".*Package${whitespaces_}:${whitespaces_}per_component-pkg_3")
+
+# check package group
+checkPackageInfo_("group" "${FOUND_FILE_1}"
".*Section${whitespaces_}:${whitespaces_}default")
+checkPackageInfo_("group" "${FOUND_FILE_2}"
".*Section${whitespaces_}:${whitespaces_}second_group")
+checkPackageInfo_("group" "${FOUND_FILE_3}"
".*Section${whitespaces_}:${whitespaces_}default")
diff --git a/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake
b/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake
new file mode 100644
index 000..a1da1a3
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake
@@ -0,0 +1,6 @@
+set(CPACK_PACKAGE_CONTACT "someone")
+set(CPACK_DEB_COMPONENT_INSTALL "ON")
+
+set(CPACK_DEBIAN_PACKAGE_SECTION "default")
+set(CPACK_DEBIAN_PKG_2_PACKAGE_NAME &qu
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1267-g7621f4f
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 7621f4f4012d900cd6fb588fed076857de5521e0 (commit)
via a4c0917e1eebd45e5ba409c7fcb28b7a2eb9225b (commit)
via 24012e3c15c127fe570a222fc8cde37cf2a27023 (commit)
via 47182ab876260c20554d8c5e3e8f453264a47b53 (commit)
via f071d8ebd4a7bd34f52c92cec539a6afb8f277e6 (commit)
via da65c5191c7692d2f733561eef336eea675f42a5 (commit)
from 382dcfc4eea6ed4ff12fe1a1dfd5fe243fd3774d (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=7621f4f4012d900cd6fb588fed076857de5521e0
commit 7621f4f4012d900cd6fb588fed076857de5521e0
Merge: 382dcfc a4c0917
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 16:36:14 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Nov 8 16:36:14 2015 -0500
Merge topic 'cpack-deb-new-component-vars' into next
a4c0917e CPackDeb: set priority control field per component
24012e3c CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentation
47182ab8 CPackDeb: set section control field per component
f071d8eb CMake Nightly Date Stamp
da65c519 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4c0917e1eebd45e5ba409c7fcb28b7a2eb9225b
commit a4c0917e1eebd45e5ba409c7fcb28b7a2eb9225b
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 22:35:30 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Nov 8 22:35:30 2015 +0100
CPackDeb: set priority control field per component
diff --git a/Help/release/dev/cpack-deb-new-component-vars.rst
b/Help/release/dev/cpack-deb-new-component-vars.rst
new file mode 100644
index 000..ab7022b
--- /dev/null
+++ b/Help/release/dev/cpack-deb-new-component-vars.rst
@@ -0,0 +1,7 @@
+cpack-deb-new-component-vars
+--
+
+* The :module:`CPackDeb` module learned to set package section
+ and priority per-component.
+ See :variable:`CPACK_DEBIAN__PACKAGE_SECTION`
+ and :variable:`CPACK_DEBIAN__PACKAGE_PRIORITY`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index e2c2312..722dca4 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -120,12 +120,16 @@
#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_PRIORITY
+# CPACK_DEBIAN__PACKAGE_PRIORITY
#
-# The Debian package priority
+# Set Priority control field e.g. required, important, standard, optional,
+# extra
#
# * Mandatory : YES
# * Default : 'optional'
#
+# See https://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities
+#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_HOMEPAGE
#
@@ -599,7 +603,7 @@ function(cpack_deb_prepare_package_vars)
# if per-component variable, overrides the global
CPACK_DEBIAN_PACKAGE_${variable_type_}
# automatic dependency discovery will be performed afterwards.
if(CPACK_DEB_PACKAGE_COMPONENT)
-foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS
CONFLICTS PROVIDES REPLACES SOURCE SECTION)
+foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS
CONFLICTS PROVIDES REPLACES SOURCE SECTION PRIORITY)
set(_component_var
"CPACK_DEBIAN_${_local_component_name}_PACKAGE_${value_type_}")
# if set, overrides the global variable
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24012e3c15c127fe570a222fc8cde37cf2a27023
commit 24012e3c15c127fe570a222fc8cde37cf2a27023
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 22:17:27 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Nov 8 22:21:09 2015 +0100
CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentation
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 2c1f236..e2c2312 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -102,9 +102,14 @@
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
# CPACK_DEBIAN__PACKAGE_SECTION
#
+# Set Section control field e.g. admin, devel, doc, ...
+#
# * Mandatory : YES
# * Default : 'devel'
#
+# See https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
+#
+#
# .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE
#
# The compression used for creating the Debian package.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47182ab876260c20554d8c5e3e8f453264a47b53
commit 47182ab876260c20554d8c5e3e8f453264a47b53
Author: Markus Rickert <rick...@fortiss.org>
AuthorDate: Sun Nov 8 22:10:12 2015 +0100
Commit: Domen Vrankar <d
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1270-g9aa7aab
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 9aa7aabe2c969b46359c9e756b5483e213f1d06b (commit)
via 3101b714421578987d8dc28e097baaa3c1c29aae (commit)
via 3fd6cb7a7894811679d8423ad301b55b520d6ae2 (commit)
from 7621f4f4012d900cd6fb588fed076857de5521e0 (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=9aa7aabe2c969b46359c9e756b5483e213f1d06b
commit 9aa7aabe2c969b46359c9e756b5483e213f1d06b
Merge: 7621f4f 3101b71
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 17:46:35 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Nov 8 17:46:35 2015 -0500
Merge topic 'cpack-deb-new-component-vars' into next
3101b714 CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement
3fd6cb7a CPackDeb: set package control field per component
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3101b714421578987d8dc28e097baaa3c1c29aae
commit 3101b714421578987d8dc28e097baaa3c1c29aae
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 23:46:13 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Nov 8 23:46:13 2015 +0100
CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement
diff --git a/Help/release/dev/cpack-deb-new-component-vars.rst
b/Help/release/dev/cpack-deb-new-component-vars.rst
index ab7022b..b51fd0f 100644
--- a/Help/release/dev/cpack-deb-new-component-vars.rst
+++ b/Help/release/dev/cpack-deb-new-component-vars.rst
@@ -1,7 +1,7 @@
cpack-deb-new-component-vars
--
-* The :module:`CPackDeb` module learned to set package section
- and priority per-component.
+* The :module:`CPackDeb` module learned to set Package, Section
+ and Priority control fields per-component.
See :variable:`CPACK_DEBIAN__PACKAGE_SECTION`
and :variable:`CPACK_DEBIAN__PACKAGE_PRIORITY`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 7e9eb86..2aaef61 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -29,10 +29,18 @@
# .. variable:: CPACK_DEBIAN_PACKAGE_NAME
# CPACK_DEBIAN__PACKAGE_NAME
#
-# The Debian package summary
+# Set Package control field (variable is automatically transformed to lower
+# case).
#
# * Mandatory : YES
-# * Default : :variable:`CPACK_PACKAGE_NAME` (lower case)
+# * Default :
+#
+#- :variable:`CPACK_PACKAGE_NAME` for non-component based
+# installations
+#- :variable:`CPACK_DEBIAN_PACKAGE_NAME` suffixed with -
+# for component-based installations.
+#
+# See
https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Source
#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_VERSION
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fd6cb7a7894811679d8423ad301b55b520d6ae2
commit 3fd6cb7a7894811679d8423ad301b55b520d6ae2
Author: Markus Rickert <rick...@fortiss.org>
AuthorDate: Sun Nov 8 23:44:00 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Nov 8 23:44:00 2015 +0100
CPackDeb: set package control field per component
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 722dca4..7e9eb86 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -27,6 +27,7 @@
# However as a handy reminder here comes the list of specific variables:
#
# .. variable:: CPACK_DEBIAN_PACKAGE_NAME
+# CPACK_DEBIAN__PACKAGE_NAME
#
# The Debian package summary
#
@@ -603,7 +604,7 @@ function(cpack_deb_prepare_package_vars)
# if per-component variable, overrides the global
CPACK_DEBIAN_PACKAGE_${variable_type_}
# automatic dependency discovery will be performed afterwards.
if(CPACK_DEB_PACKAGE_COMPONENT)
-foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS
CONFLICTS PROVIDES REPLACES SOURCE SECTION PRIORITY)
+foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS
CONFLICTS PROVIDES REPLACES SOURCE SECTION PRIORITY NAME)
set(_component_var
"CPACK_DEBIAN_${_local_component_name}_PACKAGE_${value_type_}")
# if set, overrides the global variable
@@ -704,10 +705,11 @@ function(cpack_deb_prepare_package_vars)
endif()
endforeach()
-set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME
"-${CPACK_DEB_PACKAGE_COMPONENT}")
-string(TOLOWER
"${CPACK_PACKAGE_NAME}${CPACK_DEB_PACKAGE_COMPONENT_PART_NAME}"
CPACK_DEBIAN_PACKAGE_NAME)
- else()
-set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME "")
+if(CPACK_DEBIAN_${_local_compo
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1242-gb7b7274
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 b7b7274f3718b3ad7cd83db06a04adddf5e5acc5 (commit) via becaf5107b9e2f9e2df1a14d2b4d169a37f846fc (commit) from 3dd60a3574b97ae10e437fa6ed31aa530dda62ca (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=b7b7274f3718b3ad7cd83db06a04adddf5e5acc5 commit b7b7274f3718b3ad7cd83db06a04adddf5e5acc5 Merge: 3dd60a3 becaf51 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Nov 4 15:29:11 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Nov 4 15:29:11 2015 -0500 Merge topic 'cpack-deb-config-file-source-field' into next becaf510 fixup! CPackDEB: minor documentation and debug logging fixes https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=becaf5107b9e2f9e2df1a14d2b4d169a37f846fc commit becaf5107b9e2f9e2df1a14d2b4d169a37f846fc Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Nov 4 21:28:21 2015 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Wed Nov 4 21:28:21 2015 +0100 fixup! CPackDEB: minor documentation and debug logging fixes diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index ba21029..89194c7 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -8,7 +8,7 @@ # ^^ # # CPackDeb may be used to create Deb package using CPack. -# CPackDeb is a CPack generator thus it uses the `CPACK_XXX` variables +# CPackDeb is a CPack generator thus it uses the ``CPACK_XXX`` variables # used by CPack : https://cmake.org/Wiki/CMake:CPackConfiguration. # CPackDeb generator should work on any linux host but it will produce # better deb package when Debian specific tools 'dpkg-xxx' are usable on @@ -18,7 +18,7 @@ # :code:`CPACK_DEBIAN_XXX` variables. # # :code:`CPACK_DEBIAN__` variables may be used in order to have -# **component** specific values. Note however that `` refers to the +# **component** specific values. Note however that refers to the # **grouping name** written in upper case. It may be either a component name or # a component GROUP name. # --- Summary of changes: Modules/CPackDeb.cmake |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1247-gc2b4d89
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 c2b4d892103a99b61ceb8ece6911b6c8b8ba3d5a (commit)
via e5b70ed0137df3b72f279a039cbdae1a20784473 (commit)
via f2d98e2d3c9d7581703b124d3436312949dda141 (commit)
from 1ddb9c87379fb888b1ba3fe6198214486dd73f7b (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=c2b4d892103a99b61ceb8ece6911b6c8b8ba3d5a
commit c2b4d892103a99b61ceb8ece6911b6c8b8ba3d5a
Merge: 1ddb9c8 e5b70ed
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Nov 4 15:48:41 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Nov 4 15:48:41 2015 -0500
Merge topic 'cpack-deb-config-file-source-field' into next
e5b70ed0 CPackDEB: added config file optional Source field
f2d98e2d CPackDEB: minor documentation and debug logging fixes
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5b70ed0137df3b72f279a039cbdae1a20784473
commit e5b70ed0137df3b72f279a039cbdae1a20784473
Author: Raffi Enficiaud <raffi.enfici...@mines-paris.org>
AuthorDate: Wed Nov 4 00:19:58 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Nov 4 21:46:22 2015 +0100
CPackDEB: added config file optional Source field
diff --git a/Help/release/dev/cpack-deb-config-file-source-field.rst
b/Help/release/dev/cpack-deb-config-file-source-field.rst
new file mode 100644
index 000..bbc2aa6
--- /dev/null
+++ b/Help/release/dev/cpack-deb-config-file-source-field.rst
@@ -0,0 +1,6 @@
+cpack-deb-config-file-source-field
+--
+
+* The :module:`CPackDeb` module learned to set optional config
+ file ``Source`` field - monolithic and per-component variable.
+ See :variable:`CPACK_DEBIAN_PACKAGE_SOURCE`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 7bd2f50..875a534 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -354,7 +354,28 @@
#set by Debian policy
#
https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners
#
-
+# .. variable:: CPACK_DEBIAN_PACKAGE_SOURCE
+# CPACK_DEBIAN__PACKAGE_SOURCE
+#
+# Sets the ``Source`` field of the binary Debian package.
+# When the binary package name is not the same as the source package name
+# (in particular when several components/binaries are generated from one
+# source) the source from which the binary has been generated should be
+# indicated with the field ``Source``.
+#
+# * Mandatory : NO
+# * Default :
+#
+#- An empty string for non-component based installations
+#- :variable:`CPACK_DEBIAN_PACKAGE_SOURCE` for component-based
+# installations.
+#
+# See
https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Source
+#
+# .. note::
+#
+#This value is not interpreted. It is possible to pass an optional
+#revision number of the referenced source package as well.
#=
# Copyright 2007-2009 Kitware, Inc.
@@ -554,6 +575,15 @@ function(cpack_deb_prepare_package_vars)
)
endif()
+ # Source: (optional)
+ # in case several packages are constructed from a unique source
+ # (multipackaging), the source may be indicated as well.
+ # The source might contain a version if the generated package
+ # version is different from the source version
+ if(NOT CPACK_DEBIAN_PACKAGE_SOURCE)
+set(CPACK_DEBIAN_PACKAGE_SOURCE "")
+ endif()
+
# have a look at get_property(result GLOBAL PROPERTY ENABLED_FEATURES),
# this returns the successful find_package() calls, maybe this can help
# Depends:
@@ -563,7 +593,7 @@ function(cpack_deb_prepare_package_vars)
# if per-component dependency, overrides the global
CPACK_DEBIAN_PACKAGE_${dependency_type_}
# automatic dependency discovery will be performed afterwards.
if(CPACK_DEB_PACKAGE_COMPONENT)
-foreach(dependency_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES
BREAKS CONFLICTS PROVIDES REPLACES)
+foreach(dependency_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES
BREAKS CONFLICTS PROVIDES REPLACES SOURCE)
set(_component_var
"CPACK_DEBIAN_${_local_component_name}_PACKAGE_${dependency_type_}")
# if set, overrides the global dependency
@@ -681,6 +711,7 @@ function(cpack_deb_prepare_package_vars)
message("CPackDeb:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY =
'${CPACK_PACKAGE_INSTALL_DIRECTORY}'")
message("CPackDeb:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME =
'
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1244-g1ddb9c8
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 1ddb9c87379fb888b1ba3fe6198214486dd73f7b (commit) via e564fe352916316f0044a4ac4491a54b3c43c7ae (commit) from b7b7274f3718b3ad7cd83db06a04adddf5e5acc5 (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=1ddb9c87379fb888b1ba3fe6198214486dd73f7b commit 1ddb9c87379fb888b1ba3fe6198214486dd73f7b Merge: b7b7274 e564fe3 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Nov 4 15:45:28 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Nov 4 15:45:28 2015 -0500 Merge topic 'cpack-deb-config-file-source-field' into next e564fe35 fixup! CPackDEB: added config file optional Source field https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e564fe352916316f0044a4ac4491a54b3c43c7ae commit e564fe352916316f0044a4ac4491a54b3c43c7ae Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Nov 4 21:43:09 2015 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Wed Nov 4 21:44:51 2015 +0100 fixup! CPackDEB: added config file optional Source field diff --git a/Help/release/dev/cpack-deb-config-file-source-field.rst b/Help/release/dev/cpack-deb-config-file-source-field.rst index 806aeac..bbc2aa6 100644 --- a/Help/release/dev/cpack-deb-config-file-source-field.rst +++ b/Help/release/dev/cpack-deb-config-file-source-field.rst @@ -2,5 +2,5 @@ cpack-deb-config-file-source-field -- * The :module:`CPackDeb` module learned to set optional config - file `Source` field - monolithic and per-component variable. + file ``Source`` field - monolithic and per-component variable. See :variable:`CPACK_DEBIAN_PACKAGE_SOURCE`. diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 89194c7..875a534 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -357,11 +357,11 @@ # .. variable:: CPACK_DEBIAN_PACKAGE_SOURCE # CPACK_DEBIAN__PACKAGE_SOURCE # -# Sets the `Source` field of the binary Debian package. +# Sets the ``Source`` field of the binary Debian package. # When the binary package name is not the same as the source package name # (in particular when several components/binaries are generated from one # source) the source from which the binary has been generated should be -# indicated with the field `Source`. +# indicated with the field ``Source``. # # * Mandatory : NO # * Default : --- Summary of changes: Help/release/dev/cpack-deb-config-file-source-field.rst |2 +- Modules/CPackDeb.cmake |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1234-g44f5dda
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 44f5dda355f3ac3763c0e47fac99c292835b1ee1 (commit)
via 341cd934897b3e37319b978113a1fdf9bea21c6d (commit)
via b87bed0ff6d724a91bbe5ee97b5608eed588d1af (commit)
from 4668f9ed6842fee90007c6134710c0c2d9aa787d (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=44f5dda355f3ac3763c0e47fac99c292835b1ee1
commit 44f5dda355f3ac3763c0e47fac99c292835b1ee1
Merge: 4668f9e 341cd93
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Nov 3 12:24:40 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 3 12:24:40 2015 -0500
Merge topic 'cpack-deb-compression-scheme-test' into next
341cd934 CPackDeb: ctest tests for compression scheme leak
b87bed0f CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=341cd934897b3e37319b978113a1fdf9bea21c6d
commit 341cd934897b3e37319b978113a1fdf9bea21c6d
Author: Raffi Enficiaud <raffi.enfici...@mines-paris.org>
AuthorDate: Tue Nov 3 18:18:35 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Nov 3 18:18:35 2015 +0100
CPackDeb: ctest tests for compression scheme leak
Test that changing compression of debian package
content does not affect DEBIAN/ files which must
be gzipped
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ae61bca..e13dc79 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1035,7 +1035,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
"components-description2"
"components-shlibdeps1"
"components-depend1"
- "components-depend2")
+ "components-depend2"
+ "compression")
set(CPackGen "DEB")
set(CPackRun_CPackGen "-DCPackGen=${CPackGen}")
diff --git a/Tests/CPackComponentsDEB/MyLibCPackConfig-compression.cmake.in
b/Tests/CPackComponentsDEB/MyLibCPackConfig-compression.cmake.in
new file mode 100644
index 000..ff18834
--- /dev/null
+++ b/Tests/CPackComponentsDEB/MyLibCPackConfig-compression.cmake.in
@@ -0,0 +1,11 @@
+#
+# Test that setting the compression produces valid
+# packages (compression does not leak to the DEBIAN/ files that use gzip)
+#
+
+if(CPACK_GENERATOR MATCHES "DEB")
+ set(CPACK_DEB_COMPONENT_INSTALL "OFF")
+endif()
+
+set(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE)
+set(CPACK_DEBIAN_COMPRESSION_TYPE xz)
diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-compression.cmake
b/Tests/CPackComponentsDEB/RunCPackVerifyResult-compression.cmake
new file mode 100644
index 000..2175ada
--- /dev/null
+++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-compression.cmake
@@ -0,0 +1,54 @@
+if(NOT CPackComponentsDEB_SOURCE_DIR)
+ message(FATAL_ERROR "CPackComponentsDEB_SOURCE_DIR not set")
+endif()
+
+include(${CPackComponentsDEB_SOURCE_DIR}/RunCPackVerifyResult.cmake)
+
+# TODO: currently debian doens't produce lower cased names
+set(expected_file_mask "${CPackComponentsDEB_BINARY_DIR}/MyLib-*.deb")
+set(expected_count 1)
+
+set(actual_output)
+run_cpack(actual_output
+ CPack_output
+ CPack_error
+ EXPECTED_FILE_MASK "${expected_file_mask}"
+ CONFIG_ARGS "${config_args}"
+ CONFIG_VERBOSE "${config_verbose}")
+
+if(NOT actual_output)
+ message(STATUS "expected_count='${expected_count}'")
+ message(STATUS "expected_file_mask='${expected_file_mask}'")
+ message(STATUS "actual_output_files='${actual_output}'")
+ message(FATAL_ERROR "error: expected_files do not exist: CPackComponentsDEB
test fails. (CPack_output=${CPack_output}, CPack_error=${CPack_error}")
+endif()
+
+list(LENGTH actual_output actual_count)
+if(NOT actual_count EQUAL expected_count)
+ message(STATUS "actual_count='${actual_count}'")
+ message(FATAL_ERROR "error: expected_count=${expected_count} does not match
actual_count=${actual_count}: CPackComponents test fails.
(CPack_output=${CPack_output}, CPack_error=${CPack_error})")
+endif()
+
+
+# dpkg-deb checks
+find_program(DPKGDEB_EXECUTABLE dpkg-deb)
+if(DPKGDEB_EXECUTABLE)
+ set(dpkgdeb_output_errors_all "")
+ foreach(_f IN LISTS actu
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1222-ged645b3
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 ed645b3a720e7d3df63aa39da3883a994e74a298 (commit)
via 76f0fd05a5fc25eb8a3c86aae18371c02417f0b0 (commit)
via 0cb1469e2babd1af11d2c290c6dc24c7c313422a (commit)
from 6dfbd02e6455d25b98672cd366408f8746557fc5 (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=ed645b3a720e7d3df63aa39da3883a994e74a298
commit ed645b3a720e7d3df63aa39da3883a994e74a298
Merge: 6dfbd02 76f0fd0
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Nov 3 18:24:13 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 3 18:24:13 2015 -0500
Merge topic 'cpack-deb-config-file-source-field' into next
76f0fd05 CPackDEB: added config file optional Source field
0cb1469e CPackDEB: minor documentation and debug logging fixes
diff --cc Tests/CMakeLists.txt
index e13dc79,d42a322..f381758
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@@ -1033,10 -1033,10 +1033,11 @@@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=de
set(DEB_CONFIGURATIONS_TO_TEST "components-lintian-dpkgdeb-checks"
"components-description1"
"components-description2"
+ "components-source"
"components-shlibdeps1"
"components-depend1"
- "components-depend2")
+ "components-depend2"
+ "compression")
set(CPackGen "DEB")
set(CPackRun_CPackGen "-DCPackGen=${CPackGen}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76f0fd05a5fc25eb8a3c86aae18371c02417f0b0
commit 76f0fd05a5fc25eb8a3c86aae18371c02417f0b0
Author: Raffi Enficiaud <raffi.enfici...@mines-paris.org>
AuthorDate: Wed Nov 4 00:19:58 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Nov 4 00:19:58 2015 +0100
CPackDEB: added config file optional Source field
diff --git a/Help/release/dev/cpack-deb-config-file-source-field.rst
b/Help/release/dev/cpack-deb-config-file-source-field.rst
new file mode 100644
index 000..806aeac
--- /dev/null
+++ b/Help/release/dev/cpack-deb-config-file-source-field.rst
@@ -0,0 +1,6 @@
+cpack-deb-config-file-source-field
+--
+
+* The :module:`CPackDeb` module learned to set optional config
+ file `Source` field - monolithic and per-component variable.
+ See :variable:`CPACK_DEBIAN_PACKAGE_SOURCE`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 84c9243..ba21029 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -354,7 +354,28 @@
#set by Debian policy
#
https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners
#
-
+# .. variable:: CPACK_DEBIAN_PACKAGE_SOURCE
+# CPACK_DEBIAN__PACKAGE_SOURCE
+#
+# Sets the `Source` field of the binary Debian package.
+# When the binary package name is not the same as the source package name
+# (in particular when several components/binaries are generated from one
+# source) the source from which the binary has been generated should be
+# indicated with the field `Source`.
+#
+# * Mandatory : NO
+# * Default :
+#
+#- An empty string for non-component based installations
+#- :variable:`CPACK_DEBIAN_PACKAGE_SOURCE` for component-based
+# installations.
+#
+# See
https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Source
+#
+# .. note::
+#
+#This value is not interpreted. It is possible to pass an optional
+#revision number of the referenced source package as well.
#=
# Copyright 2007-2009 Kitware, Inc.
@@ -554,6 +575,15 @@ function(cpack_deb_prepare_package_vars)
)
endif()
+ # Source: (optional)
+ # in case several packages are constructed from a unique source
+ # (multipackaging), the source may be indicated as well.
+ # The source might contain a version if the generated package
+ # version is different from the source version
+ if(NOT CPACK_DEBIAN_PACKAGE_SOURCE)
+set(CPACK_DEBIAN_PACKAGE_SOURCE "")
+ endif()
+
# have a look at get_property(result GLOBAL PROPERTY ENABLED_FEATURES),
# this returns the successful find_package() calls, maybe this can hel
[Cmake-commits] CMake branch, next, updated. v3.3.2-3416-gb82ae22
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 b82ae22bf8d81ce4abfe340c52fdde41e9fe3776 (commit)
via 55653c8be853c2bcbae9595dcf278fa27e2cf37e (commit)
from 239d0e025739f5885d49304e93fc896aa27928ba (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=b82ae22bf8d81ce4abfe340c52fdde41e9fe3776
commit b82ae22bf8d81ce4abfe340c52fdde41e9fe3776
Merge: 239d0e0 55653c8
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 30 16:15:29 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 30 16:15:29 2015 -0400
Merge topic 'cpack-tests-fix' into next
55653c8b CPack: fix TGZ test missing compiler errors
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55653c8be853c2bcbae9595dcf278fa27e2cf37e
commit 55653c8be853c2bcbae9595dcf278fa27e2cf37e
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 30 22:13:12 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Sep 30 22:13:12 2015 +0200
CPack: fix TGZ test missing compiler errors
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 7ea2a24..153ff50 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -10,47 +10,14 @@ function(run_cpack_test TEST_NAME types build)
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
# execute cmake
-execute_process(
- COMMAND "${CMAKE_COMMAND}" -DRunCMake_TEST=${TEST_NAME}
- -DGENERATOR_TYPE=${TEST_TYPE} "${RunCMake_SOURCE_DIR}"
- WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"
- RESULT_VARIABLE res
- OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
- ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
- )
-
-if(res)
- run_cmake_command(
-${TEST_TYPE}/${TEST_NAME}
-"${CMAKE_COMMAND}"
- -DRunCMake_TEST_STEP=configure
- -Dreturn_code=${res}
- "-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
- -P "${RunCMake_SOURCE_DIR}/PreTestError.cmake"
-)
- return()
-endif()
+unset(RunCMake_TEST_COMMAND)
+set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
+run_cmake(${TEST_NAME})
# execute optional build step
if(build)
- execute_process(
-COMMAND "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}"
-RESULT_VARIABLE res
-OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
-ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
-)
-endif()
-
-if(res)
- run_cmake_command(
-${TEST_TYPE}/${TEST_NAME}
-"${CMAKE_COMMAND}"
- -DRunCMake_TEST_STEP=build
- -Dreturn_code=${res}
- "-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
- -P "${RunCMake_SOURCE_DIR}/PreTestError.cmake"
-)
- return()
+ set(RunCMake_TEST_COMMAND "${CMAKE_COMMAND}" --build
"${RunCMake_TEST_BINARY_DIR}")
+ run_cmake(${TEST_NAME})
endif()
# execute cpack
diff --git a/Tests/RunCMake/CPack/PreTestError.cmake
b/Tests/RunCMake/CPack/PreTestError.cmake
deleted file mode 100644
index f88f2e8..000
--- a/Tests/RunCMake/CPack/PreTestError.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-file(READ "${bin_dir}/test_output.txt" output)
-file(READ "${bin_dir}/test_error.txt" error)
-
-message(FATAL_ERROR "Error in pre-test phase '${RunCMake_TEST_STEP}'!\n"
-"Return code: '${return_code}'\n"
-"Info output: '${output}'\n"
-"Error output: '${error}'")
diff --git a/Tests/RunCMake/CPack/TGZ/Helpers.cmake
b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
index f14d532..4ce2590 100644
--- a/Tests/RunCMake/CPack/TGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
@@ -1,7 +1,7 @@
set(ALL_FILES_GLOB "*.tar.gz")
function(getPackageContent FILE RESULT_VAR)
- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -ztvf ${FILE}
+ execute_process(COMMAND ${TAR_EXECUTABLE} -ztvf ${FILE}
OUTPUT_VARIABLE package_content_
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
b/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
index dbaf682..c244984 100644
--- a/Tests/RunCMake/CPack/TGZ/Prerequire
[Cmake-commits] CMake branch, next, updated. v3.3.2-3366-g27271a2
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 27271a21256bf7013efd013f711ac48589f82bc7 (commit)
via 43cd3b6e7df6601d592add614cc7d3048b7aeaaa (commit)
via bc94797f57c070c631ac5b4a67103f3a5105ab8c (commit)
via fa69fe931bc9de62f2e118d31e9b60d6e17d8a6e (commit)
via 1cbe7f404c787738f87e13e7474ad171e6074398 (commit)
via ab7387a0cd50b18557af244095e23e1b682b674c (commit)
via b6c030bb1e2d6cda878311e496f63585569277ef (commit)
via 252d45e8929105b15b87983428ae4f7a0b8b1a9b (commit)
via 5b97fe36ac3549ba3508d5b2b179ffb43752dd45 (commit)
via 5fc32440df1f11d2b393a5d80c16a9d69ad82e06 (commit)
via 24b0c9811a3a2400cdbec5ec714807053e021ea3 (commit)
via ac6cbeec793a5b2ca0e95a8b374fc2b02e1519a3 (commit)
from 6207fca3c8248dc11103deb0a0a9bc354b8da3d6 (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=27271a21256bf7013efd013f711ac48589f82bc7
commit 27271a21256bf7013efd013f711ac48589f82bc7
Merge: 6207fca 43cd3b6
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 28 18:54:44 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 28 18:54:44 2015 -0400
Merge topic 'cpack-package-empty-dirs' into next
43cd3b6e CPack: allow packaging of empty directories
bc94797f SystemTools: time operations on directories
fa69fe93 SystemTools: set time file permissions
1cbe7f40 CPackDeb: allow empty directories in component packages
ab7387a0 VS: Remove impossible condition.
b6c030bb cmMakefile: Remove Configured state.
252d45e8 cmCommand: Remove IsDiscouraged interface.
5b97fe36 cmSetCommand: Re-use local named variable.
5fc32440 cmSetCommand: Fix typo in comment.
24b0c981 cmGlobalGenerator: Devirtualize method.
ac6cbeec Ninja: Remove unused variable.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43cd3b6e7df6601d592add614cc7d3048b7aeaaa
commit 43cd3b6e7df6601d592add614cc7d3048b7aeaaa
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 28 22:50:15 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 29 00:52:02 2015 +0200
CPack: allow packaging of empty directories
diff --git a/Help/release/dev/cpack-package-empty-dirs.rts
b/Help/release/dev/cpack-package-empty-dirs.rts
new file mode 100644
index 000..1f56e1a
--- /dev/null
+++ b/Help/release/dev/cpack-package-empty-dirs.rts
@@ -0,0 +1,4 @@
+cpack-package-empty-dirs
+
+
+* The :module:`CPack` module learned to package empty directories.
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 58bd947..70de757 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -78,7 +78,7 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive,
std::string rp = filePrefix + *fileIt;
cmCPackLogger(cmCPackLog::LOG_DEBUG,"Adding file: "
<< rp << std::endl);
-archive.Add(rp);
+archive.Add(rp, 0, 0, false);
if (!archive)
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "ERROR while packaging files: "
@@ -284,7 +284,7 @@ int cmCPackArchiveGenerator::PackageFiles()
// Get the relative path to the file
std::string rp = cmSystemTools::RelativePath(toplevel.c_str(),
fileIt->c_str());
-archive.Add(rp);
+archive.Add(rp, 0, 0, false);
if(!archive)
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem while adding file< "
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 92a4b2b..def9fc7 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -367,6 +367,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Install directory: " << top << std::endl);
gl.RecurseOn();
+ gl.SetRecurseListDirs(true);
if ( !gl.FindFiles(findExpr) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -379,7 +380,11 @@ int
cmCPackGenerator::InstallProjectViaInstalledDirectories(
for ( gfit = files.begin(); gfit != files.end(); ++ gfit )
{
bool skip = false;
-std::string = *gfit;
+std::string inFile = *gfit;
+if(cmSystemTools::FileIsDirectory(*gfit))
+ {
+ inFile += '/';
+ }
[Cmake-commits] CMake branch, next, updated. v3.3.2-3371-gc92b688
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 c92b688866ea491b20e5f0b48aeaba95f8ff971b (commit)
via 9298f56dcedb888ff140b6b1aab90be91162d50f (commit)
via ecd71c9c1a0735cb84234344387f4138a1853fa5 (commit)
via 19c6f4eefce4f58538dd750af5d014bba23192f3 (commit)
via 749a140a0c635dca69e03245bfd6e0f2f4f43753 (commit)
from 27271a21256bf7013efd013f711ac48589f82bc7 (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=c92b688866ea491b20e5f0b48aeaba95f8ff971b
commit c92b688866ea491b20e5f0b48aeaba95f8ff971b
Merge: 27271a2 9298f56
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 28 19:19:06 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 28 19:19:06 2015 -0400
Merge topic 'cpack-package-empty-dirs' into next
9298f56d CPack: allow packaging of empty directories
ecd71c9c SystemTools: time operations on directories
19c6f4ee SystemTools: set time file permissions
749a140a CPackDeb: allow empty directories in component packages
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9298f56dcedb888ff140b6b1aab90be91162d50f
commit 9298f56dcedb888ff140b6b1aab90be91162d50f
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 28 22:50:15 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 29 01:18:18 2015 +0200
CPack: allow packaging of empty directories
diff --git a/Help/release/dev/cpack-package-empty-dirs.rts
b/Help/release/dev/cpack-package-empty-dirs.rts
new file mode 100644
index 000..1f56e1a
--- /dev/null
+++ b/Help/release/dev/cpack-package-empty-dirs.rts
@@ -0,0 +1,4 @@
+cpack-package-empty-dirs
+
+
+* The :module:`CPack` module learned to package empty directories.
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 58bd947..70de757 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -78,7 +78,7 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive,
std::string rp = filePrefix + *fileIt;
cmCPackLogger(cmCPackLog::LOG_DEBUG,"Adding file: "
<< rp << std::endl);
-archive.Add(rp);
+archive.Add(rp, 0, 0, false);
if (!archive)
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "ERROR while packaging files: "
@@ -284,7 +284,7 @@ int cmCPackArchiveGenerator::PackageFiles()
// Get the relative path to the file
std::string rp = cmSystemTools::RelativePath(toplevel.c_str(),
fileIt->c_str());
-archive.Add(rp);
+archive.Add(rp, 0, 0, false);
if(!archive)
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem while adding file< "
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 92a4b2b..def9fc7 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -367,6 +367,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Install directory: " << top << std::endl);
gl.RecurseOn();
+ gl.SetRecurseListDirs(true);
if ( !gl.FindFiles(findExpr) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -379,7 +380,11 @@ int
cmCPackGenerator::InstallProjectViaInstalledDirectories(
for ( gfit = files.begin(); gfit != files.end(); ++ gfit )
{
bool skip = false;
-std::string = *gfit;
+std::string inFile = *gfit;
+if(cmSystemTools::FileIsDirectory(*gfit))
+ {
+ inFile += '/';
+ }
for ( regIt= ignoreFilesRegex.begin();
regIt!= ignoreFilesRegex.end();
++ regIt)
@@ -869,6 +874,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
cmsys::Glob glB;
findExpr += "/*";
glB.RecurseOn();
+ glB.SetRecurseListDirs(true);
glB.FindFiles(findExpr);
filesBefore = glB.GetFiles();
std::sort(filesBefore.begin(),filesBefore.end());
@@ -908,6 +914,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
{
cmsys::Glob glA;
glA.RecurseOn();
+ glA.SetRecurseListDirs(true);
glA.FindFiles(findExpr);
std::vector filesAfter = glA.GetFiles();
std::sort(filesAfter.begi
[Cmake-commits] CMake branch, next, updated. v3.3.2-3251-g0fe79c0
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 0fe79c067090dd880826e5334a30af955e15c5e2 (commit)
via 98c72cdeccb98017e39438af8186811c8f998197 (commit)
via 901dd53403db10b5c88be8c9ccd9fab3eaed1068 (commit)
via 39347d38b42e28a53d9fa30cc1b78b6be7866878 (commit)
via 480f526a9e9fc79d561cb5daf3b2457d797c0e6d (commit)
from 527deefa0a4bede3d45edd867afe2a1a5eb8a7bd (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=0fe79c067090dd880826e5334a30af955e15c5e2
commit 0fe79c067090dd880826e5334a30af955e15c5e2
Merge: 527deef 98c72cd
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 24 20:00:30 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 24 20:00:30 2015 -0400
Merge topic 'cpack-empty-dirs-handling-fix' into next
98c72cde CPack: correctly handle directories creation
901dd534 SystemTools: time operations on directories
39347d38 SystemTools: set time file permissions
480f526a SystemTools: reverted handling of directories in copy file
functions
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98c72cdeccb98017e39438af8186811c8f998197
commit 98c72cdeccb98017e39438af8186811c8f998197
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Sep 25 01:35:46 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Sep 25 01:35:46 2015 +0200
CPack: correctly handle directories creation
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 04b1976..49f9cb5 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -411,6 +411,33 @@ int
cmCPackGenerator::InstallProjectViaInstalledDirectories(
symlinkedFiles.push_back(std::pair<std::string,
std::string>(targetFile,inFileRelative));
}
+else if(cmSystemTools::FileIsDirectory(inFile))
+ {
+ bool dirExists = cmSystemTools::FileExists(filePath);
+ mode_t perm = 0;
+ bool perms = cmSystemTools::GetPermissions(inFile, perm);
+ mode_t destPerm = 0;
+ bool destPerms = false;
+
+ if(dirExists)
+{
+destPerms = cmSystemTools::GetPermissions(filePath, destPerm);
+}
+
+ // create only if dir doesn't exist or dirs differ
+ if(!dirExists || perms != destPerms || perm != destPerm)
+{
+if(!cmSystemTools::MakeDirectory(filePath) ||
+(perms && !cmSystemTools::SetPermissions(filePath, perm)) ||
+!cmSystemTools::CopyFileTime(inFile.c_str(), filePath.c_str()))
+ {
+ cmCPackLogger(cmCPackLog::LOG_ERROR,
+"Problem creating directory: "
+<< filePath << std::endl);
+ return 0;
+ }
+}
+ }
/* If it is not a symlink then do a plain copy */
else if (!(
cmSystemTools::CopyFileIfDifferent(inFile.c_str(),filePath.c_str())
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=901dd53403db10b5c88be8c9ccd9fab3eaed1068
commit 901dd53403db10b5c88be8c9ccd9fab3eaed1068
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Sep 25 01:25:42 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Sep 25 01:33:10 2015 +0200
SystemTools: time operations on directories
On windows FILE_FLAG_BACKUP_SEMANTICS enables us to
read/write time both on files and directories.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index fa84478..d3c1f16 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2045,10 +2045,11 @@ bool cmSystemTools::CopyFileTime(const char* fromFile,
const char* toFile)
cmSystemToolsWindowsHandle hFrom =
CreateFileW(SystemTools::ConvertToWindowsExtendedPath(fromFile).c_str(),
GENERIC_READ, FILE_SHARE_READ, 0,
-OPEN_EXISTING, 0, 0);
+OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
cmSystemToolsWindowsHandle hTo =
CreateFileW(SystemTools::ConvertToWindowsExtendedPath(toFile).c_str(),
-FILE_WRITE_ATTRIBUTES, 0, 0, OPEN_EXISTING, 0, 0);
+FILE_WRITE_ATTRIBUTES, 0, 0, OPEN_EXISTING,
+FILE_FLAG_BACKUP_SEMANTICS, 0);
if(!hFrom || !hTo)
{
return false;
@@ -2100,7 +2101,8 @@ bool cmSystemTools::FileTimeGet(const c
[Cmake-commits] CMake branch, next, updated. v3.3.2-3197-geb99bf2
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 eb99bf2d6861ba6cfc282265a5947453032c68dc (commit)
via be4dc65ba74a26d742558a0e05e4748b18f4b4aa (commit)
from da0bdab6d9788728bf0671b22a287dd1b5517f42 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb99bf2d6861ba6cfc282265a5947453032c68dc
commit eb99bf2d6861ba6cfc282265a5947453032c68dc
Merge: da0bdab be4dc65
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 22 11:39:06 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 22 11:39:06 2015 -0400
Merge topic 'cpack-package-empty-dirs-cleanup' into next
be4dc65b remove parts that were pushed by accident
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be4dc65ba74a26d742558a0e05e4748b18f4b4aa
commit be4dc65ba74a26d742558a0e05e4748b18f4b4aa
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 22 17:38:31 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 22 17:38:31 2015 +0200
remove parts that were pushed by accident
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index aa4f181..04b1976 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -368,7 +368,6 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
"- Install directory: " << top << std::endl);
gl.RecurseOn();
gl.SetRecurseListDirs(true);
-// gl.SetRecurseThroughSymlinks(false);
if ( !gl.FindFiles(findExpr) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
diff --git a/Tests/RunCMake/CPack/CMakeLists.txt
b/Tests/RunCMake/CPack/CMakeLists.txt
index 449172a..46f1367 100644
--- a/Tests/RunCMake/CPack/CMakeLists.txt
+++ b/Tests/RunCMake/CPack/CMakeLists.txt
@@ -8,5 +8,5 @@ if(EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/${GENERATOR_TYPE}/${RunCMake_TEST}-specif
include("${GENERATOR_TYPE}/${RunCMake_TEST}-specifics.cmake")
endif()
-set(CPACK_GENERATOR "${GENERATOR_TYPE};TGZ")
+set(CPACK_GENERATOR "${GENERATOR_TYPE}")
include(CPack)
---
Summary of changes:
Source/CPack/cmCPackGenerator.cxx |1 -
Tests/RunCMake/CPack/CMakeLists.txt |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.2-3183-g58c4057
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 58c40573e265ae38d64738cf4033373df0f2a6a5 (commit)
via b58de9fe2ba4ac3e194403ecd118fd54681ffae8 (commit)
via 47b060aee0871bdb5fea63b398a1f1cb07fa3b37 (commit)
from 6d9d7045893e99bc713958ec93f30fcf62555b6f (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58c40573e265ae38d64738cf4033373df0f2a6a5
commit 58c40573e265ae38d64738cf4033373df0f2a6a5
Merge: 6d9d704 b58de9f
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 21 20:10:49 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 21 20:10:49 2015 -0400
Merge topic 'cpack-package-empty-dirs' into next
b58de9fe CPack: allow packaging of empty directories
47b060ae CPackDeb: allow empty directories in component packages
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b58de9fe2ba4ac3e194403ecd118fd54681ffae8
commit b58de9fe2ba4ac3e194403ecd118fd54681ffae8
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 22 02:08:26 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Sep 22 02:08:26 2015 +0200
CPack: allow packaging of empty directories
diff --git a/Help/release/dev/cpack-package-empty-dirs.rts
b/Help/release/dev/cpack-package-empty-dirs.rts
new file mode 100644
index 000..1f56e1a
--- /dev/null
+++ b/Help/release/dev/cpack-package-empty-dirs.rts
@@ -0,0 +1,4 @@
+cpack-package-empty-dirs
+
+
+* The :module:`CPack` module learned to package empty directories.
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 92a4b2b..aa4f181 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -367,6 +367,8 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Install directory: " << top << std::endl);
gl.RecurseOn();
+ gl.SetRecurseListDirs(true);
+// gl.SetRecurseThroughSymlinks(false);
if ( !gl.FindFiles(findExpr) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -869,6 +871,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
cmsys::Glob glB;
findExpr += "/*";
glB.RecurseOn();
+ glB.SetRecurseListDirs(true);
glB.FindFiles(findExpr);
filesBefore = glB.GetFiles();
std::sort(filesBefore.begin(),filesBefore.end());
@@ -908,6 +911,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
{
cmsys::Glob glA;
glA.RecurseOn();
+ glA.SetRecurseListDirs(true);
glA.FindFiles(findExpr);
std::vector filesAfter = glA.GetFiles();
std::sort(filesAfter.begin(),filesAfter.end());
@@ -1074,6 +1078,7 @@ int cmCPackGenerator::DoPackage()
std::string findExpr = tempDirectory;
findExpr += "/*";
gl.RecurseOn();
+ gl.SetRecurseListDirs(true);
gl.SetRecurseThroughSymlinks(false);
if ( !gl.FindFiles(findExpr) )
{
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2675066..c24b5ea 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -895,12 +895,33 @@ std::string
cmSystemTools::FileExistsInParentDirectories(const char* fname,
bool cmSystemTools::cmCopyFile(const char* source, const char* destination)
{
+ // FIXME remove if statement once kwsys SystemTools get support for
+ // source is directory handling in CopyFileAlways function
+ if(cmSystemTools::FileIsDirectory(source))
+{
+return Superclass::MakeDirectory(destination);
+}
+
return Superclass::CopyFileAlways(source, destination);
}
bool cmSystemTools::CopyFileIfDifferent(const char* source,
const char* destination)
{
+ // FIXME remove if statement once kwsys SystemTools get support for
+ // source is directory handling in CopyFileIfDifferent function
+ if(cmSystemTools::FileIsDirectory(source))
+{
+if(SystemTools::FileExists(destination))
+ {
+ return true;
+ }
+else
+ {
+ return Superclass::MakeDirectory(destination);
+ }
+}
+
return Superclass::CopyFileIfDifferent(source, destination);
}
diff --git a/Tests/RunCMake/CPack/CMakeLists.txt
b/Tests/RunCMake/CPack/CMakeLists.txt
index 46f1367..449172a 100644
--- a/Tests/RunCMake/CPack/CMakeLists.txt
+++ b/Tests/RunCMake/CPack/CMakeLists.txt
@@ -8,5 +8,5 @@ if(EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/${GENE
[Cmake-commits] CMake branch, next, updated. v3.3.2-3139-g281ecf2
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 281ecf26db4308e41de0eaa3707d216e1806b5a4 (commit)
via bc2e54db5516ed884f0affe020e52256f0c8b3d5 (commit)
from f820b7d4700407c0adaf92384c8b90505facc403 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=281ecf26db4308e41de0eaa3707d216e1806b5a4
commit 281ecf26db4308e41de0eaa3707d216e1806b5a4
Merge: f820b7d bc2e54d
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 20 17:45:55 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Sep 20 17:45:55 2015 -0400
Merge topic 'cpack-verbatime-variables' into next
bc2e54db Introduction of CPACK_VERBATIM_VARIABLES variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc2e54db5516ed884f0affe020e52256f0c8b3d5
commit bc2e54db5516ed884f0affe020e52256f0c8b3d5
Author: Roman Donchenko <d...@corrigendum.ru>
AuthorDate: Sun Sep 20 23:39:03 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Sep 20 23:39:03 2015 +0200
Introduction of CPACK_VERBATIM_VARIABLES variable
If variable is set to TRUE, values of all variables prefixed with CPACK_
will be escaped so special characters such as dolar sign, quotes or
foreward slash will not be lost. By default variable is treated as set
to FALSE for back compatibility.
The cpack_encode_variables macro is changed into a function to remove
scope pollution. There should be no other effects.
diff --git a/Help/release/dev/CPack-updates.rst
b/Help/release/dev/CPack-updates.rst
index 7ac1ed7..ea0780f 100644
--- a/Help/release/dev/CPack-updates.rst
+++ b/Help/release/dev/CPack-updates.rst
@@ -4,3 +4,8 @@ CPack-updates
* The :module:`CPack` module no longer mangles settings with CMake-special
characters when they're used as defaults for other settings. The macro
``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
+
+* The :module:`CPack` module gained a new setting,
``CPACK_VERBATIM_VARIABLES``,
+ which can be used to ensure the cpack program receives the settings' values
+ exactly as they were set, even if they contain CMake-special characters.
+ For compatibility, it's off by default.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 7d6d54c..5756001 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -182,6 +182,17 @@
# will be a boolean variable which enables stripping of all files (a list
# of files evaluates to TRUE in CMake, so this change is compatible).
#
+# .. variable:: CPACK_VERBATIM_VARIABLES
+#
+# If set to TRUE, values of variables prefixed with CPACK_ will be escaped
+# before being written to the configuration files, so that the cpack program
+# receives them exactly as they were specified. If not, characters like quotes
+# and backslashes can cause parsing errors or alter the value received by the
+# cpack program. Defaults to FALSE for backwards compatibility.
+#
+# * Mandatory : NO
+# * Default : FALSE
+#
# The following CPack variables are specific to source packages, and
# will not affect binary packages:
#
@@ -305,21 +316,28 @@ macro(cpack_set_if_not_set name value)
_cpack_set_default("${name}" "${value}")
endmacro()
-# cpack_encode_variables - Macro to encode variables for the configuration file
+# cpack_encode_variables - Function to encode variables for the configuration
file
# find any variable that starts with CPACK and create a variable
# _CPACK_OTHER_VARIABLES_ that contains SET commands for
# each cpack variable. _CPACK_OTHER_VARIABLES_ is then
# used as an @ replacment in configure_file for the CPackConfig.
-macro(cpack_encode_variables)
- set(_CPACK_OTHER_VARIABLES_)
+function(cpack_encode_variables)
+ set(commands "")
get_cmake_property(res VARIABLES)
foreach(var ${res})
if(var MATCHES "^CPACK")
- set(_CPACK_OTHER_VARIABLES_
-"${_CPACK_OTHER_VARIABLES_}\nSET(${var} \"${${var}}\")")
+ if(CPACK_VERBATIM_VARIABLES)
+_cpack_escape_for_cmake(value "${${var}}")
+ else()
+set(value "${${var}}")
endif()
+
+ set(commands "${commands}\nSET(${var} \"${value}\")")
+endif()
endforeach()
-endmacro()
+
+ set(_CPACK_OTHER_VARIABLES_ "${commands}" PARENT_SCOPE)
+endfunction()
# Internal use functions
function(_cpack_set_default name value)
@@ -328,6 +346,11 @@ function(_cpack_set_default name value)
endif()
endfunction()
+function
[Cmake-commits] CMake branch, next, updated. v3.3.2-3106-g9cdf5f2
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 9cdf5f2afd6bd40fa73bf88a17484c7229ffb850 (commit)
via da295f450da2781e82632b6a5df29df6fbf7daad (commit)
via 7c7874c86ef14f2866d38d5ee85709db6e71d217 (commit)
from 77201729619377b7ece124e1ab4347038cbbb833 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cdf5f2afd6bd40fa73bf88a17484c7229ffb850
commit 9cdf5f2afd6bd40fa73bf88a17484c7229ffb850
Merge: 7720172 da295f4
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Sep 18 16:32:08 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Sep 18 16:32:08 2015 -0400
Merge topic 'cpack-deb-checksum-on-symlinks' into next
da295f45 CPack/Deb: checksum on symlinks release notes
7c7874c8 CPackDeb: preventing md5sum on symlinks
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da295f450da2781e82632b6a5df29df6fbf7daad
commit da295f450da2781e82632b6a5df29df6fbf7daad
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Fri Sep 18 22:31:24 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Sep 18 22:31:24 2015 +0200
CPack/Deb: checksum on symlinks release notes
diff --git a/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
b/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
new file mode 100644
index 000..9bfeded
--- /dev/null
+++ b/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
@@ -0,0 +1,4 @@
+cpack-deb-checksum-on-symlinks
+--
+
+* The :module:`CPackDeb` module now correctly excludes symlinks during package
checksum calculation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c7874c86ef14f2866d38d5ee85709db6e71d217
commit 7c7874c86ef14f2866d38d5ee85709db6e71d217
Author: Raffi Enficiaud <raffi.enfici...@mines-paris.org>
AuthorDate: Fri Sep 18 22:20:42 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Fri Sep 18 22:20:42 2015 +0200
CPackDeb: preventing md5sum on symlinks
- Direct call to cmSystemTools::ComputeFileMD5
- Avoiding hashing symlinks
- Tests
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 9402689..5cdab52 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -524,21 +524,24 @@ int cmCPackDebGenerator::createDeb()
packageFiles.begin();
fileIt != packageFiles.end(); ++ fileIt )
{
- std::string cmd = "\"";
- cmd += cmSystemTools::GetCMakeCommand();
- cmd += "\" -E md5sum \"";
- cmd += *fileIt;
- cmd += "\"";
-
- std::string output;
- int retval = -1;
- int res = cmSystemTools::RunSingleCommand(cmd.c_str(), , ,
- , toplevel.c_str(), this->GeneratorVerbose, 0);
- if ( !res || retval )
+ // hash only regular files
+ if( cmSystemTools::FileIsDirectory(*fileIt)
+ || cmSystemTools::FileIsSymlink(*fileIt))
{
-cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running cmake -E md5sum "
- << cmd << std::endl);
+continue;
}
+
+ char md5sum[33];
+ if(!cmSystemTools::ComputeFileMD5(*fileIt, md5sum))
+{
+cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem computing the md5 of "
+ << *fileIt << std::endl);
+}
+
+ md5sum[32] = 0;
+
+ std::string output(md5sum);
+ output += " " + *fileIt + "\n";
// debian md5sums entries are like this:
// 014f3604694729f3bf19263bac599765 usr/bin/ccmake
// thus strip the full path (with the trailing slash)
diff --git a/Tests/CPackComponentsDEB/CMakeLists.txt
b/Tests/CPackComponentsDEB/CMakeLists.txt
index 5a5d626..98ed911 100644
--- a/Tests/CPackComponentsDEB/CMakeLists.txt
+++ b/Tests/CPackComponentsDEB/CMakeLists.txt
@@ -99,6 +99,25 @@ if(CHMOD_PROG)
set(CPACK_DEBIAN_APPLICATIONS_PACKAGE_CONTROL_STRICT_PERMISSION TRUE)
endif()
+# creates a symbolic link and a directory. Those should not be hashed.
+# warning: relocation of the symlink is not supported (symlinks with relative
+# paths)
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink mylibapp symtest)
+install(FILES ${CPackComponentsDEB_BINARY_DIR}/symtest
+DESTINATION bin
+COMPONENT applications)
+
+if(EXISTS "./dirtest")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ./dirtest)
[Cmake-commits] CMake branch, next, updated. v3.3.2-3047-g3b099fd
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 3b099fd3eddbe1775d0cc1360704a0e824532c80 (commit)
via 8954f8fa8a8d28cb06abdf1630e1229ea818b596 (commit)
via 437b8acb6c501f736fdba6b26bfa6122581e198e (commit)
via 5a8e53453a4bef49663723fec57cb22253c7c34f (commit)
from 41547e3a5d045d4cc549f8e2202bdea1ff002c29 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b099fd3eddbe1775d0cc1360704a0e824532c80
commit 3b099fd3eddbe1775d0cc1360704a0e824532c80
Merge: 41547e3 8954f8f
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Thu Sep 17 15:09:29 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 17 15:09:29 2015 -0400
Merge topic 'cpack-deb-fakeroot-removal' into next
8954f8fa CPack/DEB: test preserve extra config file permissions
437b8acb CPackDeb: use of libarchive and removal of fakeroot
5a8e5345 cmArchiveWrite: control user/group, permissions and recursive file
adding
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8954f8fa8a8d28cb06abdf1630e1229ea818b596
commit 8954f8fa8a8d28cb06abdf1630e1229ea818b596
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 14 22:44:00 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Thu Sep 17 21:05:53 2015 +0200
CPack/DEB: test preserve extra config file permissions
diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
index 78b6114..5f929ff 100644
--- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
@@ -1,11 +1,17 @@
set(foo_preinst "^echo default_preinst$")
+set(foo_preinst_permissions_regex "-rwxr-xr-x .*")
set(foo_prerm "^echo default_prerm$")
+set(foo_prerm_permissions_regex "-rwxr-xr-x .*")
verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm")
set(bar_preinst "^echo bar_preinst$")
+set(bar_prerm_permissions_regex "-rwx-- .*")
set(bar_prerm "^echo bar_prerm$")
+set(bar_prerm_permissions_regex "-rwx-- .*")
verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm")
set(bas_preinst "^echo default_preinst$")
+set(bas_prerm_permissions_regex "-rwxr-xr-x .*")
set(bas_prerm "^echo default_prerm$")
+set(bas_prerm_permissions_regex "-rwxr-xr-x .*")
verifyDebControl("${FOUND_FILE_3}" "bas" "preinst;prerm")
diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake
b/Tests/RunCMake/CPack/DEB/Helpers.cmake
index b6f113b..f490130 100644
--- a/Tests/RunCMake/CPack/DEB/Helpers.cmake
+++ b/Tests/RunCMake/CPack/DEB/Helpers.cmake
@@ -24,6 +24,19 @@ function(verifyDebControl FILE PREFIX VERIFY_FILES)
message(FATAL_ERROR "Unexpected content in for '${PREFIX}_${FILE_}'!"
" Content: '${content_}'")
endif()
+
+execute_process(COMMAND ls -l
"${CMAKE_CURRENT_BINARY_DIR}/control_${PREFIX}/${FILE_}"
+ OUTPUT_VARIABLE package_permissions_
+ ERROR_VARIABLE package_permissions_error_
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+if(NOT package_permissions_error_)
+ if(NOT package_permissions_ MATCHES
"${${PREFIX}_${FILE_}_permissions_regex}")
+message(FATAL_ERROR "Unexpected file permissions for
${PREFIX}_${FILE_}: '${package_permissions_}'!")
+ endif()
+else()
+ message(FATAL_ERROR "Listing file permissions failed
(${package_permissions_error_})!")
+endif()
endforeach()
endfunction()
diff --git a/Tests/RunCMake/CPack/DEB_EXTRA.cmake
b/Tests/RunCMake/CPack/DEB_EXTRA.cmake
index 46d848d..3c291d5 100644
--- a/Tests/RunCMake/CPack/DEB_EXTRA.cmake
+++ b/Tests/RunCMake/CPack/DEB_EXTRA.cmake
@@ -2,14 +2,32 @@ install(FILES CMakeLists.txt DESTINATION foo COMPONENT foo)
install(FILES CMakeLists.txt DESTINATION bar COMPONENT bar)
install(FILES CMakeLists.txt DESTINATION bas COMPONENT bas)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/preinst "echo default_preinst")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/prerm "echo default_prerm")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp/preinst "echo default_preinst")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp/prerm "echo default_prerm")
+
+foreach(file_ preinst prerm)
+ file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tmp/${file_}
+DES
[Cmake-commits] CMake branch, next, updated. v3.3.1-2993-g0cb936d
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 0cb936d7f3c97311dc1516c2eeb310d42aa3539b (commit)
via ec1e2920551647fd08407b26ef9fc5561061e238 (commit)
from 35ee6832faf64aaadd78d4b7af47b5d949683a17 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cb936d7f3c97311dc1516c2eeb310d42aa3539b
commit 0cb936d7f3c97311dc1516c2eeb310d42aa3539b
Merge: 35ee683 ec1e292
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 16 11:47:15 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 16 11:47:15 2015 -0400
Merge topic 'cpack-deb-fakeroot-removal' into next
ec1e2920 fixup! cmArchiveWrite: control user/group, permissions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec1e2920551647fd08407b26ef9fc5561061e238
commit ec1e2920551647fd08407b26ef9fc5561061e238
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 16 07:57:36 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Sep 16 07:57:36 2015 +0200
fixup! cmArchiveWrite: control user/group, permissions
Fix for variable naming convention and conversion between signed and
unsigned values
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 55eeec5..9402689 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -453,10 +453,8 @@ int cmCPackDebGenerator::createDeb()
// uid/gid should be the one of the root user, and this root user has
// always uid/gid equal to 0.
-data_tar.SetUID(0);
-data_tar.SetGID(0);
-data_tar.SetUNAME("root");
-data_tar.SetGNAME("root");
+data_tar.SetUIDAndGID(0u, 0u);
+data_tar.SetUNAMEAndGNAME("root", "root");
// now add all directories which have to be compressed
// collect all top level install dirs for that
@@ -571,10 +569,8 @@ int cmCPackDebGenerator::createDeb()
"paxr");
// sets permissions and uid/gid for the files
-control_tar.SetUID(0);
-control_tar.SetGID(0);
-control_tar.SetUNAME("root");
-control_tar.SetGNAME("root");
+control_tar.SetUIDAndGID(0u, 0u);
+control_tar.SetUNAMEAndGNAME("root", "root");
/* permissions are set according to
https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners
@@ -623,7 +619,7 @@ int cmCPackDebGenerator::createDeb()
strictFiles + sizeof(strictFiles)/sizeof(strictFiles[0]));
// default
- control_tar.SetPermissions(-1);
+ control_tar.ClearPermissions();
std::vector controlExtraList;
cmSystemTools::ExpandListArgument(controlExtra, controlExtraList);
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index f6a1b4f..7946950 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -84,11 +84,7 @@ cmArchiveWrite::cmArchiveWrite(
Archive(archive_write_new()),
Disk(archive_read_disk_new()),
Verbose(false),
-Format(format),
-uid(-1),
-gid(-1),
-permissions(-1),
-permissionsMask(-1)
+Format(format)
{
switch (c)
{
@@ -288,29 +284,29 @@ bool cmArchiveWrite::AddFile(const char* file,
}
// manages the uid/guid of the entry (if any)
- if (this->uid > -1 && this->gid > -1)
+ if (this->Uid.IsSet() && this->Gid.IsSet())
{
-archive_entry_set_uid(e, this->uid);
-archive_entry_set_gid(e, this->gid);
+archive_entry_set_uid(e, this->Uid.Get());
+archive_entry_set_gid(e, this->Gid.Get());
}
- if (this->uname.size() && this->gname.size())
+ if (this->Uname.size() && this->Gname.size())
{
-archive_entry_set_uname(e, this->uname.c_str());
-archive_entry_set_gname(e, this->gname.c_str());
+archive_entry_set_uname(e, this->Uname.c_str());
+archive_entry_set_gname(e, this->Gname.c_str());
}
// manages the permissions
- if (this->permissions > -1)
+ if (this->Permissions.IsSet())
{
-archive_entry_set_perm(e, this->permissions);
+archive_entry_set_perm(e, this->Permissions.Get());
}
- if (this->permissionsMask > -1)
+ if (this->PermissionsMask.IsSet())
{
mode_t perm = archive_entry_perm(e);
-archive_entry_set_perm(e, perm & this->permissionsMask );
+archive_entry_set_perm(e, perm & this->Permissi
[Cmake-commits] CMake branch, next, updated. v3.3.1-2956-g7b9bab0
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 7b9bab0f445c8d56f4c0e95e5d28edda6df14d99 (commit)
via 271bc8d13beb1c24cabc30d4da8e1466825bd3a3 (commit)
via e96e8a73a860b987db0387516113c46b13c4aa4a (commit)
from bcb5fcebe81f80c4f97e7955617132b4d8bbbe69 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b9bab0f445c8d56f4c0e95e5d28edda6df14d99
commit 7b9bab0f445c8d56f4c0e95e5d28edda6df14d99
Merge: bcb5fce 271bc8d
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 15 18:20:07 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 15 18:20:07 2015 -0400
Merge topic 'cpack-deb-fakeroot-removal' into next
271bc8d1 fixup! cmArchiveWrite: control user/group, permissions
e96e8a73 fixup! permissions on control files and strict Debian rules
variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=271bc8d13beb1c24cabc30d4da8e1466825bd3a3
commit 271bc8d13beb1c24cabc30d4da8e1466825bd3a3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 16 00:19:13 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Sep 16 00:19:13 2015 +0200
fixup! cmArchiveWrite: control user/group, permissions
Fix for variable naming convention and conversion between signed and
unsigned values
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 55eeec5..9402689 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -453,10 +453,8 @@ int cmCPackDebGenerator::createDeb()
// uid/gid should be the one of the root user, and this root user has
// always uid/gid equal to 0.
-data_tar.SetUID(0);
-data_tar.SetGID(0);
-data_tar.SetUNAME("root");
-data_tar.SetGNAME("root");
+data_tar.SetUIDAndGID(0u, 0u);
+data_tar.SetUNAMEAndGNAME("root", "root");
// now add all directories which have to be compressed
// collect all top level install dirs for that
@@ -571,10 +569,8 @@ int cmCPackDebGenerator::createDeb()
"paxr");
// sets permissions and uid/gid for the files
-control_tar.SetUID(0);
-control_tar.SetGID(0);
-control_tar.SetUNAME("root");
-control_tar.SetGNAME("root");
+control_tar.SetUIDAndGID(0u, 0u);
+control_tar.SetUNAMEAndGNAME("root", "root");
/* permissions are set according to
https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners
@@ -623,7 +619,7 @@ int cmCPackDebGenerator::createDeb()
strictFiles + sizeof(strictFiles)/sizeof(strictFiles[0]));
// default
- control_tar.SetPermissions(-1);
+ control_tar.ClearPermissions();
std::vector controlExtraList;
cmSystemTools::ExpandListArgument(controlExtra, controlExtraList);
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index f6a1b4f..7946950 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -84,11 +84,7 @@ cmArchiveWrite::cmArchiveWrite(
Archive(archive_write_new()),
Disk(archive_read_disk_new()),
Verbose(false),
-Format(format),
-uid(-1),
-gid(-1),
-permissions(-1),
-permissionsMask(-1)
+Format(format)
{
switch (c)
{
@@ -288,29 +284,29 @@ bool cmArchiveWrite::AddFile(const char* file,
}
// manages the uid/guid of the entry (if any)
- if (this->uid > -1 && this->gid > -1)
+ if (this->Uid.IsSet() && this->Gid.IsSet())
{
-archive_entry_set_uid(e, this->uid);
-archive_entry_set_gid(e, this->gid);
+archive_entry_set_uid(e, this->Uid.Get());
+archive_entry_set_gid(e, this->Gid.Get());
}
- if (this->uname.size() && this->gname.size())
+ if (this->Uname.size() && this->Gname.size())
{
-archive_entry_set_uname(e, this->uname.c_str());
-archive_entry_set_gname(e, this->gname.c_str());
+archive_entry_set_uname(e, this->Uname.c_str());
+archive_entry_set_gname(e, this->Gname.c_str());
}
// manages the permissions
- if (this->permissions > -1)
+ if (this->Permissions.IsSet())
{
-archive_entry_set_perm(e, this->permissions);
+archive_entry_set_perm(e, this->Permissions.Get());
}
- if (this->permissionsMask > -1)
+ if (this->PermissionsMask.IsSet())
{
mode_t perm = archive_en
[Cmake-commits] CMake branch, next, updated. v3.3.1-2958-gb937b17
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 b937b173e28042dbee74f2beeb526e38890a68e3 (commit)
via 716f9bf961b3739587d820369ad958a4fca33287 (commit)
from 7b9bab0f445c8d56f4c0e95e5d28edda6df14d99 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b937b173e28042dbee74f2beeb526e38890a68e3
commit b937b173e28042dbee74f2beeb526e38890a68e3
Merge: 7b9bab0 716f9bf
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Sep 15 18:46:23 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 15 18:46:23 2015 -0400
Merge topic 'cpack-deb-fakeroot-removal' into next
716f9bf9 Revert "fixup! cmArchiveWrite: control user/group, permissions"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=716f9bf961b3739587d820369ad958a4fca33287
commit 716f9bf961b3739587d820369ad958a4fca33287
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 16 00:44:05 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Sep 16 00:44:05 2015 +0200
Revert "fixup! cmArchiveWrite: control user/group, permissions"
This reverts commit 271bc8d13beb1c24cabc30d4da8e1466825bd3a3.
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 9402689..55eeec5 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -453,8 +453,10 @@ int cmCPackDebGenerator::createDeb()
// uid/gid should be the one of the root user, and this root user has
// always uid/gid equal to 0.
-data_tar.SetUIDAndGID(0u, 0u);
-data_tar.SetUNAMEAndGNAME("root", "root");
+data_tar.SetUID(0);
+data_tar.SetGID(0);
+data_tar.SetUNAME("root");
+data_tar.SetGNAME("root");
// now add all directories which have to be compressed
// collect all top level install dirs for that
@@ -569,8 +571,10 @@ int cmCPackDebGenerator::createDeb()
"paxr");
// sets permissions and uid/gid for the files
-control_tar.SetUIDAndGID(0u, 0u);
-control_tar.SetUNAMEAndGNAME("root", "root");
+control_tar.SetUID(0);
+control_tar.SetGID(0);
+control_tar.SetUNAME("root");
+control_tar.SetGNAME("root");
/* permissions are set according to
https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners
@@ -619,7 +623,7 @@ int cmCPackDebGenerator::createDeb()
strictFiles + sizeof(strictFiles)/sizeof(strictFiles[0]));
// default
- control_tar.ClearPermissions();
+ control_tar.SetPermissions(-1);
std::vector controlExtraList;
cmSystemTools::ExpandListArgument(controlExtra, controlExtraList);
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 7946950..f6a1b4f 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -84,7 +84,11 @@ cmArchiveWrite::cmArchiveWrite(
Archive(archive_write_new()),
Disk(archive_read_disk_new()),
Verbose(false),
-Format(format)
+Format(format),
+uid(-1),
+gid(-1),
+permissions(-1),
+permissionsMask(-1)
{
switch (c)
{
@@ -284,29 +288,29 @@ bool cmArchiveWrite::AddFile(const char* file,
}
// manages the uid/guid of the entry (if any)
- if (this->Uid.IsSet() && this->Gid.IsSet())
+ if (this->uid > -1 && this->gid > -1)
{
-archive_entry_set_uid(e, this->Uid.Get());
-archive_entry_set_gid(e, this->Gid.Get());
+archive_entry_set_uid(e, this->uid);
+archive_entry_set_gid(e, this->gid);
}
- if (this->Uname.size() && this->Gname.size())
+ if (this->uname.size() && this->gname.size())
{
-archive_entry_set_uname(e, this->Uname.c_str());
-archive_entry_set_gname(e, this->Gname.c_str());
+archive_entry_set_uname(e, this->uname.c_str());
+archive_entry_set_gname(e, this->gname.c_str());
}
// manages the permissions
- if (this->Permissions.IsSet())
+ if (this->permissions > -1)
{
-archive_entry_set_perm(e, this->Permissions.Get());
+archive_entry_set_perm(e, this->permissions);
}
- if (this->PermissionsMask.IsSet())
+ if (this->permissionsMask > -1)
{
mode_t perm = archive_entry_perm(e);
-archive_entry_set_perm(e, perm & this->PermissionsMask.Get());
+archive_entry_set_perm(e, perm &
[Cmake-commits] CMake branch, next, updated. v3.3.1-2931-g664a9b0
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 664a9b09edd414a6be33eaa5b7d5e7536c47cd5c (commit)
via 76c59007dd3944e23848b7d5912a59a7d3db6398 (commit)
via 68dba7f7198557833a7b1339254b00a1f6f4ec75 (commit)
from 9f5b349e0a8f423eee9852b9c44408c6c1f9395d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=664a9b09edd414a6be33eaa5b7d5e7536c47cd5c
commit 664a9b09edd414a6be33eaa5b7d5e7536c47cd5c
Merge: 9f5b349 76c5900
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 14 16:55:05 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 14 16:55:05 2015 -0400
Merge topic 'cpack-deb-fakeroot-removal' into next
76c59007 CPack/DEB: test preserve extra config file permissions
68dba7f7 fixup! CPackDeb: use of libarchive and removal of fakeroot
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76c59007dd3944e23848b7d5912a59a7d3db6398
commit 76c59007dd3944e23848b7d5912a59a7d3db6398
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Sep 14 22:44:00 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Mon Sep 14 22:44:00 2015 +0200
CPack/DEB: test preserve extra config file permissions
diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
index 78b6114..5f929ff 100644
--- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
@@ -1,11 +1,17 @@
set(foo_preinst "^echo default_preinst$")
+set(foo_preinst_permissions_regex "-rwxr-xr-x .*")
set(foo_prerm "^echo default_prerm$")
+set(foo_prerm_permissions_regex "-rwxr-xr-x .*")
verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm")
set(bar_preinst "^echo bar_preinst$")
+set(bar_prerm_permissions_regex "-rwx-- .*")
set(bar_prerm "^echo bar_prerm$")
+set(bar_prerm_permissions_regex "-rwx-- .*")
verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm")
set(bas_preinst "^echo default_preinst$")
+set(bas_prerm_permissions_regex "-rwxr-xr-x .*")
set(bas_prerm "^echo default_prerm$")
+set(bas_prerm_permissions_regex "-rwxr-xr-x .*")
verifyDebControl("${FOUND_FILE_3}" "bas" "preinst;prerm")
diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake
b/Tests/RunCMake/CPack/DEB/Helpers.cmake
index b6f113b..f490130 100644
--- a/Tests/RunCMake/CPack/DEB/Helpers.cmake
+++ b/Tests/RunCMake/CPack/DEB/Helpers.cmake
@@ -24,6 +24,19 @@ function(verifyDebControl FILE PREFIX VERIFY_FILES)
message(FATAL_ERROR "Unexpected content in for '${PREFIX}_${FILE_}'!"
" Content: '${content_}'")
endif()
+
+execute_process(COMMAND ls -l
"${CMAKE_CURRENT_BINARY_DIR}/control_${PREFIX}/${FILE_}"
+ OUTPUT_VARIABLE package_permissions_
+ ERROR_VARIABLE package_permissions_error_
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+if(NOT package_permissions_error_)
+ if(NOT package_permissions_ MATCHES
"${${PREFIX}_${FILE_}_permissions_regex}")
+message(FATAL_ERROR "Unexpected file permissions for
${PREFIX}_${FILE_}: '${package_permissions_}'!")
+ endif()
+else()
+ message(FATAL_ERROR "Listing file permissions failed
(${package_permissions_error_})!")
+endif()
endforeach()
endfunction()
diff --git a/Tests/RunCMake/CPack/DEB_EXTRA.cmake
b/Tests/RunCMake/CPack/DEB_EXTRA.cmake
index 46d848d..3c291d5 100644
--- a/Tests/RunCMake/CPack/DEB_EXTRA.cmake
+++ b/Tests/RunCMake/CPack/DEB_EXTRA.cmake
@@ -2,14 +2,32 @@ install(FILES CMakeLists.txt DESTINATION foo COMPONENT foo)
install(FILES CMakeLists.txt DESTINATION bar COMPONENT bar)
install(FILES CMakeLists.txt DESTINATION bas COMPONENT bas)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/preinst "echo default_preinst")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/prerm "echo default_prerm")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp/preinst "echo default_preinst")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp/prerm "echo default_prerm")
+
+foreach(file_ preinst prerm)
+ file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tmp/${file_}
+DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+FILE_PERMISSIONS
+ OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD
[Cmake-commits] CMake branch, next, updated. v3.3.1-2826-gf1b9893
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 f1b98931036d13e03c960fd1616699948821e67a (commit) via 4de7c8126b43d93f781afaf0b990cc8814105017 (commit) from 09ffe6116bd70d779e69b539e555d2baf5475910 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1b98931036d13e03c960fd1616699948821e67a commit f1b98931036d13e03c960fd1616699948821e67a Merge: 09ffe61 4de7c81 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Sep 9 17:58:43 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Sep 9 17:58:43 2015 -0400 Merge topic 'cpack-deb-component-dependencies' into next 4de7c812 CPack/Deb: enable per component setting of dependencies http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4de7c8126b43d93f781afaf0b990cc8814105017 commit 4de7c8126b43d93f781afaf0b990cc8814105017 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Sep 9 23:57:58 2015 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Wed Sep 9 23:57:58 2015 +0200 CPack/Deb: enable per component setting of dependencies diff --git a/Help/release/dev/cpack-deb-component-dependencies.rst b/Help/release/dev/cpack-deb-component-dependencies.rst new file mode 100644 index 000..2714222 --- /dev/null +++ b/Help/release/dev/cpack-deb-component-dependencies.rst @@ -0,0 +1,12 @@ +cpack-deb-component-dependencies + + +* The :module:`CPackDeb` module learned to set package dependencies + per component. See :variable:`CPACK_DEBIAN__PACKAGE_PREDEPENDS`, + :variable:`CPACK_DEBIAN__PACKAGE_ENHANCES`, + :variable:`CPACK_DEBIAN__PACKAGE_BREAKS`, + :variable:`CPACK_DEBIAN__PACKAGE_CONFLICTS`, + :variable:`CPACK_DEBIAN__PACKAGE_PROVIDES`, + :variable:`CPACK_DEBIAN__PACKAGE_REPLACES`, + :variable:`CPACK_DEBIAN__PACKAGE_RECOMMENDS` and + :variable:`CPACK_DEBIAN__PACKAGE_SUGGESTS`. diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 75e9966..6c94d8e 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -78,6 +78,7 @@ # #set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.1-6), libc6 (< 2.4)") # +# # .. variable:: CPACK_DEBIAN_PACKAGE_MAINTAINER # # The Debian package maintainer @@ -164,6 +165,7 @@ # * Default : - # # .. variable:: CPACK_DEBIAN_PACKAGE_PREDEPENDS +# CPACK_DEBIAN__PACKAGE_PREDEPENDS # # Sets the `Pre-Depends` field of the Debian package. # Like :variable:`Depends `, except that it @@ -172,11 +174,16 @@ # pre-dependency. # # * Mandatory : NO -# * Default : - +# * Default : +# +#- An empty string for non-component based installations +#- :variable:`CPACK_DEBIAN_PACKAGE_PREDEPENDS` for component-based +# installations. # # See http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps # # .. variable:: CPACK_DEBIAN_PACKAGE_ENHANCES +# CPACK_DEBIAN__PACKAGE_ENHANCES # # Sets the `Enhances` field of the Debian package. # Similar to :variable:`Suggests ` but works @@ -184,11 +191,16 @@ # functionality of another package. # # * Mandatory : NO -# * Default : - +# * Default : +# +#- An empty string for non-component based installations +#- :variable:`CPACK_DEBIAN_PACKAGE_ENHANCES` for component-based +# installations. # # See http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps # # .. variable:: CPACK_DEBIAN_PACKAGE_BREAKS +# CPACK_DEBIAN__PACKAGE_BREAKS # # Sets the `Breaks` field of the Debian package. # When a binary package (P) declares that it breaks other packages (B), @@ -199,12 +211,17 @@ # packages (B) cannot be reconfigured again. # # * Mandatory : NO -# * Default : - +# * Default : +# +#- An empty string for non-component based installations +#- :variable:`CPACK_DEBIAN_PACKAGE_BREAKS` for component-based +# installations. # # See https://www.debian.org/doc/debian-policy/ch-relationships.html#s-breaks # # # .. variable:: CPACK_DEBIAN_PACKAGE_CONFLICTS +# CPACK_DEBIAN__PACKAGE_CONFLICTS # # Sets the `Conflicts` field of the Debian package. # When one binary package declares a conflict with another using a `Conflicts` @@ -212,7 +229,11 @@ # the same time. # # * Mandatory : NO -# * Default : - +# * Default : +# +#- An empty string for non-component based installations +#- :variable:`CPACK_DEBIAN_PACKAGE_CONFLICTS` for component-based +# installations. # # See https://www.debian.org/doc/debian-poli
[Cmake-commits] CMake branch, next, updated. v3.3.1-2824-g09ffe61
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 09ffe6116bd70d779e69b539e555d2baf5475910 (commit)
via 2a7772ff4ca88319d65e025a49883ef2f2487aeb (commit)
from 34141ce58174d8180359bd95389c25255e8cf2b7 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09ffe6116bd70d779e69b539e555d2baf5475910
commit 09ffe6116bd70d779e69b539e555d2baf5475910
Merge: 34141ce 2a7772f
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 9 16:23:22 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 9 16:23:22 2015 -0400
Merge topic 'cpack-cmake-special-characters-mangling' into next
2a7772ff CPack: don't mangle CMake-special characters when applying default
settings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a7772ff4ca88319d65e025a49883ef2f2487aeb
commit 2a7772ff4ca88319d65e025a49883ef2f2487aeb
Author: Roman Donchenko <d...@corrigendum.ru>
AuthorDate: Wed Sep 9 22:21:07 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Sep 9 22:21:07 2015 +0200
CPack: don't mangle CMake-special characters when applying default settings
Mangling is prevented by using a function instead of a macro for setting
default value of some CPack variables. Function is meant for internal use
in CPack.cmake only.
Old macro is deprecated but kept for backwards compatibility - was
intended for internal use only as it can't be used for CPack after
CPack.cmake script is included.
Patch removes local workarounds that were required by old macro,
fixes default setting of variables that by default inherit value from
another variable that already went through old default setting macro
(e.g. value of CPACK_PACKAGE_INSTALL_REGISTRY_KEY caused error for
wrong escapes if CPACK_PACKAGE_INSTALL_DIRECTORY contained escaped
back slashes) and provides a test for correct escaping of characters.
diff --git a/Help/release/dev/CPack-updates.rst
b/Help/release/dev/CPack-updates.rst
new file mode 100644
index 000..7ac1ed7
--- /dev/null
+++ b/Help/release/dev/CPack-updates.rst
@@ -0,0 +1,6 @@
+CPack-updates
+-
+
+* The :module:`CPack` module no longer mangles settings with CMake-special
+ characters when they're used as defaults for other settings. The macro
+ ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index e223286..7d6d54c 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -299,10 +299,10 @@ endif()
include(CPackComponent)
# Macro for setting values if a user did not overwrite them
+# Mangles CMake-special characters. Only kept for backwards compatibility.
macro(cpack_set_if_not_set name value)
- if(NOT DEFINED "${name}")
-set(${name} "${value}")
- endif()
+ message(DEPRECATION "cpack_set_if_not_set is obsolete; do not use.")
+ _cpack_set_default("${name}" "${value}")
endmacro()
# cpack_encode_variables - Macro to encode variables for the configuration file
@@ -321,27 +321,34 @@ macro(cpack_encode_variables)
endforeach()
endmacro()
+# Internal use functions
+function(_cpack_set_default name value)
+ if(NOT DEFINED "${name}")
+set("${name}" "${value}" PARENT_SCOPE)
+ endif()
+endfunction()
+
# Set the package name
-cpack_set_if_not_set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
-cpack_set_if_not_set(CPACK_PACKAGE_VERSION_MAJOR "0")
-cpack_set_if_not_set(CPACK_PACKAGE_VERSION_MINOR "1")
-cpack_set_if_not_set(CPACK_PACKAGE_VERSION_PATCH "1")
-cpack_set_if_not_set(CPACK_PACKAGE_VERSION
+_cpack_set_default(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
+_cpack_set_default(CPACK_PACKAGE_VERSION_MAJOR "0")
+_cpack_set_default(CPACK_PACKAGE_VERSION_MINOR "1")
+_cpack_set_default(CPACK_PACKAGE_VERSION_PATCH "1")
+_cpack_set_default(CPACK_PACKAGE_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-cpack_set_if_not_set(CPACK_PACKAGE_VENDOR "Humanity")
-cpack_set_if_not_set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+_cpack_set_default(CPACK_PACKAGE_VENDOR "Humanity")
+_cpack_set_default(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"${CMAKE_PROJECT_NAME} built using CMake")
-cpack_set_if_not_set(CPACK_PACKAGE_DESCRIPTION_FILE
+_cpack_set_default(CPACK_PACKAGE_DESCRIPTION_FILE
"${CMAKE_ROOT}/Tem
[Cmake-commits] CMake branch, next, updated. v3.3.1-2586-ge1fcdb6
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 e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc (commit)
via 674dc0b33566b433b6ac5751f965b7d0ff952e73 (commit)
from 698baeca7519b75caa4958f187bc57e32da63aad (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc
commit e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc
Merge: 698baec 674dc0b
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Fri Aug 28 02:09:41 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 28 02:09:41 2015 -0400
Merge topic 'cpack-config-generation-test' into next
674dc0b3 CPack generator independent tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=674dc0b33566b433b6ac5751f965b7d0ff952e73
commit 674dc0b33566b433b6ac5751f965b7d0ff952e73
Author: Roman Donchenko d...@corrigendum.ru
AuthorDate: Fri Aug 28 08:07:52 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Fri Aug 28 08:07:52 2015 +0200
CPack generator independent tests
CPackConfig.cmake file generation from CMake test suite.
Currently it contains only a simple test without special
characters in variable value.
Test is not part of RunCMake/CPack as those tests are
expected to be run for a specified generator.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c274d8f..2955db2 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -239,6 +239,7 @@ add_RunCMake_test(CommandLine)
add_RunCMake_test(CommandLineTar)
add_RunCMake_test(install)
+add_RunCMake_test(CPackConfig)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)
add_RunCMake_test(CTestCommandLine)
diff --git a/Tests/RunCMake/CPackConfig/CMakeLists.txt
b/Tests/RunCMake/CPackConfig/CMakeLists.txt
new file mode 100644
index 000..9a9e7b4
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.3)
+
+project(${RunCMake_TEST})
+include(${RunCMake_TEST}.cmake)
+
+include(CPack)
diff --git a/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
new file mode 100644
index 000..6787eb8
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(Simple)
diff --git a/Tests/RunCMake/CPackConfig/Simple-check.cmake
b/Tests/RunCMake/CPackConfig/Simple-check.cmake
new file mode 100644
index 000..6e0cf6f
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/Simple-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_variable(CPACK_FOO bar baz;quux)
diff --git a/Tests/RunCMake/CPackConfig/Simple.cmake
b/Tests/RunCMake/CPackConfig/Simple.cmake
new file mode 100644
index 000..c9f6541
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/Simple.cmake
@@ -0,0 +1 @@
+set(CPACK_FOO bar baz;quux)
diff --git a/Tests/RunCMake/CPackConfig/check.cmake
b/Tests/RunCMake/CPackConfig/check.cmake
new file mode 100644
index 000..2fc9f11
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/check.cmake
@@ -0,0 +1,7 @@
+function(test_variable NAME EXPECTED_VALUE)
+ if(NOT ${${NAME}} STREQUAL ${EXPECTED_VALUE})
+message(FATAL_ERROR ${NAME}: variable mismatch; expected
[${EXPECTED_VALUE}] actual [${${NAME}}])
+ endif()
+endfunction()
+
+include(${RunCMake_TEST_BINARY_DIR}/CPackConfig.cmake)
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |1 +
Tests/RunCMake/{CMP0064 = CPackConfig}/CMakeLists.txt |5 -
Tests/RunCMake/CPackConfig/RunCMakeTest.cmake |3 +++
Tests/RunCMake/CPackConfig/Simple-check.cmake |3 +++
Tests/RunCMake/CPackConfig/Simple.cmake|1 +
Tests/RunCMake/CPackConfig/check.cmake |7 +++
6 files changed, 19 insertions(+), 1 deletion(-)
copy Tests/RunCMake/{CMP0064 = CPackConfig}/CMakeLists.txt (61%)
create mode 100644 Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/CPackConfig/Simple-check.cmake
create mode 100644 Tests/RunCMake/CPackConfig/Simple.cmake
create mode 100644 Tests/RunCMake/CPackConfig/check.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-1982-g3350a96
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 3350a96d57f0694be3cb0a305aad9ae82b75e790 (commit)
via c83c1680cf1ac9b5d01efc3bdf0a7c012326403f (commit)
from 2ec5b3466da91b08b3f087f62625a4b6bf88208c (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3350a96d57f0694be3cb0a305aad9ae82b75e790
commit 3350a96d57f0694be3cb0a305aad9ae82b75e790
Merge: 2ec5b34 c83c168
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Aug 5 12:44:32 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 5 12:44:32 2015 -0400
Merge topic 'cpack-rpm-documentation-fixes' into next
c83c1680 RunCMake/CPack_DEB DEPENDENCIES test package content fix
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c83c1680cf1ac9b5d01efc3bdf0a7c012326403f
commit c83c1680cf1ac9b5d01efc3bdf0a7c012326403f
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Aug 5 18:44:00 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Wed Aug 5 18:44:00 2015 +0200
RunCMake/CPack_DEB DEPENDENCIES test package content fix
On Mac shared libraries end with .dylib instead of .so so
test should take this into account
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
index 577a560..c56c670 100644
--- a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
@@ -8,6 +8,7 @@ set(EXPECTED_FILE_CONTENT_2
^.*/usr/foo_auto${whitespaces_}.*/usr/foo_auto/test
set(EXPECTED_FILE_3 dependencies*-headers.deb)
set(EXPECTED_FILE_CONTENT_3
^.*/usr/bar${whitespaces_}.*/usr/bar/CMakeLists.txt$)
set(EXPECTED_FILE_4 dependencies*-libs.deb)
-set(EXPECTED_FILE_CONTENT_4
^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib.so$)
+# dynamic lib extension is .so on Linux and .dylib on Mac so we will use a
wildcard .* for it
+set(EXPECTED_FILE_CONTENT_4
^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib\\..*$)
set(EXPECTED_FILE_5 dependencies*-libs_auto.deb)
-set(EXPECTED_FILE_CONTENT_5
^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib.so$)
+set(EXPECTED_FILE_CONTENT_5
^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib\\..*$)
---
Summary of changes:
Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-1902-gd5b5aac
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 d5b5aac6c174e169fcd12391011e3d2c22ef961e (commit)
via 59a722f73a98fcc6695d62dcc9069bfbcaadff46 (commit)
via 5b3c3d5e14c22ec7a96f5514bfff6d1b1e2232bc (commit)
via ea7051f5c47d4618279e084ddac1627a973e1140 (commit)
via fcc510ba32975dfc6257ac5998aeba58cda3088a (commit)
via e26f53a88b2fd16fc54513adfbb8eaab26dd102f (commit)
via 64aacb24b65e5496b4148437ed96363ae06e8200 (commit)
from c06c74f32f5318789bd72ddb41cec9759d6a9339 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5b5aac6c174e169fcd12391011e3d2c22ef961e
commit d5b5aac6c174e169fcd12391011e3d2c22ef961e
Merge: c06c74f 59a722f
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Aug 4 16:51:06 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 16:51:06 2015 -0400
Merge topic 'cpack-rpm-documentation-fixes' into next
59a722f7 RunCMake/CPack dependencies tests
5b3c3d5e RunCMake/CPack bumped verify result cmake version
ea7051f5 RunCMake/CPack_DEB getPackageInfo helper function
fcc510ba RunCMake/CPack enable CXX
e26f53a8 CPack/RPM: missing PACKAGE_CONFLICTS documentation
64aacb24 CPack/RPM: undocumented variables
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59a722f73a98fcc6695d62dcc9069bfbcaadff46
commit 59a722f73a98fcc6695d62dcc9069bfbcaadff46
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jul 29 23:39:11 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Tue Aug 4 22:49:13 2015 +0200
RunCMake/CPack dependencies tests
Tests for RPM and DEB package test for
currently supported dependency features
(requires, provides, conflicts, ...)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
new file mode 100644
index 000..577a560
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
@@ -0,0 +1,13 @@
+set(whitespaces_ [\t\n\r ]*)
+
+set(EXPECTED_FILES_COUNT 5)
+set(EXPECTED_FILE_1 dependencies*-applications.deb)
+set(EXPECTED_FILE_CONTENT_1 ^.*/usr/foo${whitespaces_}.*/usr/foo/test_prog$)
+set(EXPECTED_FILE_2 dependencies*-applications_auto.deb)
+set(EXPECTED_FILE_CONTENT_2
^.*/usr/foo_auto${whitespaces_}.*/usr/foo_auto/test_prog$)
+set(EXPECTED_FILE_3 dependencies*-headers.deb)
+set(EXPECTED_FILE_CONTENT_3
^.*/usr/bar${whitespaces_}.*/usr/bar/CMakeLists.txt$)
+set(EXPECTED_FILE_4 dependencies*-libs.deb)
+set(EXPECTED_FILE_CONTENT_4
^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib.so$)
+set(EXPECTED_FILE_5 dependencies*-libs_auto.deb)
+set(EXPECTED_FILE_CONTENT_5
^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib.so$)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
new file mode 100644
index 000..44c862d
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
@@ -0,0 +1,15 @@
+function(checkDepends_ FILE REGEX)
+ set(whitespaces_ [\t\n\r ]*)
+
+ getPackageInfo(${FILE} FILE_INFO_)
+ if(NOT FILE_INFO_ MATCHES ${REGEX})
+message(FATAL_ERROR Unexpected dependencies in '${FILE}'; file info:
'${FILE_INFO_}')
+ endif()
+endfunction()
+
+checkDepends_(${FOUND_FILE_1}
.*Depends${whitespaces_}:${whitespaces_}depend-application,
depend-application-b.*)
+# use wildcard as we are using dependency auto detection
+checkDepends_(${FOUND_FILE_2}
.*Depends${whitespaces_}:${whitespaces_}.*depend-application,
depend-application-b.*)
+checkDepends_(${FOUND_FILE_3}
.*Depends${whitespaces_}:${whitespaces_}depend-headers.*)
+checkDepends_(${FOUND_FILE_4}
.*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*)
+checkDepends_(${FOUND_FILE_5}
.*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
new file mode 100644
index 000..9e09428
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
@@ -0,0 +1,15 @@
+set(CPACK_PACKAGE_CONTACT someone)
+set(CPACK_DEB_COMPONENT_INSTALL ON)
+
+# false by default
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS FALSE)
+# FIXME can not be tested as libraries first have to be part of a package in
order
+# to determine their dependencies and we can not be certain if there will be
any
+set(CPACK_DEBIAN_APPLICATIONS_AUTO_PACKAGE_SHLIBDEPS TRUE)
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS depend-default, depend
[Cmake-commits] CMake branch, next, updated. v3.3.0-1555-gb40e8c4
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 b40e8c4ae752205aa134d656bfa852610d258322 (commit)
via e3e5e61313db5f60e3bea86887366d34d27fbca9 (commit)
via 2c510e4a0aac3dae0cfcb3aeb0882bb75bfa (commit)
via 7ae1629a1572808cb5819844a19d8b9d38391682 (commit)
via dee38f80347d2e0c9bf8c542b9704fa9e79b1377 (commit)
via 1e9d42f393fe30563f7d398569f17f105d2ae2cf (commit)
via f8a81669a04ed091f9dd5d335645f914046d5ddb (commit)
via 3a79d1e865189d78bef8e5abd06d7fb8724e (commit)
from 82bfbf88966baeeb7d3891cc6b3cb32a707dd6b2 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b40e8c4ae752205aa134d656bfa852610d258322
commit b40e8c4ae752205aa134d656bfa852610d258322
Merge: 82bfbf8 e3e5e61
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Thu Jul 30 05:46:23 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 30 05:46:23 2015 -0400
Merge topic 'cpack-rpm-documentation-fixes' into next
e3e5e613 RunCMake/CPack dependencies tests
2c510e4a RunCMake/CPack bumped verify result cmake version
7ae1629a RunCMake/CPack_DEB getPackageInfo helper function
dee38f80 RunCMake/CPack enable CXX
1e9d42f3 CPack/RPM: missing PACKAGE_CONFLICTS documentation
f8a81669 CPack/RPM: undocumented variables
3a79 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3e5e61313db5f60e3bea86887366d34d27fbca9
commit e3e5e61313db5f60e3bea86887366d34d27fbca9
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jul 29 23:39:11 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Thu Jul 30 11:44:21 2015 +0200
RunCMake/CPack dependencies tests
Tests for RPM and DEB package test for
currently supported dependency features
(requires, provides, conflicts, ...)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
new file mode 100644
index 000..577a560
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
@@ -0,0 +1,13 @@
+set(whitespaces_ [\t\n\r ]*)
+
+set(EXPECTED_FILES_COUNT 5)
+set(EXPECTED_FILE_1 dependencies*-applications.deb)
+set(EXPECTED_FILE_CONTENT_1 ^.*/usr/foo${whitespaces_}.*/usr/foo/test_prog$)
+set(EXPECTED_FILE_2 dependencies*-applications_auto.deb)
+set(EXPECTED_FILE_CONTENT_2
^.*/usr/foo_auto${whitespaces_}.*/usr/foo_auto/test_prog$)
+set(EXPECTED_FILE_3 dependencies*-headers.deb)
+set(EXPECTED_FILE_CONTENT_3
^.*/usr/bar${whitespaces_}.*/usr/bar/CMakeLists.txt$)
+set(EXPECTED_FILE_4 dependencies*-libs.deb)
+set(EXPECTED_FILE_CONTENT_4
^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib.so$)
+set(EXPECTED_FILE_5 dependencies*-libs_auto.deb)
+set(EXPECTED_FILE_CONTENT_5
^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib.so$)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
new file mode 100644
index 000..44c862d
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
@@ -0,0 +1,15 @@
+function(checkDepends_ FILE REGEX)
+ set(whitespaces_ [\t\n\r ]*)
+
+ getPackageInfo(${FILE} FILE_INFO_)
+ if(NOT FILE_INFO_ MATCHES ${REGEX})
+message(FATAL_ERROR Unexpected dependencies in '${FILE}'; file info:
'${FILE_INFO_}')
+ endif()
+endfunction()
+
+checkDepends_(${FOUND_FILE_1}
.*Depends${whitespaces_}:${whitespaces_}depend-application,
depend-application-b.*)
+# use wildcard as we are using dependency auto detection
+checkDepends_(${FOUND_FILE_2}
.*Depends${whitespaces_}:${whitespaces_}.*depend-application,
depend-application-b.*)
+checkDepends_(${FOUND_FILE_3}
.*Depends${whitespaces_}:${whitespaces_}depend-headers.*)
+checkDepends_(${FOUND_FILE_4}
.*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*)
+checkDepends_(${FOUND_FILE_5}
.*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
new file mode 100644
index 000..9e09428
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
@@ -0,0 +1,15 @@
+set(CPACK_PACKAGE_CONTACT someone)
+set(CPACK_DEB_COMPONENT_INSTALL ON)
+
+# false by default
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS FALSE)
+# FIXME can not be tested as libraries first have to be part of a package in
order
+# to determine their dependencies and we can not be certain if there will be
any
+set
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1018-gc505d2d
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 c505d2d9e51d05c4f0437b4b3d9704a8f884e9c2 (commit)
via 4ca9da63c2d62979335afef1a146bcc992cc35f1 (commit)
via 81895aa46f06d1fea6c5a2a1faaa8dea935eb651 (commit)
via 0946d154e7e742ee78320b2da7d00c720091f1a8 (commit)
via 18263079dac8a044cb2cf1dfa288608be2839c29 (commit)
from e76d71542f056aedc2620747760ea1a6fad1dfad (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c505d2d9e51d05c4f0437b4b3d9704a8f884e9c2
commit c505d2d9e51d05c4f0437b4b3d9704a8f884e9c2
Merge: e76d715 4ca9da6
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Mon Jul 13 16:47:47 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 13 16:47:47 2015 -0400
Merge topic 'cpack-per-component-extra-controll-file' into next
4ca9da63 CPack/DEB: component version of PACKAGE_CONTROL_EXTRA
81895aa4 CTest/RunCMake/CPack/DEB: added verifyDebControl
0946d154 CTest/RunCMake/CPack: found files should be preserved
18263079 CPackDeb: mark variables with COMPONENT version in docs
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ca9da63c2d62979335afef1a146bcc992cc35f1
commit 4ca9da63c2d62979335afef1a146bcc992cc35f1
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Mon Jul 13 22:25:44 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Mon Jul 13 22:45:53 2015 +0200
CPack/DEB: component version of PACKAGE_CONTROL_EXTRA
Component version of CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
variable.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 6799c12..825d5b7 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -297,7 +297,7 @@
# Typical usage is for conffiles, postinst, postrm, prerm.
#
# * Mandatory : NO
-# * Component : NO
+# * Component : YES
# * Default : -
#
# Usage::
@@ -518,7 +518,6 @@ function(cpack_deb_prepare_package_vars)
# if per-component dependency, overrides the global
CPACK_DEBIAN_PACKAGE_DEPENDS
# automatic dependency discovery will be performed afterwards.
if(CPACK_DEB_PACKAGE_COMPONENT)
-string(TOUPPER ${CPACK_DEB_PACKAGE_COMPONENT} _local_component_name)
set(_component_depends_var
CPACK_DEBIAN_${_local_component_name}_PACKAGE_DEPENDS)
# if set, overrides the global dependency
@@ -562,7 +561,6 @@ function(cpack_deb_prepare_package_vars)
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
endif()
else()
-string(TOUPPER ${CPACK_DEB_PACKAGE_COMPONENT} _local_component_name)
set(component_description_var
CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
# component description overrides package description
@@ -604,13 +602,20 @@ function(cpack_deb_prepare_package_vars)
# - conffiles
# - postinst
# - postrm
- # - prerm
+ # - prerm
# Usage:
# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
#${CMAKE_CURRENT_SOURCE_DIR/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postrm)
# Are we packaging components ?
if(CPACK_DEB_PACKAGE_COMPONENT)
+# override values with per component version if set
+foreach(VAR_NAME_ PACKAGE_CONTROL_EXTRA)
+ if(CPACK_DEBIAN_${_local_component_name}_${VAR_NAME_})
+set(CPACK_DEBIAN_${VAR_NAME_}
${CPACK_DEBIAN_${_local_component_name}_${VAR_NAME_}})
+ endif()
+endforeach()
+
set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME
-${CPACK_DEB_PACKAGE_COMPONENT})
string(TOLOWER
${CPACK_PACKAGE_NAME}${CPACK_DEB_PACKAGE_COMPONENT_PART_NAME}
CPACK_DEBIAN_PACKAGE_NAME)
else()
diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-ExpectedFiles.cmake
new file mode 100644
index 000..2ff679a
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(whitespaces_ [\t\n\r ]*)
+
+set(EXPECTED_FILES_COUNT 3)
+set(EXPECTED_FILE_1 deb_extra-*-foo.deb)
+set(EXPECTED_FILE_CONTENT_1
^.*/usr/${whitespaces_}.*/usr/foo/${whitespaces_}.*/usr/foo/CMakeLists.txt$)
+set(EXPECTED_FILE_2 deb_extra-*-bar.deb)
+set(EXPECTED_FILE_CONTENT_2
^.*/usr/${whitespaces_}.*/usr/bar/${whitespaces_}.*/usr/bar/CMakeLists.txt$)
+set(EXPECTED_FILE_3 deb_extra-*-bas.deb)
+set(EXPECTED_FILE_CONTENT_3
^.*/usr/${whitespaces_}.*/usr/bas/${whitespaces_}.*/usr/bas/CMakeLists.txt$)
diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
new file mode 100644
index 000..78b6114
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
@@ -0,0
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1020-g413a13f
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 413a13f7fd48ab67d479e2f127293c8ad7781a3c (commit) via 2b0af9c4e074f5c8171b4bae46c4212356c29c9b (commit) from c505d2d9e51d05c4f0437b4b3d9704a8f884e9c2 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=413a13f7fd48ab67d479e2f127293c8ad7781a3c commit 413a13f7fd48ab67d479e2f127293c8ad7781a3c Merge: c505d2d 2b0af9c Author: Domen Vrankar domen.vran...@gmail.com AuthorDate: Mon Jul 13 18:14:14 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 13 18:14:14 2015 -0400 Merge topic 'cpack-per-component-extra-controll-file' into next 2b0af9c4 Revert CPackDeb: mark variables with COMPONENT version in docs http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b0af9c4e074f5c8171b4bae46c4212356c29c9b commit 2b0af9c4e074f5c8171b4bae46c4212356c29c9b Author: Domen Vrankar domen.vran...@gmail.com AuthorDate: Tue Jul 14 00:13:30 2015 +0200 Commit: Domen Vrankar domen.vran...@gmail.com CommitDate: Tue Jul 14 00:13:30 2015 +0200 Revert CPackDeb: mark variables with COMPONENT version in docs diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 825d5b7..75e9966 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -18,11 +18,9 @@ # :code:`CPACK_DEBIAN_XXX` variables. # # :code:`CPACK_DEBIAN_COMPONENT_` variables may be used in order to have -# **component** specific values. Note however that COMPONENT refers to the +# **component** specific values. Note however that COMPONENT refers to the # **grouping name** written in upper case. It may be either a component name or -# a component GROUP name. Variables that have COMPONENT version are marked -# with :code:`Component : YES` and by default non component version value is -# used as fallback if component version of the variable is not set. +# a component GROUP name. # # You'll find a detailed usage on the wiki: # http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 . @@ -33,7 +31,6 @@ # The Debian package summary # # * Mandatory : YES -# * Component : NO # * Default : :variable:`CPACK_PACKAGE_NAME` (lower case) # # @@ -42,7 +39,6 @@ # The Debian package version # # * Mandatory : YES -# * Component : NO # * Default : :variable:`CPACK_PACKAGE_VERSION` # # @@ -51,17 +47,16 @@ # The Debian package architecture # # * Mandatory : YES -# * Component : NO # * Default : Output of :code:`dpkg --print-architecture` (or :code:`i386` #if :code:`dpkg` is not found) # # # .. variable:: CPACK_DEBIAN_PACKAGE_DEPENDS +# CPACK_DEBIAN_COMPONENT_PACKAGE_DEPENDS # # Sets the Debian dependencies of this package. # # * Mandatory : NO -# * Component : YES # * Default : # #- An empty string for non-component based installations @@ -88,16 +83,15 @@ # The Debian package maintainer # # * Mandatory : YES -# * Component : NO # * Default : :code:`CPACK_PACKAGE_CONTACT` # # # .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION +# CPACK_COMPONENT_COMPONENT_DESCRIPTION # # The Debian package description # # * Mandatory : YES -# * Component : YES # * Default : # #- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or @@ -107,7 +101,6 @@ # .. variable:: CPACK_DEBIAN_PACKAGE_SECTION # # * Mandatory : YES -# * Component : NO # * Default : 'devel' # # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE @@ -116,7 +109,6 @@ # Possible values are: lzma, xz, bzip2 and gzip. # # * Mandatory : YES -# * Component : NO # * Default : 'gzip' # # @@ -125,7 +117,6 @@ # The Debian package priority # # * Mandatory : YES -# * Component : NO # * Default : 'optional' # # @@ -136,7 +127,6 @@ # upstream documentation or information may be found. # # * Mandatory : NO -# * Component : NO # * Default : - # # .. note:: @@ -146,12 +136,12 @@ # # # .. variable:: CPACK_DEBIAN_PACKAGE_SHLIBDEPS +# CPACK_DEBIAN_COMPONENT_PACKAGE_SHLIBDEPS # # May be set to ON in order to use :code:`dpkg-shlibdeps` to generate # better package dependency list. # # * Mandatory : NO -# * Component : YES # * Default : # #- :variable:`CPACK_DEBIAN_PACKAGE_SHLIBDEPS` if set or @@ -171,7 +161,6 @@ # during CPackDeb run. # # * Mandatory : NO -# * Component : NO # * Default : - # # .. variable:: CPACK_DEBIAN_PACKAGE_PREDEPENDS @@ -183,7 +172,6 @@ # pre-dependency. # # * Mandatory : NO -# * Component : NO # * Default : - # # See http://www.debian.org/doc/debian-policy/ch
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-444-g172a217
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 172a21790ba117af6a03e35c69213a89a5cb86f3 (commit)
via ceafbeb10b6ecaeb6e30be58a62025382a3d8cbc (commit)
from b142dcad64a324b652929f426e2ac59a32dde0c8 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=172a21790ba117af6a03e35c69213a89a5cb86f3
commit 172a21790ba117af6a03e35c69213a89a5cb86f3
Merge: b142dca ceafbeb
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Thu Jun 11 17:49:48 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 11 17:49:48 2015 -0400
Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
ceafbeb1 fixup! CPack Deb and RPM RunCMake tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ceafbeb10b6ecaeb6e30be58a62025382a3d8cbc
commit ceafbeb10b6ecaeb6e30be58a62025382a3d8cbc
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Thu Jun 11 23:38:13 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Thu Jun 11 23:38:13 2015 +0200
fixup! CPack Deb and RPM RunCMake tests
Test if there is also RPMBUILD available and
also print out test config file content if
something goes wrong.
diff --git a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
index 69375e2..3416205 100644
--- a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
@@ -5,9 +5,12 @@ function(get_test_prerequirements found_var config_file)
endif()
find_program(RPM_EXECUTABLE rpm)
+ find_program(RPMBUILD_EXECUTABLE rpmbuild)
- if(RPM_EXECUTABLE)
+ if(RPM_EXECUTABLE AND RPMBUILD_EXECUTABLE)
file(WRITE ${config_file} set(RPM_EXECUTABLE \${RPM_EXECUTABLE}\))
+file(APPEND ${config_file}
+\nset(RPMBUILD_EXECUTABLE \${RPMBUILD_EXECUTABLE}\))
set(${found_var} true PARENT_SCOPE)
endif()
endfunction()
diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake
b/Tests/RunCMake/CPack/VerifyResult.cmake
index c89bfae..809011b 100644
--- a/Tests/RunCMake/CPack/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/VerifyResult.cmake
@@ -5,8 +5,10 @@ include(${src_dir}/${GENERATOR_TYPE}/Helpers.cmake)
file(READ ${bin_dir}/test_output.txt output)
file(READ ${bin_dir}/test_error.txt error)
+file(READ ${config_file} config_file_content)
-set(output_error_message \nCPack output: '${output}'\nCPack error:
'${error}')
+set(output_error_message
+\nCPack output: '${output}'\nCPack error: '${error}';\nconfig file:
'${config_file_content}')
# check that expected generated files exist and contain expected content
include(${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-ExpectedFiles.cmake)
---
Summary of changes:
Tests/RunCMake/CPack/RPM/Prerequirements.cmake |5 -
Tests/RunCMake/CPack/VerifyResult.cmake|4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-423-g7c404c8
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 7c404c8261b4d7d2d6c41fcf2aa5c992366997b7 (commit) via 384d6dde2674ff971c4bde5306637b443bc96abf (commit) from 3a10e1458d48b95dd4a064e74e15d3dc7f08c311 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c404c8261b4d7d2d6c41fcf2aa5c992366997b7 commit 7c404c8261b4d7d2d6c41fcf2aa5c992366997b7 Merge: 3a10e14 384d6dd Author: Domen Vrankar domen.vran...@gmail.com AuthorDate: Thu Jun 11 12:02:58 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jun 11 12:02:58 2015 -0400 Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next 384d6dde fixup! CPack Deb and RPM RunCMake tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=384d6dde2674ff971c4bde5306637b443bc96abf commit 384d6dde2674ff971c4bde5306637b443bc96abf Author: Domen Vrankar domen.vran...@gmail.com AuthorDate: Thu Jun 11 18:02:14 2015 +0200 Commit: Domen Vrankar domen.vran...@gmail.com CommitDate: Thu Jun 11 18:02:14 2015 +0200 fixup! CPack Deb and RPM RunCMake tests rpmbuild can only be used if there are no spaces in path diff --git a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake index 51b77a9..69375e2 100644 --- a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake +++ b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake @@ -1,4 +1,9 @@ function(get_test_prerequirements found_var config_file) + if(CMAKE_CURRENT_BINARY_DIR MATCHES ) +# rpmbuild can't handle spaces in path +return() + endif() + find_program(RPM_EXECUTABLE rpm) if(RPM_EXECUTABLE) --- Summary of changes: Tests/RunCMake/CPack/RPM/Prerequirements.cmake |5 + 1 file changed, 5 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-422-g4d73673
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 4d73673ff03d1f60314eac2fde5db6483db2de1c (commit)
via 0bc9f68549ca9d8420e93b1aac0ca88478cf276d (commit)
from 044833f9862b3c5657aff6d5e939f6e1c6cef8ed (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d73673ff03d1f60314eac2fde5db6483db2de1c
commit 4d73673ff03d1f60314eac2fde5db6483db2de1c
Merge: 044833f 0bc9f68
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jun 10 16:16:08 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 10 16:16:08 2015 -0400
Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
0bc9f685 fixup! CPack Deb and RPM RunCMake tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bc9f68549ca9d8420e93b1aac0ca88478cf276d
commit 0bc9f68549ca9d8420e93b1aac0ca88478cf276d
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jun 10 22:15:36 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Wed Jun 10 22:15:36 2015 +0200
fixup! CPack Deb and RPM RunCMake tests
Test was deleting source dir if cmake
was built in-place.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 43df312..74bbf38 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -28,9 +28,9 @@ endmacro()
function(add_RunCMake_test_group test types)
# create directory for common content
- set(BASE_TEST_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${test})
- file(REMOVE_RECURSE ${BASE_TEST_BINARY_DIR})
- file(MAKE_DIRECTORY ${BASE_TEST_BINARY_DIR})
+ set(TEST_CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/${test}/conf)
+ file(REMOVE_RECURSE ${TEST_CONFIG_DIR})
+ file(MAKE_DIRECTORY ${TEST_CONFIG_DIR})
foreach(type IN LISTS types)
# generate prerequirements config file in cmake as ctest doesn't have as
@@ -39,7 +39,7 @@ function(add_RunCMake_test_group test types)
unset(${test}_${type}_FOUND_PREREQUIREMENTS)
include(${CMAKE_CURRENT_SOURCE_DIR}/${test}/${type}/Prerequirements.cmake)
get_test_prerequirements(${test}_${type}_FOUND_PREREQUIREMENTS
-${BASE_TEST_BINARY_DIR}/${type}_config.cmake)
+${TEST_CONFIG_DIR}/${type}_config.cmake)
# only add the test if prerequirements are met
if(${test}_${type}_FOUND_PREREQUIREMENTS)
@@ -52,7 +52,7 @@ function(add_RunCMake_test_group test types)
-DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${type}/${test}
--Dconfig_file=${BASE_TEST_BINARY_DIR}/${type}_config.cmake
+-Dconfig_file=${TEST_CONFIG_DIR}/${type}_config.cmake
-P ${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake
)
endif()
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-418-g3acb236
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 3acb236e86a081e522417b0881f87d08f904ee3d (commit)
via 05358225bec5e483fbc5c39e7b2221c2927aabe5 (commit)
from 91dd5ba7234299e15ea2db9be988c4a9409f1d4b (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3acb236e86a081e522417b0881f87d08f904ee3d
commit 3acb236e86a081e522417b0881f87d08f904ee3d
Merge: 91dd5ba 0535822
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jun 10 11:10:39 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 10 11:10:39 2015 -0400
Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
05358225 fixup! CPack Deb and RPM RunCMake tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05358225bec5e483fbc5c39e7b2221c2927aabe5
commit 05358225bec5e483fbc5c39e7b2221c2927aabe5
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jun 10 17:09:23 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Wed Jun 10 17:09:23 2015 +0200
fixup! CPack Deb and RPM RunCMake tests
Added some extra logging and newer cmake
version enforcing to determine what is
causing RPM tests to fail on some
systems.
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 4ae8992..308b8cc 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -1,4 +1,4 @@
-cmake_policy(SET CMP0011 NEW)
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
include(RunCMake)
include(${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake)
diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake
b/Tests/RunCMake/CPack/VerifyResult.cmake
index 0cc32d4..c89bfae 100644
--- a/Tests/RunCMake/CPack/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/VerifyResult.cmake
@@ -1,8 +1,13 @@
-cmake_policy(SET CMP0007 NEW)
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
include(${config_file})
include(${src_dir}/${GENERATOR_TYPE}/Helpers.cmake)
+file(READ ${bin_dir}/test_output.txt output)
+file(READ ${bin_dir}/test_error.txt error)
+
+set(output_error_message \nCPack output: '${output}'\nCPack error:
'${error}')
+
# check that expected generated files exist and contain expected content
include(${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-ExpectedFiles.cmake)
@@ -22,13 +27,15 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0)
if(NOT expected_content_list)
message(FATAL_ERROR
Unexpected file content for file No. '${file_no_}'!
- Content: '${PACKAGE_CONTENT}')
+ Content: '${PACKAGE_CONTENT}'
+ ${output_error_message})
endif()
else()
message(FATAL_ERROR
Found more than one file for file No. '${file_no_}'!
Found files count '${foundFilesCount_}'.
- Files: '${foundFile_}')
+ Files: '${foundFile_}'
+${output_error_message})
endif()
endforeach()
@@ -43,7 +50,8 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0)
if(NOT foundFilesCount_ EQUAL allFoundFilesCount_)
message(FATAL_ERROR
-Found more files than expected! Found files: '${allFoundFiles_}')
+Found more files than expected! Found files: '${allFoundFiles_}'
+${output_error_message})
endif()
# sanity check that we didn't accidentaly list wrong files with our regular
@@ -54,7 +62,8 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0)
if(found_ EQUAL -1)
message(FATAL_ERROR
Expected files don't match found files! Found files:
- '${allFoundFiles_}')
+ '${allFoundFiles_}'
+ ${output_error_message})
endif()
endforeach()
else()
@@ -63,14 +72,12 @@ else()
file(GLOB checkMissingFiles_ RELATIVE ${bin_dir} ${missing_file_glob_})
if(checkMissingFiles_)
- message(FATAL_ERROR Unexpected files found: '${checkMissingFiles_}')
+ message(FATAL_ERROR Unexpected files found: '${checkMissingFiles_}'
+ ${output_error_message})
endif()
endforeach()
endif()
-file(READ ${bin_dir}/test_output.txt output)
-file(READ ${bin_dir}/test_error.txt error)
-
# handle additional result verifications
if(EXISTS ${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-VerifyResult.cmake)
include(${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-VerifyResult.cmake)
---
Summary of changes:
Tests/RunCMake/CPack/RunCMakeTest.cmake |2 +-
Tests/RunCMake/CPack/VerifyResult.cmake | 25 -
2 files changed, 17 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-383-gf137f00
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 f137f00243965ee0f7312f8fcafb8b233689e199 (commit)
via 568e75e2001297830f836c817b808fc6d5ac12f6 (commit)
from 63b7ee1583b6ae3cdf5566b90d86454730ed61c3 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f137f00243965ee0f7312f8fcafb8b233689e199
commit f137f00243965ee0f7312f8fcafb8b233689e199
Merge: 63b7ee1 568e75e
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Jun 9 17:26:22 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 9 17:26:22 2015 -0400
Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
568e75e2 Fixup! CPack Deb and RPM RunCMake tests
diff --cc Tests/RunCMake/CMakeLists.txt
index 646eb71,43df312..eee7bb4
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -258,5 -261,6 +261,7 @@@ endif(
if(${CMAKE_GENERATOR} MATCHES Make|Ninja)
add_executable(pseudo_iwyu pseudo_iwyu.c)
add_RunCMake_test(IncludeWhatYouUse
-DPSEUDO_IWYU=$TARGET_FILE:pseudo_iwyu)
+ add_RunCMake_test(CompilerLauncher)
endif()
+
+ add_RunCMake_test_group(CPack DEB;RPM)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=568e75e2001297830f836c817b808fc6d5ac12f6
commit 568e75e2001297830f836c817b808fc6d5ac12f6
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Jun 9 23:24:08 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Tue Jun 9 23:24:08 2015 +0200
Fixup! CPack Deb and RPM RunCMake tests
CTest has less information about the environment as
CMake so prerequirements such as programs should
be set in CMake. Example where this was a problem
is MAC OS where /sw/bin is not necessarily in path
but dpkg program is detected there by CMake while
CTest misses it.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 4a4f54f..43df312 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -27,20 +27,35 @@ macro(add_RunCMake_test test)
endmacro()
function(add_RunCMake_test_group test types)
- set(Test_Dir ${test})
+ # create directory for common content
+ set(BASE_TEST_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${test})
+ file(REMOVE_RECURSE ${BASE_TEST_BINARY_DIR})
+ file(MAKE_DIRECTORY ${BASE_TEST_BINARY_DIR})
foreach(type IN LISTS types)
-add_test(NAME RunCMake.${test}_${type} COMMAND ${CMAKE_CMAKE_COMMAND}
- -DTEST_TYPE=${type}
- -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
- -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
- -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
- -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
- -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
- -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
- -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${type}/${test}
- -P ${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake
- )
+# generate prerequirements config file in cmake as ctest doesn't have as
+# much system information so it is easier to set programs and environment
+# values here
+unset(${test}_${type}_FOUND_PREREQUIREMENTS)
+
include(${CMAKE_CURRENT_SOURCE_DIR}/${test}/${type}/Prerequirements.cmake)
+get_test_prerequirements(${test}_${type}_FOUND_PREREQUIREMENTS
+${BASE_TEST_BINARY_DIR}/${type}_config.cmake)
+
+# only add the test if prerequirements are met
+if(${test}_${type}_FOUND_PREREQUIREMENTS)
+ add_test(NAME RunCMake.${test}_${type} COMMAND ${CMAKE_CMAKE_COMMAND}
+-DTEST_TYPE=${type}
+-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
+-DRunCMake_GENERATOR=${CMAKE_GENERATOR}
+-DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+-DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
+-DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
+-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
+-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${type}/${test}
+-Dconfig_file=${BASE_TEST_BINARY_DIR}/${type}_config.cmake
+-P ${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake
+)
+endif()
endforeach()
endfunction()
@@ -224,18 +239,6 @@ add_RunCMake_test(IfacePaths_INCLUDE_DIRECTORIES TEST_DIR
IfacePaths)
set(IfacePaths_SOURCES_ARGS -DTEST_PROP=SOURCES)
add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
-# CPack related tests
-if(RPMBUILD_EXECUTABLE)
- list(APPEND CPACK_TEST_GENERATORS RPM)
-endif()
-
-if(DPKG_EXECUTABLE)
- list(APPEND
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-405-g3e1342f
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 3e1342f66a7e77baeced473728b4c87edc2bf338 (commit)
via 48f303b26f68fdfc0ac6edbdd075030ec37993ea (commit)
from b997ce4c9f57ca3b50cb93937930728b59a69f5c (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e1342f66a7e77baeced473728b4c87edc2bf338
commit 3e1342f66a7e77baeced473728b4c87edc2bf338
Merge: b997ce4 48f303b
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Jun 9 19:00:33 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 9 19:00:33 2015 -0400
Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
48f303b2 fixup! CPack Deb and RPM RunCMake tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48f303b26f68fdfc0ac6edbdd075030ec37993ea
commit 48f303b26f68fdfc0ac6edbdd075030ec37993ea
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jun 10 00:59:47 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Wed Jun 10 00:59:47 2015 +0200
fixup! CPack Deb and RPM RunCMake tests
Test was failing with error
Policy CMP0011 is not set to NEW
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index e4027ab..4ae8992 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -1,3 +1,5 @@
+cmake_policy(SET CMP0011 NEW)
+
include(RunCMake)
include(${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake)
---
Summary of changes:
Tests/RunCMake/CPack/RunCMakeTest.cmake |2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-133-g24bc47b
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 24bc47b6ac2b29d32157d56a05c92b17af9cbbcf (commit)
via 8b4b2ca686abfbc4f74496c2c6a17c1fe3f646c2 (commit)
via 5aec9ec2daa282453fffd8d382876f467936a277 (commit)
from f6cb54884b64cac39a4a6799c3572c84997c7dc8 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24bc47b6ac2b29d32157d56a05c92b17af9cbbcf
commit 24bc47b6ac2b29d32157d56a05c92b17af9cbbcf
Merge: f6cb548 8b4b2ca
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Fri Jun 5 15:19:10 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 5 15:19:10 2015 -0400
Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
8b4b2ca6 CPack RPM PARTIALLY_RELOCATABLE_WARNING test move
5aec9ec2 CPack Deb and RPM RunCMake tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b4b2ca686abfbc4f74496c2c6a17c1fe3f646c2
commit 8b4b2ca686abfbc4f74496c2c6a17c1fe3f646c2
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Fri Jun 5 21:12:08 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Fri Jun 5 21:12:08 2015 +0200
CPack RPM PARTIALLY_RELOCATABLE_WARNING test move
Moved PARTIALLY_RELOCATABLE_WARNING test
to new common CPack test script structure
to have all tests in one place as well
as additional benefit of having some more
checks done during test execution.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 86e6009..4a4f54f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -226,7 +226,6 @@ add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
# CPack related tests
if(RPMBUILD_EXECUTABLE)
- add_RunCMake_test(CPackRPM)
list(APPEND CPACK_TEST_GENERATORS RPM)
endif()
diff --git
a/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake
b/Tests/RunCMake/CPack/PARTIALLY_RELOCATABLE_WARNING.cmake
similarity index 100%
rename from Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake
rename to Tests/RunCMake/CPack/PARTIALLY_RELOCATABLE_WARNING.cmake
diff --git
a/Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake
new file mode 100644
index 000..4e01f7b
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake
@@ -0,0 +1,5 @@
+set(whitespaces_ [\t\n\r ]*)
+
+set(EXPECTED_FILES_COUNT 1)
+set(EXPECTED_FILE_1 PARTIALLY_RELOCATABLE_WARNING-0.1.1-*.rpm)
+set(EXPECTED_FILE_CONTENT_1
^/not_relocatable${whitespaces_}/not_relocatable/CMakeLists.txt${whitespaces_}/opt$)
diff --git
a/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt
b/Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-stderr.txt
similarity index 100%
rename from
Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt
rename to Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-stderr.txt
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index a7b6060..e4027ab 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -3,3 +3,4 @@ include(${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake)
# args: TEST_NAME GENERATORS RUN_CMAKE_BUILD_STEP
run_cpack_test(MINIMAL RPM;DEB false)
+run_cpack_test(PARTIALLY_RELOCATABLE_WARNING RPM false)
diff --git a/Tests/RunCMake/CPackRPM/CMakeLists.txt
b/Tests/RunCMake/CPackRPM/CMakeLists.txt
deleted file mode 100644
index b7d170b..000
--- a/Tests/RunCMake/CPackRPM/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
-
-set(CPACK_GENERATOR RPM)
-include(CPack)
diff --git a/Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
b/Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
deleted file mode 100644
index 1935e32..000
--- a/Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-include(RunCMake)
-
-function(run_cpack_rpm_test TEST_NAME)
- set(RunCMake_TEST_NO_CLEAN TRUE)
- set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${TEST_NAME}-build)
- file(REMOVE_RECURSE ${RunCMake_TEST_BINARY_DIR})
- file(MAKE_DIRECTORY ${RunCMake_TEST_BINARY_DIR})
- execute_process(
-COMMAND ${CMAKE_COMMAND} -D RunCMake_TEST=${TEST_NAME}
${RunCMake_SOURCE_DIR}
-WORKING_DIRECTORY ${RunCMake_TEST_BINARY_DIR}
-OUTPUT_QUIET
-ERROR_QUIET
-)
- run_cmake_command(${TEST_NAME} ${CMAKE_CPACK_COMMAND
[Cmake-commits] CMake branch, next, updated. v3.2.2-2768-g76f0c56
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 76f0c560fbbfa31b0868c6acedb9c32890529c69 (commit) via efab80501e2ac04da93d0662de37a6e9b4683c56 (commit) from 07d66feed56f99707914506ea25c29873864ae7e (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76f0c560fbbfa31b0868c6acedb9c32890529c69 commit 76f0c560fbbfa31b0868c6acedb9c32890529c69 Merge: 07d66fe efab805 Author: Domen Vrankar domen.vran...@gmail.com AuthorDate: Fri May 15 17:09:26 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri May 15 17:09:26 2015 -0400 Merge topic 'cpack-deb-reworked-docs' into next efab8050 CPack/DEB: reworked documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efab80501e2ac04da93d0662de37a6e9b4683c56 commit efab80501e2ac04da93d0662de37a6e9b4683c56 Author: Raffi Enficiaud raffi.enfici...@mines-paris.org AuthorDate: Fri May 15 23:06:43 2015 +0200 Commit: Domen Vrankar domen.vran...@gmail.com CommitDate: Fri May 15 23:07:49 2015 +0200 CPack/DEB: reworked documentation diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 0ccb042..226153c 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -28,29 +28,33 @@ # # .. variable:: CPACK_DEBIAN_PACKAGE_NAME # +# The Debian package summary +# # * Mandatory : YES -# * Default : CPACK_PACKAGE_NAME (lower case) +# * Default : :variable:`CPACK_PACKAGE_NAME` (lower case) # -# The debian package summary # # .. variable:: CPACK_DEBIAN_PACKAGE_VERSION # +# The Debian package version +# # * Mandatory : YES -# * Default : CPACK_PACKAGE_VERSION +# * Default : :variable:`CPACK_PACKAGE_VERSION` # -# The debian package version # # .. variable:: CPACK_DEBIAN_PACKAGE_ARCHITECTURE # +# The Debian package architecture +# # * Mandatory : YES -# * Default : Output of dpkg --print-architecture (or i386 if dpkg is not found) +# * Default : Output of :code:`dpkg --print-architecture` (or :code:`i386` +#if :code:`dpkg` is not found) # -# The debian package architecture # # .. variable:: CPACK_DEBIAN_PACKAGE_DEPENDS # CPACK_DEBIAN_COMPONENT_PACKAGE_DEPENDS # -# May be used to set deb dependencies. +# Sets the Debian dependencies of this package. # # * Mandatory : NO # * Default : @@ -64,7 +68,7 @@ #If :variable:`CPACK_DEBIAN_PACKAGE_SHLIBDEPS` or #more specifically :variable:`CPACK_DEBIAN_COMPONENT_PACKAGE_SHLIBDEPS` #is set for this component, the discovered dependencies will be appended -#to :variable:`CPACK_DEBIAN_COMPONENT_PACKAGE_DEPENDS` intead of +#to :variable:`CPACK_DEBIAN_COMPONENT_PACKAGE_DEPENDS` instead of #:variable:`CPACK_DEBIAN_PACKAGE_DEPENDS`. If #:variable:`CPACK_DEBIAN_COMPONENT_PACKAGE_DEPENDS` is an empty string, #only the automatically discovered dependencies will be set for this @@ -76,15 +80,16 @@ # # .. variable:: CPACK_DEBIAN_PACKAGE_MAINTAINER # +# The Debian package maintainer +# # * Mandatory : YES -# * Default : CPACK_PACKAGE_CONTACT +# * Default : :code:`CPACK_PACKAGE_CONTACT` # -# The debian package maintainer # # .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION # CPACK_COMPONENT_COMPONENT_DESCRIPTION # -# The debian package description +# The Debian package description # # * Mandatory : YES # * Default : @@ -92,6 +97,7 @@ #- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or #- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` # +# # .. variable:: CPACK_DEBIAN_PACKAGE_SECTION # # * Mandatory : YES @@ -99,33 +105,40 @@ # # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE # +# The compression used for creating the Debian package. +# Possible values are: lzma, xz, bzip2 and gzip. +# # * Mandatory : YES # * Default : 'gzip' # -# Possible values are: lzma, xz, bzip2 and gzip. # # .. variable:: CPACK_DEBIAN_PACKAGE_PRIORITY # +# The Debian package priority +# # * Mandatory : YES # * Default : 'optional' # -# The debian package priority # # .. variable:: CPACK_DEBIAN_PACKAGE_HOMEPAGE # -# * Mandatory : NO -# * Default : - -# # The URL of the web site for this package, preferably (when applicable) the # site from which the original source can be obtained and any additional # upstream documentation or information may be found. -# The content of this field is a simple URL without any surrounding -# characters such as . +# +# * Mandatory : NO +# * Default : - +# +# .. note:: +# +#The content of this field is a simple URL without any surrounding +#characters
