[Cmake-commits] CMake branch, next, updated. v2.8.7-2955-g75a32d8

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  75a32d8d43ff574021cc71ac18b90c9dce58f646 (commit)
       via  5663e436abe7395f4269ba8269d2a869e0b83fab (commit)
       via  4fd479816da0a0ff21c6634ea7c82ff27b321b85 (commit)
       via  26519d591ea28d3f26f34c625c2d57db6f302d63 (commit)
      from  ab273783b49f4d3d9b72c5c1d3f83c31638fb425 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75a32d8d43ff574021cc71ac18b90c9dce58f646
commit 75a32d8d43ff574021cc71ac18b90c9dce58f646
Merge: ab27378 5663e43
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 29 10:30:54 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 29 10:30:54 2012 -0500

    Merge topic 'dragndrop-sla' into next
    
    5663e43 DragNDrop: Fix problem with relocated files in Xcode 4.3
    4fd4798 KWSys Nightly Date Stamp
    26519d5 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5663e436abe7395f4269ba8269d2a869e0b83fab
commit 5663e436abe7395f4269ba8269d2a869e0b83fab
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 29 08:29:46 2012 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Feb 29 08:29:46 2012 -0700

    DragNDrop: Fix problem with relocated files in Xcode 4.3
    
    Remove dependency on /Developer/Headers/FlatCarbon when creating SLAs for DMG images.
    Instead, of adding those .r files on the command line, include the necessary .r files
    from the generated .r file.

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 83b6b64..3b6135e 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -421,6 +421,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     if(ifs.is_open())
     {
       cmGeneratedFileStream osf(sla_r.c_str());
+      osf << "#include <CoreServices/CoreServices.r>\n\n";
       osf << SLAHeader;
       osf << "\n";
       osf << "data 'TEXT' (5002, \"English\") {\n";
@@ -481,13 +482,11 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
  
     // Rez the SLA 
     cmOStringStream embed_sla_command;
-    embed_sla_command << "/bin/bash -c \"";   // need expansion of "*.r"
     embed_sla_command << this->GetOption("CPACK_COMMAND_REZ");
-    embed_sla_command << " /Developer/Headers/FlatCarbon/*.r ";
-    embed_sla_command << "'" << sla_r << "'";
+    embed_sla_command << " \"" << sla_r << "\"";
     embed_sla_command << " -a -o ";
-    embed_sla_command << "'" << temp_udco << "'\"";
-    
+    embed_sla_command << "\"" << temp_udco << "\"";
+
     if(!this->RunCommand(embed_sla_command, &error))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |    9 ++++-----
 Source/kwsys/kwsysDateStamp.cmake          |    2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake