[Cmake-commits] [cmake-commits] hoffman committed cmCPackBundleGenerator.cxx 1.2.2.4 1.2.2.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv19604/Source/CPack

Modified Files:
      Tag: CMake-2-6
	cmCPackBundleGenerator.cxx 
Log Message:
ENH: merge fixes for RC 6


Index: cmCPackBundleGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackBundleGenerator.cxx,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C 2 -d -r1.2.2.4 -r1.2.2.5
*** cmCPackBundleGenerator.cxx	24 Oct 2008 15:18:55 -0000	1.2.2.4
--- cmCPackBundleGenerator.cxx	31 Dec 2008 15:14:30 -0000	1.2.2.5
***************
*** 114,133 ****
      }
  
-   const std::string cpack_bundle_startup_command = 
-     this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") ? 
-     this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") : "";
-   if(cpack_bundle_startup_command.empty())
-     {
-     cmCPackLogger(cmCPackLog::LOG_ERROR,
-       "CPACK_BUNDLE_STARTUP_COMMAND must be set."
-       << std::endl);
- 
-     return 0;
-     }
- 
    // Get optional arguments ...
    const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON") 
      ? this->GetOption("CPACK_PACKAGE_ICON") : "";
  
    // The staging directory contains everything that will end-up inside the
    // final disk image ...
--- 114,125 ----
      }
  
    // Get optional arguments ...
    const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON") 
      ? this->GetOption("CPACK_PACKAGE_ICON") : "";
  
+   const std::string cpack_bundle_startup_command = 
+     this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") 
+     ? this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") : "";
+ 
    // The staging directory contains everything that will end-up inside the
    // final disk image ...
***************
*** 177,199 ****
      }
  
!   // Install a user-provided startup command (could be an executable or a
!   // script) ...
!   cmOStringStream command_source;
!   command_source << cpack_bundle_startup_command;
  
!   cmOStringStream command_target;
!   command_target << application.str() << "/" << cpack_bundle_name;
  
!   if(!this->CopyFile(command_source, command_target))
!     {
!     cmCPackLogger(cmCPackLog::LOG_ERROR,
!                   "Error copying startup command. "
!                   " Check the value of CPACK_BUNDLE_STARTUP_COMMAND."
!       << std::endl);
  
!     return 0;
!     }
  
!   cmSystemTools::SetPermissions(command_target.str().c_str(), 0777);
  
    // Add a symlink to /Applications so users can drag-and-drop the bundle
--- 169,194 ----
      }
  
!   // Optionally a user-provided startup command (could be an
!   // executable or a script) ...
!   if(!cpack_bundle_startup_command.empty())
!     {
!     cmOStringStream command_source;
!     command_source << cpack_bundle_startup_command;
  
!     cmOStringStream command_target;
!     command_target << application.str() << "/" << cpack_bundle_name;
  
!     if(!this->CopyFile(command_source, command_target))
!       {
!       cmCPackLogger(cmCPackLog::LOG_ERROR,
!                     "Error copying startup command. "
!                     " Check the value of CPACK_BUNDLE_STARTUP_COMMAND."
!         << std::endl);
  
!       return 0;
!       }
  
!     cmSystemTools::SetPermissions(command_target.str().c_str(), 0777);
!     }
  
    // Add a symlink to /Applications so users can drag-and-drop the bundle