[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-576-g0c98146
Kitware Robot
kwrobot at kitware.com
Sat Mar 25 09:25:19 EDT 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 0c981463d280f73eadf546f9b760d2a8cdfbb4d7 (commit)
via 914a4e6c17bdace4a0ab857071ce461a62d4fbef (commit)
via 6c09c5d64cad9c7d1c6be414ce918ac2d090b864 (commit)
from 85994c65a43f0a171e5e52afcb6eef0031a87744 (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=0c981463d280f73eadf546f9b760d2a8cdfbb4d7
commit 0c981463d280f73eadf546f9b760d2a8cdfbb4d7
Merge: 85994c6 914a4e6
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Mar 25 13:17:12 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Mar 25 09:18:02 2017 -0400
Stage topic 'cpack-rpm-debuginfo-honor-package-filename'
Topic-id: 23243
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/620
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=914a4e6c17bdace4a0ab857071ce461a62d4fbef
commit 914a4e6c17bdace4a0ab857071ce461a62d4fbef
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Mar 24 22:41:02 2017 +0100
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Mar 25 11:34:18 2017 +0100
CPack/RPM: support for debuginfo package renaming
diff --git a/Help/release/dev/cpack-rpm-debuginfo-honor-package-filename.rst b/Help/release/dev/cpack-rpm-debuginfo-honor-package-filename.rst
new file mode 100644
index 0000000..1c6eb2b
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-debuginfo-honor-package-filename.rst
@@ -0,0 +1,5 @@
+cpack-rpm-debuginfo-honor-package-filename
+------------------------------------------
+
+* The :module:`CPackRPM` module learned to modify debuginfo package name.
+ See :variable:`CPACK_RPM_DEBUGINFO_FILE_NAME` variable.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index a81719e..6dd3143 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -825,6 +825,30 @@
# is set then :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is automatically set to
# ``ON`` when :variable:`CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE` is set.
#
+# .. variable:: CPACK_RPM_DEBUGINFO_FILE_NAME
+# CPACK_RPM_<component>_DEBUGINFO_FILE_NAME
+#
+# Debuginfo package file name.
+#
+# * Mandatory : NO
+# * Default : rpmbuild tool generated package file name
+#
+# Alternatively provided debuginfo package file name must end with ``.rpm``
+# suffix and should differ from file names of other generated packages.
+#
+# Variable may contain ``@cpack_rpm_component@`` placeholder which will be
+# replaced by component name if component packaging is enabled otherwise it
+# deletes the placeholder.
+#
+# Setting the variable to ``RPM-DEFAULT`` may be used to explicitly set
+# filename generation to default.
+#
+# .. note::
+#
+# :variable:`CPACK_RPM_FILE_NAME` also supports rpmbuild tool generated package
+# file name - disabled by default but can be enabled by setting the variable to
+# ``RPM-DEFAULT``.
+#
# Packaging of sources (SRPM)
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^
#
@@ -2653,6 +2677,22 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
list(APPEND filenames_ "${CPACK_RPM_FILE_NAME}")
endif()
+ if(CPACK_RPM_DEBUGINFO_PACKAGE)
+ cpack_rpm_variable_fallback("CPACK_RPM_DEBUGINFO_FILE_NAME"
+ "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_DEBUGINFO_FILE_NAME"
+ "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DEBUGINFO_FILE_NAME"
+ "CPACK_RPM_DEBUGINFO_FILE_NAME")
+
+ if(CPACK_RPM_DEBUGINFO_FILE_NAME AND
+ NOT CPACK_RPM_DEBUGINFO_FILE_NAME STREQUAL "RPM-DEFAULT")
+ list(APPEND expected_filenames_
+ "${CPACK_RPM_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}.*\\.rpm")
+ string(REPLACE "@cpack_rpm_component@" "${CPACK_RPM_PACKAGE_COMPONENT}"
+ CPACK_RPM_DEBUGINFO_FILE_NAME "${CPACK_RPM_DEBUGINFO_FILE_NAME}")
+ list(APPEND filenames_ "${CPACK_RPM_DEBUGINFO_FILE_NAME}")
+ endif()
+ endif()
+
# check if other files have to be renamed
file(GLOB rename_files_ "${CPACK_RPM_DIRECTORY}/SPECS/*.rpm_name")
if(rename_files_)
diff --git a/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
index 2948a1b..3d8de74 100644
--- a/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
+++ b/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
@@ -14,6 +14,5 @@ set(EXPECTED_FILE_CONTENT_3_LIST "/usr;/usr/bas;/usr/bas/libtest_lib.so")
set(EXPECTED_FILE_4_NAME "Debuginfo")
set(EXPECTED_FILE_4_COMPONENT "applications-debuginfo")
set(EXPECTED_FILE_CONTENT_4 ".*/src${whitespaces_}/src/src_1${whitespaces_}/src/src_1/main.cpp.*")
-set(EXPECTED_FILE_5_NAME "Debuginfo")
-set(EXPECTED_FILE_5_COMPONENT "libs-debuginfo")
+set(EXPECTED_FILE_5 "libs-DebugInfoPackage.rpm")
set(EXPECTED_FILE_CONTENT_5 ".*/src${whitespaces_}/src/src_1${whitespaces_}/src/src_1/test_lib.cpp.*")
diff --git a/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
index cfae259..83931fa 100644
--- a/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
+++ b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
@@ -32,4 +32,9 @@ set(CPACK_RPM_PACKAGE_NAME "Debuginfo")
set(CPACK_PACKAGE_FILE_NAME "TestDinfo-pkg")
set(CPACK_RPM_LIBS_DEBUGINFO_PACKAGE ON)
+# test debuginfo package rename
+set(CPACK_RPM_DEBUGINFO_FILE_NAME
+ "@cpack_rpm_component at -DebugInfoPackage.rpm")
+set(CPACK_RPM_APPLICATIONS_DEBUGINFO_FILE_NAME "RPM-DEFAULT")
+
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/src")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c09c5d64cad9c7d1c6be414ce918ac2d090b864
commit 6c09c5d64cad9c7d1c6be414ce918ac2d090b864
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Mar 23 23:36:47 2017 +0100
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Mar 24 19:52:02 2017 +0100
CPack/RPM honor package file name on debuginfo enabled
Packages with debuginfo enabled should
still honor defined package file name
if file name is not set to RPM-DEFAULT.
Fixes #16715
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 2e69195..a81719e 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2648,8 +2648,8 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
unset(expected_filenames_)
unset(filenames_)
if(CPACK_RPM_DEBUGINFO_PACKAGE AND NOT CPACK_RPM_FILE_NAME STREQUAL "RPM-DEFAULT")
- string(TOLOWER "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.*\\.rpm" efn_)
- list(APPEND expected_filenames_ "${efn_}")
+ list(APPEND expected_filenames_
+ "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.*\\.rpm")
list(APPEND filenames_ "${CPACK_RPM_FILE_NAME}")
endif()
diff --git a/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
index 06e56d3..2948a1b 100644
--- a/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
+++ b/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
@@ -3,14 +3,17 @@ set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "5")
set(EXPECTED_FILES_NAME_GENERATOR_SPECIFIC_FORMAT TRUE)
+set(EXPECTED_FILE_1_NAME "Debuginfo")
set(EXPECTED_FILE_1_COMPONENT "applications")
set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/test_prog")
-set(EXPECTED_FILE_2 "debuginfo*-headers.rpm")
+set(EXPECTED_FILE_2 "TestDinfo-pkg*-headers.rpm")
set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
-set(EXPECTED_FILE_3 "debuginfo*-libs.rpm")
+set(EXPECTED_FILE_3 "TestDinfo-pkg*-libs.rpm")
set(EXPECTED_FILE_CONTENT_3_LIST "/usr;/usr/bas;/usr/bas/libtest_lib.so")
+set(EXPECTED_FILE_4_NAME "Debuginfo")
set(EXPECTED_FILE_4_COMPONENT "applications-debuginfo")
set(EXPECTED_FILE_CONTENT_4 ".*/src${whitespaces_}/src/src_1${whitespaces_}/src/src_1/main.cpp.*")
+set(EXPECTED_FILE_5_NAME "Debuginfo")
set(EXPECTED_FILE_5_COMPONENT "libs-debuginfo")
set(EXPECTED_FILE_CONTENT_5 ".*/src${whitespaces_}/src/src_1${whitespaces_}/src/src_1/test_lib.cpp.*")
diff --git a/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
index 0642d83..cfae259 100644
--- a/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
+++ b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
@@ -25,6 +25,11 @@ install(TARGETS test_lib DESTINATION bas COMPONENT libs)
set(CPACK_RPM_APPLICATIONS_FILE_NAME "RPM-DEFAULT")
set(CPACK_RPM_APPLICATIONS_DEBUGINFO_PACKAGE ON)
+
+# test that components with debuginfo enabled still honor
+# CPACK_PACKAGE_FILE_NAME setting
+set(CPACK_RPM_PACKAGE_NAME "Debuginfo")
+set(CPACK_PACKAGE_FILE_NAME "TestDinfo-pkg")
set(CPACK_RPM_LIBS_DEBUGINFO_PACKAGE ON)
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/src")
-----------------------------------------------------------------------
Summary of changes:
.../cpack-rpm-debuginfo-honor-package-filename.rst | 5 +++
Modules/CPackRPM.cmake | 44 +++++++++++++++++++-
.../CPack/tests/DEBUGINFO/ExpectedFiles.cmake | 8 ++--
Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake | 10 +++++
4 files changed, 62 insertions(+), 5 deletions(-)
create mode 100644 Help/release/dev/cpack-rpm-debuginfo-honor-package-filename.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list