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..0000000
--- 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_<COMPONENT>_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_<COMPONENT>_PACKAGE_DESCRIPTION
+# CPACK_COMPONENT_<COMPONENT>_DESCRIPTION
#
# The Debian package description
#
# * Mandatory : YES
# * Default :
#
-# - :variable:`CPACK_COMPONENT_<compName>_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_<COMPONENT>_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.GenericDescription.txt")
- file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}"
CPACK_DEBIAN_PACKAGE_DESCRIPTION)
- elseif(CPACK_PACKAGE_DESCRIPTION_SUMMARY)
- set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
"${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
- 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")
+ 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_description_var}")
+ endif()
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
endif()
endif()
diff --git
a/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description1.cmake.in
b/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description1.cmake.in
index 6c5a655..74d816c 100644
--- a/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description1.cmake.in
+++ b/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description1.cmake.in
@@ -15,8 +15,8 @@ set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
#set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1)
# overriding previous descriptions
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "main description")
-set(CPACK_DEBIAN_APPLICATIONS_PACKAGE_DESCRIPTION "applications_description")
-set(CPACK_COMPONENT_HEADERS_DESCRIPTION "headers_description")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "main description")
+set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "applications_description")
+set(CPACK_COMPONENT_HEADERS_DESCRIPTION "headers_description")
# libraries does not have any description and should inherit from
CPACK_PACKAGE_DESCRIPTION_SUMMARY
unset(CPACK_COMPONENT_LIBRARIES_DESCRIPTION)
diff --git
a/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description2.cmake.in
b/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description2.cmake.in
index 92226d8..cda79bc 100644
--- a/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description2.cmake.in
+++ b/Tests/CPackComponentsDEB/MyLibCPackConfig-components-description2.cmake.in
@@ -17,12 +17,10 @@ set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
# overriding previous descriptions
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "main description 2")
-# and override CPACK_PACKAGE_DESCRIPTION_SUMMARY because of precedence
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "@CPackComponentsDEB_SOURCE_DIR@/pkg_description.txt")
-
# Components do not have any description
unset(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION)
unset(CPACK_COMPONENT_HEADERS_DESCRIPTION)
+unset(CPACK_COMPONENT_LIBRARIES_DESCRIPTION)
+
set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION "library description")
diff --git
a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake
b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake
index 7b94ca0..35ca74c 100644
---
a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake
+++
b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake
@@ -55,12 +55,12 @@ if(DPKGDEB_EXECUTABLE)
message(STATUS "package='${dpkg_package_name}',
description='${dpkg_description}'")
if("${dpkg_package_name}" STREQUAL "mylib-applications")
- if(NOT "${dpkg_description}" STREQUAL "Debian package description file")
+ if(NOT "${dpkg_description}" STREQUAL "main description 2")
set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all}
"dpkg-deb: ${_f}: Incorrect description
for package ${dpkg_package_name}: ${dpkg_description} !=
applications_description")
endif()
elseif("${dpkg_package_name}" STREQUAL "mylib-headers")
- if(NOT "${dpkg_description}" STREQUAL "Debian package description file")
+ if(NOT "${dpkg_description}" STREQUAL "main description 2")
set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all}
"dpkg-deb: ${_f}: Incorrect description
for package ${dpkg_package_name}: ${dpkg_description} != headers_description")
endif()
diff --git a/Tests/CPackComponentsDEB/pkg_description.txt
b/Tests/CPackComponentsDEB/pkg_description.txt
deleted file mode 100644
index 99f8f9b..0000000
--- a/Tests/CPackComponentsDEB/pkg_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Debian package description file
-----------------------------------------------------------------------
Summary of changes:
.../dev/cpack-deb-package-description-fallback.rst | 15 -------
Modules/CPackDeb.cmake | 43 ++++++++++----------
Source/CMakeVersion.cmake | 2 +-
...LibCPackConfig-components-description1.cmake.in | 6 +--
...LibCPackConfig-components-description2.cmake.in | 6 +--
...CPackVerifyResult-components-description2.cmake | 4 +-
Tests/CPackComponentsDEB/pkg_description.txt | 1 -
7 files changed, 29 insertions(+), 48 deletions(-)
delete mode 100644 Help/release/dev/cpack-deb-package-description-fallback.rst
delete mode 100644 Tests/CPackComponentsDEB/pkg_description.txt
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
