reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-13 22:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'cpack-deb-md5sums-paths-fix'

Browse Source 
6daa2d38 CPack/Deb invalid md5sums file fix
This commit is contained in:
Brad King 2017-01-10 09:34:52 -05:00 committed by CMake Topic Stage
commit 2c8eb2696a
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -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());

1
Tests/RunCMake/CPack/RunCMakeTest.cmake
View File

@ -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")

2
Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake Normal file
View File

@ -0,0 +1,2 @@
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")

3
Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake Normal file
View File

@ -0,0 +1,3 @@
set(whitespaces_ "[\t\n\r ]*")
set(md5sums_md5sums "^.* usr/foo/CMakeLists\.txt${whitespaces_}$")
verifyDebControl("${FOUND_FILE_1}" "md5sums" "md5sums")

5
Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake Normal file
View File

@ -0,0 +1,5 @@
install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
if(PACKAGING_TYPE STREQUAL "COMPONENT")
set(CPACK_COMPONENTS_ALL test)
endif()