Consolidate Xcode Project Setup

ios/build/tools/convert_gn_xcodeproj.py

 #!/usr/bin/python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Convert GN Xcode projects to platform and configuration independent targets.
 
 GN generates Xcode projects that build one configuration only. However, typical
 iOS development involves using the Xcode IDE to toggle the platform and
 configuration. This script replaces the 'gn' configuration with 'Debug',
@@ skipping 149 matching lines @@
     configurations: list of string corresponding to the configurations that
       need to be supported by the tweaked Xcode projects, must contains at
       least one value.
   '''
   # Update products project.
   products = os.path.join('products.xcodeproj', 'project.pbxproj')
   product_input = os.path.join(input_dir, products)
   product_output = os.path.join(output_dir, products)
   UpdateProductsProject(product_input, product_output, configurations)
 
   # Copy sources project and all workspace.

[sdefresne, 2017/01/17 10:08:40]

nit: Please update comment (as this no longer copy "sources" project).

[liaoyuke, 2017/01/17 18:35:19]

Done.

-  sources = os.path.join('sources.xcodeproj', 'project.pbxproj')
-  CopyFileIfChanged(os.path.join(input_dir, sources),
-                    os.path.join(output_dir, sources))
   xcwspace = os.path.join('all.xcworkspace', 'contents.xcworkspacedata')
   CopyFileIfChanged(os.path.join(input_dir, xcwspace),
                     os.path.join(output_dir, xcwspace))
-
+  # TODO(crbug.com/679110): gn has been modified to remove 'sources.xcodeproj'
+  # and keep 'all.xcworkspace' and 'products.xcodeproj'. The following code is
+  # here to support both old and new projects setup and will be removed once gn
+  # has rolled past it.
+  if 'sources.xcodeproj' in os.listdir(input_dir):

[sdefresne, 2017/01/17 10:08:40]

nit: I would just test whether the file "sources" exists:

  sources = os.path.join('sources.xcodeproj', 'project.pbxproj')
  if os.path.isfile(os.path.join(input_dir, sources)):
    CopyFileIfChanged(...)

[liaoyuke, 2017/01/17 18:35:19]

Done.

+    sources = os.path.join('sources.xcodeproj', 'project.pbxproj')
+    CopyFileIfChanged(os.path.join(input_dir, sources),
+                      os.path.join(output_dir, sources))
 
 def Main(args):
   parser = argparse.ArgumentParser(
       description='Convert GN Xcode projects for iOS.')
   parser.add_argument(
       'input',
-      help='directory containing [product|sources|all] Xcode projects.')
+      help='directory containing [product|all] Xcode projects.')
   parser.add_argument(
       'output',
       help='directory where to generate the iOS configuration.')
   parser.add_argument(
       '--add-config', dest='configurations', default=[], action='append',
       help='configuration to add to the Xcode project')
   args = parser.parse_args(args)
 
   if not os.path.isdir(args.input):
     sys.stderr.write('Input directory does not exists.\n')
     return 1
 
-  required = set(['products.xcodeproj', 'sources.xcodeproj', 'all.xcworkspace'])
+  required = set(['products.xcodeproj', 'all.xcworkspace'])
   if not required.issubset(os.listdir(args.input)):
     sys.stderr.write(
         'Input directory does not contain all necessary Xcode projects.\n')
     return 1
 
   if not args.configurations:
     sys.stderr.write('At least one configuration required, see --add-config.\n')
     return 1
 
   ConvertGnXcodeProject(args.input, args.output, args.configurations)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))