[Cmake-commits] CMake branch, next, updated. v3.7.1-1834-ga1d713f

[Domen Vrankar]

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.vrankar at gmail.com>
AuthorDate: Tue Dec 20 17:17:14 2016 -0500
Commit:     CMake Topic Stage <kwrobot at 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.vrankar at gmail.com>
AuthorDate: Tue Dec 20 23:08:52 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at 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 0000000..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 0000000..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 0000000..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/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake |    0
 Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake            |    3 +++
 Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake                    |    5 +++++
 5 files changed, 13 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake (100%)
 create mode 100644 Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake


hooks/post-receive
-- 
CMake