Add xcode_ninja_target_pattern to xcode-ninja generator

pylib/gyp/xcode_ninja.py

 # Copyright (c) 2014 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-ninja wrapper project file generator.
 
 This updates the data structures passed to the Xcode gyp generator to build
 with ninja instead. The Xcode project itself is transformed into a list of
 executable targets, each with a build step to build with ninja, and a target
 with every source and resource file.  This appears to sidestep some of the
@@ skipping 94 matching lines @@
           new_xcode_settings['CONFIGURATION_BUILD_DIR'],
           target_name,
         ],
         'message': 'Compile and copy %s via ninja' % target_name,
       },
     ]
     if jobs > 0:
       ninja_target['actions'][0]['action'].extend(('-j', jobs))
   return ninja_target
 
+def IsValidTargetForWrapper(target_additions, target_filter, spec):
+  """Limit targets for Xcode wrapper.
+
+  Xcode seems to perform poorly with too many targets, so only included

[Mark Mentovai, 2014/04/15 16:55:46]

included -> include

[justincohen, 2014/04/15 17:21:05]

Done.

+  proper executable targets, with filters to customize.
+  Arguments:
+    target_additions: Regular expression to always add, matching any target.
+    target_filter: Regular expression limiting executable targets.
+    spec: Specifications for target.
+  """
+  target_name = spec.get('target_name')
+  # Always include targets matching target_additions.
+  if target_additions is not None and re.search(target_additions, target_name):
+    return True
+
+  # Otherwise just show executable targets.
+  if spec.get('type', '') == 'executable' and \
+     spec.get('product_extension', '') != 'bundle':
+
+    # If there is a filter and the target does not match, exclude the target.
+    if target_filter is not None:
+      if not re.search(target_filter, target_name):
+        return False;
+    return True;

[Mark Mentovai, 2014/04/15 16:55:46]

No semicolons. Previous and next lines too.

[justincohen, 2014/04/15 17:21:05]

Done.

+  return False;
+
 def CreateWrapper(target_list, target_dicts, data, params):
   """Initialize targets for the ninja wrapper.
 
   This sets up the necessary variables in the targets to generate Xcode projects
   that use ninja as an external builder.
   Arguments:
     target_list: List of target pairs: 'base/base.gyp:base'.
     target_dicts: Dict of target properties keyed on target pair.
     data: Dict of flattened build files keyed on gyp path.
     params: Dict of global options for gyp.
@@ skipping 16 matching lines @@
   new_target_dicts = {}
   new_data = {}
 
   # Set base keys needed for |data|.
   new_data[main_gyp] = {}
   new_data[main_gyp]['included_files'] = []
   new_data[main_gyp]['targets'] = []
   new_data[main_gyp]['xcode_settings'] = \
       data[orig_gyp].get('xcode_settings', {})
 
+  target_additions = generator_flags.get('xcode_ninja_target_additions', None)
+  target_filter = generator_flags.get('xcode_ninja_target_filter', None)

[Mark Mentovai, 2014/04/15 16:55:46]

“filter” sounds like something that can filter to include things or filter to
exclude things. I think you should call “additions” and “filter” something like
“xcode_ninja_target_include_pattern” and “xcode_ninja_target_exclude_pattern”
(matching terminology used elsewhere in GYP), and adjust the names used int he
source code.

[justincohen, 2014/04/15 17:21:05]

Neither of these patters really mean exclude.

One means: 
 "If this filter is set, then"
   "Regardless of whether it's executable or not, alway include a target if it
patches FOO"

The other means:
 "If this filter is set, then"
   "If a target is executable and matches FOO, include this target, skip the
rest"

So both are include patterns, but one is for all targets, the other is for
executable targets.

Does that make sense?  What do you suggest?

On 2014/04/15 16:55:46, Mark Mentovai wrote:

+
   for old_qualified_target in target_list:
     spec = target_dicts[old_qualified_target]
-    if spec.get('type', '') == 'executable' and \
-        spec.get('product_extension', '') != 'bundle':
-
+    if IsValidTargetForWrapper(target_additions, target_filter, spec):
       # Add to new_target_list.
       target_name = spec.get('target_name')
-
-      # Filter target names if requested.
-      target_filter = generator_flags.get('xcode_ninja_target_filter', None)
-      if target_filter is not None:
-        if not re.search(target_filter, target_name):
-          continue;
-
       new_target_name = '%s:%s#target' % (main_gyp, target_name)
       new_target_list.append(new_target_name)
 
       # Add to new_target_dicts.
       new_target_dicts[new_target_name] = _TargetFromSpec(spec, params)
 
       # Add to new_data.
       for old_target in data[old_qualified_target.split(':')[0]]['targets']:
         if old_target['target_name'] == target_name:
           new_data_target = {}
@@ skipping 46 matching lines @@
   new_data[sources_gyp] = {}
   new_data[sources_gyp]['targets'] = []
   new_data[sources_gyp]['included_files'] = []
   new_data[sources_gyp]['xcode_settings'] = \
       data[orig_gyp].get('xcode_settings', {})
   new_data[sources_gyp]['targets'].append(new_data_target)
 
   # Write workspace to file.
   _WriteWorkspace(main_gyp, sources_gyp)
   return (new_target_list, new_target_dicts, new_data)