[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6826-g128da9c

[Brad King]

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  128da9c8e3aac950f595498244bed9511a658e9d (commit)
       via  e361c3cb18254a61ed86d21ef6b3e3b53b4316b3 (commit)
       via  93fc5a53a6252e1ef14894b7e6eb8e69c20858b6 (commit)
       via  2d23c1f1777b38d4b704872598ae6bf1ecd88db9 (commit)
      from  26ada5d7be2a45ee4f48fd2b59ce4c65d1e1bb0b (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=128da9c8e3aac950f595498244bed9511a658e9d
commit 128da9c8e3aac950f595498244bed9511a658e9d
Merge: 26ada5d e361c3c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 7 14:48:36 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 7 14:48:36 2014 -0500

    Merge topic 'xcode-storyboard-file-type' into next
    
    e361c3c Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-type
    93fc5a5 Xcode: Fix storyboard view
    2d23c1f Xcode: Fix storyboard view


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e361c3cb18254a61ed86d21ef6b3e3b53b4316b3
commit e361c3cb18254a61ed86d21ef6b3e3b53b4316b3
Merge: 2d23c1f 93fc5a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 7 14:28:30 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 7 14:28:30 2014 -0500

    Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-type
    
    Resolve conflict in Source/cmGlobalXCodeGenerator.cxx by keeping
    our side.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93fc5a53a6252e1ef14894b7e6eb8e69c20858b6
commit 93fc5a53a6252e1ef14894b7e6eb8e69c20858b6
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Tue Jan 7 22:52:42 2014 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 7 14:10:55 2014 -0500

    Xcode: Fix storyboard view
    
    Since commit 56831461 (Xcode: Use explicitFileType to mark source types,
    2013-04-16) the Xcode generator prefers to use explicitFileType to tell
    Xcode about each source file type.  This works better than
    lastKnownFileType for some file types, but not for "file.storyboard".
    
    If storyboard file has attribute 'explicitFileType' it is displayed
    incorrectly (as raw xml).  Switch it back to 'lastKnownFileType'.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 0a2b32b..c181c59 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -877,8 +877,10 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
     }
 
   std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
-
-  fileRef->AddAttribute("explicitFileType",
+  const char* attribute = (sourcecode == "file.storyboard") ?
+                           "lastKnownFileType" :
+                           "explicitFileType";
+  fileRef->AddAttribute(attribute,
                         this->CreateString(sourcecode.c_str()));
 
   // Store the file path relative to the top of the source tree.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d23c1f1777b38d4b704872598ae6bf1ecd88db9
commit 2d23c1f1777b38d4b704872598ae6bf1ecd88db9
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Tue Jan 7 22:52:42 2014 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 7 14:07:32 2014 -0500

    Xcode: Fix storyboard view
    
    Since commit 56831461 (Xcode: Use explicitFileType to mark source types,
    2013-04-16) the Xcode generator prefers to use explicitFileType to tell
    Xcode about each source file type.  This works better than
    lastKnownFileType for some file types, but not for "file.storyboard".
    
    If storyboard file has attribute 'explicitFileType' it is displayed
    incorrectly (as raw xml).  Switch it back to 'lastKnownFileType'.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 381c1f5..eef49db 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -876,7 +876,10 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
   else
     {
     std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
-    fileRef->AddAttribute("explicitFileType",
+    const char* attribute = (sourcecode == "file.storyboard") ?
+                             "lastKnownFileType" :
+                             "explicitFileType";
+    fileRef->AddAttribute(attribute,
                           this->CreateString(sourcecode.c_str()));
     }
 

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake