Add mac_framework_private_headers key to specify which headers should be copi...

pylib/gyp/generator/xcode.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 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.
 
 import filecmp
 import gyp.common
 import gyp.xcodeproj_file
 import errno
@@ skipping 41 matching lines @@
   'RULE_INPUT_NAME': '$(INPUT_FILE_NAME)',
   'RULE_INPUT_PATH': '$(INPUT_FILE_PATH)',
   'SHARED_INTERMEDIATE_DIR': '$(%s)' % _shared_intermediate_var,
   'CONFIGURATION_NAME': '$(CONFIGURATION)',
 }
 
 # The Xcode-specific sections that hold paths.
 generator_additional_path_sections = [
   'mac_bundle_resources',
   'mac_framework_headers',
+  'mac_framework_private_headers',
   # 'mac_framework_dirs', input already handles _dirs endings.
 ]
 
 # The Xcode-specific keys that exist on targets and aren't moved down to
 # configurations.
 generator_additional_non_configuration_keys = [
   'mac_bundle',
   'mac_bundle_resources',
   'mac_framework_headers',
+  'mac_framework_private_headers',
   'xcode_create_dependents_test_runner',
 ]
 
 # We want to let any rules apply to files that are resources also.
 generator_extra_sources_for_rules = [
   'mac_bundle_resources',
   'mac_framework_headers',
+  'mac_framework_private_headers',
 ]
 
 
 def CreateXCConfigurationList(configuration_names):
   xccl = gyp.xcodeproj_file.XCConfigurationList({'buildConfigurations': []})
   if len(configuration_names) == 0:
     configuration_names = ['Default']
   for configuration_name in configuration_names:
     xcbc = gyp.xcodeproj_file.XCBuildConfiguration({
         'name': configuration_name})
@@ skipping 440 matching lines @@
     # go into the project file, just not as part of a build phase.
     pbxp.AddOrGetFileInRootGroup(source)
 
 
 def AddResourceToTarget(resource, pbxp, xct):
   # TODO(mark): Combine with AddSourceToTarget above?  Or just inline this call
   # where it's used.
   xct.ResourcesPhase().AddFile(resource)
 
 
-def AddHeaderToTarget(header, pbxp, xct):
+def AddHeaderToTarget(header, pbxp, xct, is_public):
   # TODO(mark): Combine with AddSourceToTarget above?  Or just inline this call
   # where it's used.
-  xct.HeadersPhase().AddFile(header, '{ATTRIBUTES = (Public, ); }')
+  settings = '{ATTRIBUTES = (Private, ); }'

[Mark Mentovai, 2011/03/03 17:02:21]

I’m going to make a small change here when I check it in. I’m going to transform
these three lines into
  settings = '{ATTRIBUTES = (%s, ); }' % ('Private', 'Public')[is_public]
which combines Python’s built-in string formatting with a ternary operator
equivalent.

+  if is_public:
+    settings = '{ATTRIBUTES = (Public, ); }'
+  xct.HeadersPhase().AddFile(header, settings)
 
 
 _xcode_variable_re = re.compile('(\$\((.*?)\))')
 def ExpandXcodeVariables(string, expansions):
   """Expands Xcode-style $(VARIABLES) in string per the expansions dict.
 
   In some rare cases, it is appropriate to expand Xcode variables when a
   project file is generated.  For any substring $(VAR) in string, if VAR is a
   key in the expansions dict, $(VAR) will be replaced with expansions[VAR].
   Any $(VAR) substring in string for which VAR is not a key in the expansions
@@ skipping 493 matching lines @@
     # Add "sources".
     for source in spec.get('sources', []):
       (source_root, source_extension) = posixpath.splitext(source)
       if source_extension[1:] not in rules_by_ext:
         # AddSourceToTarget will add the file to a root group if it's not
         # already there.
         AddSourceToTarget(source, pbxp, xct)
       else:
         pbxp.AddOrGetFileInRootGroup(source)
 
-    # Add "mac_bundle_resources" and "mac_framework_headers" if it's a bundle
-    # of any type.
+    # Add "mac_bundle_resources", "mac_framework_headers", and
+    # "mac_framework_private_headers" if it's a bundle of any type.
     if is_bundle:
       for resource in tgt_mac_bundle_resources:
         (resource_root, resource_extension) = posixpath.splitext(resource)
         if resource_extension[1:] not in rules_by_ext:
           AddResourceToTarget(resource, pbxp, xct)
         else:
           pbxp.AddOrGetFileInRootGroup(resource)
 
       for header in spec.get('mac_framework_headers', []):
-        AddHeaderToTarget(header, pbxp, xct)
+        AddHeaderToTarget(header, pbxp, xct, True)
+
+      for header in spec.get('mac_framework_private_headers', []):
+        AddHeaderToTarget(header, pbxp, xct, False)
 
     # Add "copies".
     for copy_group in spec.get('copies', []):
       pbxcp = gyp.xcodeproj_file.PBXCopyFilesBuildPhase({
             'name': 'Copy to ' + copy_group['destination']
           },
           parent=xct)
       dest = copy_group['destination']
       if dest[0] not in ('/', '$'):
         # Relative paths are relative to $(SRCROOT).
         dest = '$(SRCROOT)/' + dest
       pbxcp.SetDestination(dest)
 
       # TODO(mark): The usual comment about this knowing too much about
       # gyp.xcodeproj_file internals applies.
       xct._properties['buildPhases'].insert(prebuild_index, pbxcp)
 
       for file in copy_group['files']:
         pbxcp.AddFile(file)
 
     # Excluded files can also go into the project file.
     if not skip_excluded_files:
-      for key in ['sources', 'mac_bundle_resources', 'mac_framework_headers']:
+      for key in ['sources', 'mac_bundle_resources', 'mac_framework_headers',
+                  'mac_framework_private_headers']:
         excluded_key = key + '_excluded'
         for item in spec.get(excluded_key, []):
           pbxp.AddOrGetFileInRootGroup(item)
 
     # So can "inputs" and "outputs" sections of "actions" groups.
     groups = ['inputs', 'inputs_excluded', 'outputs', 'outputs_excluded']
     if skip_excluded_files:
       groups = [x for x in groups if not x.endswith('_excluded')]
     for action in spec.get('actions', []):
       for group in groups:
@@ skipping 80 matching lines @@
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize1(xcode_targets, serialize_all_tests)
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize2(xcode_targets,
                                          xcode_target_to_target_dict)
 
   for build_file in build_files:
     xcode_projects[build_file].Write()