[Cmake-commits] [cmake-commits] david.cole committed OSXLauncherScript.scpt NONE 1.1 cmCPackOSXX11Generator.cxx 1.5 1.6

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 21 11:54:32 EST 2009


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

Modified Files:
	cmCPackOSXX11Generator.cxx 
Added Files:
	OSXLauncherScript.scpt 
Log Message:
BUG: Fix issue #7833: Add file extension handling to CPack generated installers for OSXX11 applications. Also modify the X11 test to build such an installer on Mac builds that test CPack and have X11 available. Thanks to Wes Turner for the patch.


Index: cmCPackOSXX11Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackOSXX11Generator.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmCPackOSXX11Generator.cxx	31 Oct 2007 12:50:17 -0000	1.5
--- cmCPackOSXX11Generator.cxx	21 Jan 2009 16:54:30 -0000	1.6
***************
*** 90,97 ****
--- 90,102 ----
    std::string resourcesDirectory = contentsDirectory + "/Resources";
    std::string appDirectory = contentsDirectory + "/MacOS";
+   std::string scriptDirectory = resourcesDirectory + "/Scripts";
+   std::string resourceFileName = this->GetOption("CPACK_PACKAGE_FILE_NAME");
+   resourceFileName += ".rsrc";
  
    const char* dir = resourcesDirectory.c_str();
    const char* appdir = appDirectory.c_str();
+   const char* scrDir = scriptDirectory.c_str();
    const char* contDir = contentsDirectory.c_str();
+   const char* rsrcFile = resourceFileName.c_str();
    const char* iconFile = this->GetOption("CPACK_PACKAGE_ICON");
    if ( iconFile )
***************
*** 125,128 ****
--- 130,137 ----
      !this->CopyResourcePlistFile("OSXX11.Info.plist", contDir,
        "Info.plist" ) ||
+     !this->CopyResourcePlistFile("OSXX11.main.scpt", scrDir,
+       "main.scpt", true ) ||
+     !this->CopyResourcePlistFile("OSXScriptLauncher.rsrc", dir, 
+       rsrcFile, true) ||
      !this->CopyResourcePlistFile("OSXScriptLauncher", appdir, 
        this->GetOption("CPACK_PACKAGE_FILE_NAME"), true)

--- NEW FILE: OSXLauncherScript.scpt ---
(This appears to be a binary file; contents omitted.)



More information about the Cmake-commits mailing list