? bundle_generator_mount_point.patch
? bundle_generator_test.patch
Index: Source/CPack/cmCPackBundleGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackBundleGenerator.cxx,v
retrieving revision 1.3
diff -u -r1.3 cmCPackBundleGenerator.cxx
--- Source/CPack/cmCPackBundleGenerator.cxx	18 Jul 2008 20:12:36 -0000	1.3
+++ Source/CPack/cmCPackBundleGenerator.cxx	22 Aug 2008 00:06:00 -0000
@@ -154,7 +154,7 @@
     return 0;
     }
 
-  // Install a user-provided bundle icon ...
+  // Install a required, user-provided bundle icon ...
   cmOStringStream icon_source;
   icon_source << cpack_bundle_icon;
 
@@ -170,7 +170,7 @@
     return 0;
     }
 
-  // Install a user-provided startup command (could be an executable or a
+  // Install a required, user-provided startup command (could be an executable or a
   // script) ...
   cmOStringStream command_source;
   command_source << cpack_bundle_startup_command;
@@ -238,23 +238,31 @@
     return 0;
     }
 
-  // Optionally set the custom icon flag for the image ...
+  // If the user provided a custom volume icon, we have to jump through some hoops:
+  // 
+  // * Mount the temporary disk image
+  // * Set a flag to enable the custom icon
+  // * Unmount the image
   if(!cpack_package_icon.empty())
     {
     cmOStringStream temp_mount;
-    temp_mount << this->GetOption("CPACK_TOPLEVEL_DIRECTORY") << "/mnt";
+    temp_mount << "/tmp/" << this->GetOption("CPACK_PACKAGE_FILE_NAME");
     cmSystemTools::MakeDirectory(temp_mount.str().c_str());
 
     cmOStringStream attach_command;
     attach_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     attach_command << " attach";
     attach_command << " -mountpoint \"" << temp_mount.str() << "\"";
+    attach_command << " -noverify";
+    attach_command << " -noautoopen";
+    attach_command << " -noautofsck";
     attach_command << " \"" << temp_image.str() << "\"";
 
     if(!this->RunCommand(attach_command))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
-        "Error attaching temporary disk image."
+        "Error attaching temporary disk image to"
+        << temp_mount.str()
         << std::endl);
 
       return 0;

diff -dur source/Source/CPack/cmCPackBundleGenerator.cxx cmake-patch/Source/CPack/cmCPackBundleGenerator.cxx
--- source/Source/CPack/cmCPackBundleGenerator.cxx	2009-01-08 13:00:31.322952596 +0000
+++ cmake-patch/Source/CPack/cmCPackBundleGenerator.cxx	2009-01-08 12:56:17.458952637 +0000
@@ -19,6 +19,8 @@
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 
+#include <cmsys/RegularExpression.hxx>
+
 //----------------------------------------------------------------------
 cmCPackBundleGenerator::cmCPackBundleGenerator()
 {
@@ -245,16 +247,14 @@
   if(!cpack_package_icon.empty())
     {
     cmOStringStream temp_mount;
-    temp_mount << this->GetOption("CPACK_TOPLEVEL_DIRECTORY") << "/mnt";
-    cmSystemTools::MakeDirectory(temp_mount.str().c_str());
 
     cmOStringStream attach_command;
     attach_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     attach_command << " attach";
-    attach_command << " -mountpoint \"" << temp_mount.str() << "\"";
     attach_command << " \"" << temp_image.str() << "\"";
 
-    if(!this->RunCommand(attach_command))
+    std::string attach_output;
+    if(!this->RunCommand(attach_command, &attach_output))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
         "Error attaching temporary disk image."
@@ -263,6 +263,10 @@
       return 0;
       }
 
+    cmsys::RegularExpression mountpoint_regex(".*(/Volumes/.*)\n");
+    mountpoint_regex.find(attach_output.c_str());
+    temp_mount << mountpoint_regex.match(1);
+
     cmOStringStream setfile_command;
     setfile_command << this->GetOption("CPACK_COMMAND_SETFILE");
     setfile_command << " -a C";
@@ -335,14 +339,14 @@
 }
 
 //----------------------------------------------------------------------
-bool cmCPackBundleGenerator::RunCommand(cmOStringStream& command)
+bool cmCPackBundleGenerator::RunCommand(cmOStringStream& command, 
+  std::string* output)
 {
-  std::string output;
   int exit_code = 1;
 
   bool result = cmSystemTools::RunSingleCommand(
     command.str().c_str(),
-    &output,
+    output,
     &exit_code,
     0,
     this->GeneratorVerbose,
diff -dur source/Source/CPack/cmCPackBundleGenerator.h cmake-patch/Source/CPack/cmCPackBundleGenerator.h
--- source/Source/CPack/cmCPackBundleGenerator.h	2009-01-08 13:00:31.322952596 +0000
+++ cmake-patch/Source/CPack/cmCPackBundleGenerator.h	2009-01-08 12:56:17.458952637 +0000
@@ -41,7 +41,7 @@
     const std::vector<std::string>& files);
 
   bool CopyFile(cmOStringStream& source, cmOStringStream& target);
-  bool RunCommand(cmOStringStream& command);
+  bool RunCommand(cmOStringStream& command, std::string* output = 0);
 
   std::string InstallPrefix;
 };