Add complete list of copy types to PBXCopyFilesBuildPhase.

pylib/gyp/xcodeproj_file.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Xcode project file generator.
 
 This module is both an Xcode project file generator and a documentation of the
 Xcode project file format.  Knowledge of the project file format was gained
 based on extensive experience with Xcode, and by making changes to projects in
 Xcode.app and observing the resultant changes in the associated project files.
@@ skipping 1928 matching lines @@
 class PBXCopyFilesBuildPhase(XCBuildPhase):
   _schema = XCBuildPhase._schema.copy()
   _schema.update({
     'dstPath':          [0, str, 0, 1],
     'dstSubfolderSpec': [0, int, 0, 1],
     'name':             [0, str, 0, 0],
   })
 
   # path_tree_re matches "$(DIR)/path" or just "$(DIR)".  Match group 1 is
   # "DIR", match group 3 is "path" or None.
-  path_tree_re = re.compile('^\\$\\((.*)\\)(/(.*)|)$')
+  path_tree_re = re.compile('^\\$\\((.*?)\\)(/(.*)|)$')
 
   # path_tree_to_subfolder maps names of Xcode variables to the associated
   # dstSubfolderSpec property value used in a PBXCopyFilesBuildPhase object.
   path_tree_to_subfolder = {
-    'BUILT_PRODUCTS_DIR': 16,  # Products Directory
-    # Other types that can be chosen via the Xcode UI.
-    # TODO(mark): Map Xcode variable names to these.
-    # : 1,  # Wrapper
-    # : 6,  # Executables: 6
-    # : 7,  # Resources
-    # : 15,  # Java Resources
-    # : 10,  # Frameworks
-    # : 11,  # Shared Frameworks
-    # : 12,  # Shared Support
-    # : 13,  # PlugIns
+    # Types that can be chosen via the Xcode UI.
+    'BUILT_PRODUCTS_DIR':               16,  # Products Directory

[Mark Mentovai, 2014/08/13 17:56:43]

Can you sort this list a little bit better?

+    'WRAPPER_NAME':                      1,  # Wrapper
+    # Although Xcode's friendly name is "Executables", the destination
+    # is demonstrably the value of the build setting
+    # EXECUTABLE_FOLDER_PATH not EXECUTABLES_FOLDER_PATH.
+    'EXECUTABLE_FOLDER_PATH':            6,  # Executables.

[Mark Mentovai, 2014/08/13 17:56:43]

No period at the end of this comment.

+    'UNLOCALIZED_RESOURCES_FOLDER_PATH': 7,  # Resources
+    'JAVA_FOLDER_PATH':                 15,  # Java Resources
+    'FRAMEWORKS_FOLDER_PATH':           10,  # Frameworks
+    'SHARED_FRAMEWORKS_FOLDER_PATH':    11,  # Shared Frameworks
+    'SHARED_SUPPORT_FOLDER_PATH':       12,  # Shared Support
+    'PLUGINS_FOLDER_PATH':              13,  # PlugIns
+    # For XPC Services, Xcode sets both dstPath and dstSubfolderSpec.
+    # Note that it re-uses the BUILT_PRODUCTS_DIR value for
+    # dstSubfolderSpec. dstPath is set below.
+    'XPCSERVICES_FOLDER_PATH':          16,  # XPC Services.
   }
 
   def Name(self):
     if 'name' in self._properties:
       return self._properties['name']
 
     return 'CopyFiles'
 
   def FileGroup(self, path):
     return self.PBXProjectAncestor().RootGroupForPath(path)
 
   def SetDestination(self, path):
     """Set the dstSubfolderSpec and dstPath properties from path.
 
     path may be specified in the same notation used for XCHierarchicalElements,
     specifically, "$(DIR)/path".
     """
 
     path_tree_match = self.path_tree_re.search(path)
     if path_tree_match:
       # Everything else needs to be relative to an Xcode variable.
       path_tree = path_tree_match.group(1)
       relative_path = path_tree_match.group(3)
+      separator = '/'

[Mark Mentovai, 2014/08/13 17:56:43]

I think that separator is '/' if match group 2 is not empty, and '' if it is.
It’s subtly different from using match group 3.

 
       if path_tree in self.path_tree_to_subfolder:
         subfolder = self.path_tree_to_subfolder[path_tree]
         if relative_path is None:
           relative_path = ''
+          separator = ''
+        if path_tree == 'XPCSERVICES_FOLDER_PATH':
+          relative_path = '$(CONTENTS_FOLDER_PATH)/XPCServices' \
+                          + separator + relative_path
       else:
         # The path starts with an unrecognized Xcode variable
         # name like $(SRCROOT).  Xcode will still handle this
         # as an "absolute path" that starts with the variable.
         subfolder = 0
         relative_path = path
     elif path.startswith('/'):
       # Special case.  Absolute paths are in dstSubfolderSpec 0.
       subfolder = 0
       relative_path = path[1:]
@@ skipping 878 matching lines @@
       self._XCPrint(file, 0, '/* Begin ' + class_name + ' section */\n')
       for object in sorted(objects_by_class[class_name],
                            cmp=lambda x, y: cmp(x.id, y.id)):
         object.Print(file)
       self._XCPrint(file, 0, '/* End ' + class_name + ' section */\n')
 
     if self._should_print_single_line:
       self._XCPrint(file, 0, '}; ')
     else:
       self._XCPrint(file, 1, '};\n')