kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert topic 'cpack-package-empty-dirs' 

The changes in commit 47b060ae (CPackDeb: allow empty directories in
component packages, 2015-09-21), commit b58de9fe (CPack: allow packaging
of empty directories, 2015-09-21), and commit b761e90d (CPack: remove
accidental changes, 2015-09-22) regressed packaging of CMake itself.
Revert the changes until they can be revised and rebased on other
changes that make additional fixes.
This commit is contained in:
Brad King 2015-09-25 11:52:32 -04:00
parent b761e90d70
commit 4fa1755315
16 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Help/release/dev/cpack-package-empty-dirs.rts
View File

@ -1,4 +0,0 @@
cpack-package-empty-dirs
------------------------
* The :module:`CPack` module learned to package empty directories.

2
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -95,7 +95,6 @@ int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel,
std::string findExpr(this->GetOption("GEN_WDIR")); std::string findExpr(this->GetOption("GEN_WDIR"));
findExpr += "/*"; findExpr += "/*";
gl.RecurseOn(); gl.RecurseOn();
gl.SetRecurseListDirs(true);
if ( !gl.FindFiles(findExpr) ) if ( !gl.FindFiles(findExpr) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
@ -223,7 +222,6 @@ int cmCPackDebGenerator::PackageComponentsAllInOne()
std::string findExpr(this->GetOption("GEN_WDIR")); std::string findExpr(this->GetOption("GEN_WDIR"));
findExpr += "/*"; findExpr += "/*";
gl.RecurseOn(); gl.RecurseOn();
gl.SetRecurseListDirs(true);
if ( !gl.FindFiles(findExpr) ) if ( !gl.FindFiles(findExpr) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,

4
Source/CPack/cmCPackGenerator.cxx
View File

@ -367,7 +367,6 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
cmCPackLogger(cmCPackLog::LOG_OUTPUT, cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Install directory: " << top << std::endl); "- Install directory: " << top << std::endl);
gl.RecurseOn(); gl.RecurseOn();
gl.SetRecurseListDirs(true);
if ( !gl.FindFiles(findExpr) ) if ( !gl.FindFiles(findExpr) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
@ -870,7 +869,6 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
cmsys::Glob glB; cmsys::Glob glB;
findExpr += "/*"; findExpr += "/*";
glB.RecurseOn(); glB.RecurseOn();
glB.SetRecurseListDirs(true);
glB.FindFiles(findExpr); glB.FindFiles(findExpr);
filesBefore = glB.GetFiles(); filesBefore = glB.GetFiles();
std::sort(filesBefore.begin(),filesBefore.end()); std::sort(filesBefore.begin(),filesBefore.end());
@ -910,7 +908,6 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
{ {
cmsys::Glob glA; cmsys::Glob glA;
glA.RecurseOn(); glA.RecurseOn();
glA.SetRecurseListDirs(true);
glA.FindFiles(findExpr); glA.FindFiles(findExpr);
std::vector<std::string> filesAfter = glA.GetFiles(); std::vector<std::string> filesAfter = glA.GetFiles();
std::sort(filesAfter.begin(),filesAfter.end()); std::sort(filesAfter.begin(),filesAfter.end());
@ -1077,7 +1074,6 @@ int cmCPackGenerator::DoPackage()
std::string findExpr = tempDirectory; std::string findExpr = tempDirectory;
findExpr += "/*"; findExpr += "/*";
gl.RecurseOn(); gl.RecurseOn();
gl.SetRecurseListDirs(true);
gl.SetRecurseThroughSymlinks(false); gl.SetRecurseThroughSymlinks(false);
if ( !gl.FindFiles(findExpr) ) if ( !gl.FindFiles(findExpr) )
{ {

21
Source/cmSystemTools.cxx
View File

@ -895,33 +895,12 @@ std::string cmSystemTools::FileExistsInParentDirectories(const char* fname,
bool cmSystemTools::cmCopyFile(const char* source, const char* destination) bool cmSystemTools::cmCopyFile(const char* source, const char* destination)
{ {
// FIXME remove if statement once kwsys SystemTools get support for
// source is directory handling in CopyFileAlways function
if(cmSystemTools::FileIsDirectory(source))
{
return Superclass::MakeDirectory(destination);
}
return Superclass::CopyFileAlways(source, destination); return Superclass::CopyFileAlways(source, destination);
} }
bool cmSystemTools::CopyFileIfDifferent(const char* source, bool cmSystemTools::CopyFileIfDifferent(const char* source,
const char* destination) const char* destination)
{ {
// FIXME remove if statement once kwsys SystemTools get support for
// source is directory handling in CopyFileIfDifferent function
if(cmSystemTools::FileIsDirectory(source))
{
if(SystemTools::FileExists(destination))
{
return true;
}
else
{
return Superclass::MakeDirectory(destination);
}
}
return Superclass::CopyFileIfDifferent(source, destination); return Superclass::CopyFileIfDifferent(source, destination);
} }

3
Tests/CPackComponentsDEB/CMakeLists.txt
View File

@ -110,8 +110,9 @@ install(FILES ${CPackComponentsDEB_BINARY_DIR}/symtest
if(EXISTS "./dirtest") if(EXISTS "./dirtest")
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ./dirtest) execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ./dirtest)
endif() endif()
# NOTE: directory left empty on purpose
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ./dirtest) execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ./dirtest)
# BUG: apparently cannot add an empty directory
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../mylibapp ./dirtest/symtest)
# NOTE: we should not add the trailing "/" to dirtest # NOTE: we should not add the trailing "/" to dirtest
install(DIRECTORY ${CPackComponentsDEB_BINARY_DIR}/dirtest install(DIRECTORY ${CPackComponentsDEB_BINARY_DIR}/dirtest
DESTINATION bin/ DESTINATION bin/

5
Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake
View File

@ -1,5 +0,0 @@
set(CPACK_COMPONENTS_ALL test)
install(DIRECTORY DESTINATION empty
COMPONENT test)
set(CPACK_PACKAGE_NAME "components_empty_dir")

5
Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
View File

@ -1,5 +0,0 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_1 "components_empty_dir*.deb")
set(EXPECTED_FILE_CONTENT_1 "^.*/usr/${whitespaces_}.*/usr/empty/$")

2
Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake
View File

@ -1,2 +0,0 @@
set(CPACK_PACKAGE_CONTACT "someone")
set(CPACK_DEB_COMPONENT_INSTALL "ON")

5
Tests/RunCMake/CPack/DEB/EMPTY_DIR-ExpectedFiles.cmake
View File

@ -1,5 +0,0 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_1 "empty_dir*.deb")
set(EXPECTED_FILE_CONTENT_1 "^.*/usr/${whitespaces_}.*/usr/empty/$")

1
Tests/RunCMake/CPack/DEB/EMPTY_DIR-specifics.cmake
View File

@ -1 +0,0 @@
set(CPACK_PACKAGE_CONTACT "someone")

4
Tests/RunCMake/CPack/EMPTY_DIR.cmake
View File

@ -1,4 +0,0 @@
install(DIRECTORY DESTINATION empty
COMPONENT test)
set(CPACK_PACKAGE_NAME "empty_dir")

5
Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
View File

@ -1,5 +0,0 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_1 "components_empty_dir*.rpm")
set(EXPECTED_FILE_CONTENT_1 "^/usr/empty$")

1
Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-stderr.txt
View File

@ -1 +0,0 @@
^CPackRPM: Will use GENERATED spec file: .*/Tests/RunCMake/RPM/CPack/COMPONENTS_EMPTY_DIR-build/_CPack_Packages/.*/RPM/SPECS/components_empty_dir.spec$

5
Tests/RunCMake/CPack/RPM/EMPTY_DIR-ExpectedFiles.cmake
View File

@ -1,5 +0,0 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_1 "empty_dir*.rpm")
set(EXPECTED_FILE_CONTENT_1 "^/usr/empty$")

1
Tests/RunCMake/CPack/RPM/EMPTY_DIR-stderr.txt
View File

@ -1 +0,0 @@
^CPackRPM: Will use GENERATED spec file: .*/Tests/RunCMake/RPM/CPack/EMPTY_DIR-build/_CPack_Packages/.*/RPM/SPECS/empty_dir.spec$

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

@ -8,5 +8,3 @@ run_cpack_test(MINIMAL "RPM;DEB" false)
run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false) run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false)
run_cpack_test(DEB_EXTRA "DEB" false) run_cpack_test(DEB_EXTRA "DEB" false)
run_cpack_test(DEPENDENCIES "RPM;DEB" true) run_cpack_test(DEPENDENCIES "RPM;DEB" true)
run_cpack_test(EMPTY_DIR "RPM;DEB" true)
run_cpack_test(COMPONENTS_EMPTY_DIR "RPM;DEB" true)