mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPack/DragNDrop: Prevent hdiutil "resource is busy" failures

Browse Source 
Run `sync` to finish pending filesystem operations before running `hdiutil`.

Fixes: #27136
This commit is contained in:
Gonzalo Garramuño
2025-08-15 09:44:38 -03:00
committed by Brad King
parent ced6ca50f1
commit ef739edd20
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/CPack/cmCPackDragNDropGenerator.cxx
View File

@@ -76,6 +76,14 @@ int cmCPackDragNDropGenerator::InitializeInternal()
paths.emplace_back("/Applications/Xcode.app/Contents/Developer/Tools");
paths.emplace_back("/Developer/Tools");
std::string const sync_path = cmSystemTools::FindProgram("sync");
if (sync_path.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Cannot locate sync command" << std::endl);
return 0;
}
this->SetOptionIfNotSet("CPACK_COMMAND_SYNC", sync_path);
std::string const hdiutil_path = cmSystemTools::FindProgram("hdiutil");
if (hdiutil_path.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -415,6 +423,16 @@ int cmCPackDragNDropGenerator::CreateDMG(std::string const& src_dir,
std::string temp_image =
cmStrCat(this->GetOption("CPACK_TOPLEVEL_DIRECTORY"), "/temp.dmg");
// Finish filesystem operations before writing disk image.
std::string sync_command = this->GetOption("CPACK_COMMAND_SYNC");
std::string sync_error;
if (!this->RunCommand(sync_command, &sync_error)) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error running sync command." << std::endl
<< sync_error << std::endl);
return 0;
}
std::string create_error;
auto temp_image_command =
cmStrCat(this->GetOption("CPACK_COMMAND_HDIUTIL"),