[Cmake-commits] CMake branch, next, updated. v3.7.1-1923-g1f2f6e0
Domen Vrankar
domen.vrankar at gmail.com
Tue Jan 10 02:31:42 EST 2017
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.vrankar at gmail.com>
AuthorDate: Tue Jan 10 02:31:41 2017 -0500
Commit: CMake Topic Stage <kwrobot at 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.vrankar at gmail.com>
AuthorDate: Tue Jan 10 08:28:17 2017 +0100
Commit: Domen Vrankar <domen.vrankar at 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.vrankar at gmail.com>
AuthorDate: Tue Jan 10 08:28:16 2017 +0100
Commit: Domen Vrankar <domen.vrankar at 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
'<test_name>/<generator_name>-stdout.txt' regular expression and
and '<test_name>/<generator_name>-stderr.txt' regular expresson respectively.
-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: '<generator_name>-<packaging_type>-<subtest_name>-std<type>.txt'
- where <type> can either be 'out' or 'err'.
- File name format: '<generator_name>-<packaging_type>-std<type>.txt'
- where <type> can either be 'out' or 'err'.
+NOTE: For subtests generator name can also be suffixed with subtest name and in
+ such case subtest file is preferred.
File name format: '<generator_name>-<subtest_name>-std<type>.txt' where
<type> can either be 'out' or 'err'.
NOTE: If none of the comparison files are present then the default generator
@@ -233,4 +223,3 @@ To add a new generator we must
- if needed add 'default_expected_std<type>.txt' files where <type> 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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9775228dabb1424d2f8d1a250c5a0e6ffad47b1
commit d9775228dabb1424d2f8d1a250c5a0e6ffad47b1
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 08:28:06 2017 +0100
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 08:28:06 2017 +0100
Revert "CPack/RPM test - custom binary spec file handling"
This reverts commit 699ce812f43553bb6b6732141d62e77716ad8726.
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index d550ec7..3077340 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,7 +4,6 @@ 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
deleted file mode 100644
index 694dc00..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index e6d86d0..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-^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
deleted file mode 100644
index d7bb7af..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index db0ac6f..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- 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@
-
- at TMP_RPM_URL@
- at TMP_RPM_REQUIRES@
- at TMP_RPM_REQUIRES_PRE@
- at TMP_RPM_REQUIRES_POST@
- at TMP_RPM_REQUIRES_PREUN@
- at TMP_RPM_REQUIRES_POSTUN@
- at TMP_RPM_PROVIDES@
- at TMP_RPM_OBSOLETES@
- at TMP_RPM_CONFLICTS@
- at TMP_RPM_SUGGESTS@
- at TMP_RPM_AUTOPROV@
- at TMP_RPM_AUTOREQ@
- at TMP_RPM_AUTOREQPROV@
- at TMP_RPM_BUILDARCH@
- at TMP_RPM_PREFIXES@
-
- at TMP_RPM_DEBUGINFO@
-
-%define _rpmdir %_topdir/RPMS
-%define _srcrpmdir %_topdir/SRPMS
- at FILE_NAME_DEFINE@
-%define _unpackaged_files_terminate_build 0
- at TMP_RPM_SPEC_INSTALL_POST@
- at CPACK_RPM_SPEC_MORE_DEFINE@
- at CPACK_RPM_COMPRESSION_TYPE_TMP@
-
-%description
- at CPACK_RPM_PACKAGE_DESCRIPTION@
-
-# This is a shortcutted spec file generated by CMake RPM generator
-# we skip _install step because CPack does that for us.
-# We do only save CPack installed tree in _prepr
-# and then restore it in build.
-%prep
-mv $RPM_BUILD_ROOT %_topdir/tmpBBroot
-
-%install
-if [ -e $RPM_BUILD_ROOT ];
-then
- rm -rf $RPM_BUILD_ROOT
-fi
-mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
-
- at TMP_RPM_DEBUGINFO_INSTALL@
-
-%clean
-
-%post
- at RPM_SYMLINK_POSTINSTALL@
- at CPACK_RPM_SPEC_POSTINSTALL@
-
-%postun
- at CPACK_RPM_SPEC_POSTUNINSTALL@
-
-%pre
- at CPACK_RPM_SPEC_PREINSTALL@
-
-%preun
- at CPACK_RPM_SPEC_PREUNINSTALL@
-
-%files
-%defattr(@TMP_DEFAULT_FILE_PERMISSIONS@, at TMP_DEFAULT_USER@, at TMP_DEFAULT_GROUP@, at TMP_DEFAULT_DIR_PERMISSIONS@)
- at CPACK_RPM_INSTALL_FILES@
- at CPACK_RPM_ABSOLUTE_INSTALL_FILES@
- at CPACK_RPM_USER_INSTALL_FILES@
-
-%changelog
- at CPACK_RPM_SPEC_CHANGELOG@
-
- at TMP_OTHER_COMPONENTS@
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
deleted file mode 100644
index a604863..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
-
-if(PACKAGING_TYPE STREQUAL "MONOLITHIC")
- set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
-elseif(PACKAGING_TYPE STREQUAL "COMPONENT")
- install(FILES CMakeLists.txt DESTINATION bar COMPONENT test2)
- set(CPACK_RPM_TEST_USER_BINARY_SPECFILE
- "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
-endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackRPM.cmake | 3 +-
Tests/RunCMake/CPack/CPackTestHelpers.cmake | 6 +-
Tests/RunCMake/CPack/README.txt | 15 +---
Tests/RunCMake/CPack/RunCMakeTest.cmake | 1 -
.../CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake | 9 ---
.../RPM-COMPONENT-stderr.txt | 2 -
.../RPM-MONOLITHIC-stderr.txt | 1 -
.../tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in | 80 --------------------
.../CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake | 9 ---
9 files changed, 4 insertions(+), 122 deletions(-)
delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list