Add all markdown files to Xcode-hybrid project.

Bug: 739825
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I5d0b0524f4b82e19d8a432ed669e95441da98c61
Reviewed-on: https://chromium-review.googlesource.com/574539
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594677}

ios/build/tools/convert_gn_xcodeproj.py

@@ -71,7 +71,7 @@ def WriteXcodeProject(output_path, json_string):
     CopyFileIfChanged(temp_file.name, output_path)
 
 
-def UpdateProductsProject(file_input, file_output, configurations):
+def UpdateProductsProject(file_input, file_output, configurations, root_dir):
   """Update Xcode project to support multiple configurations.
 
   Args:
@@ -113,9 +113,63 @@ def UpdateProductsProject(file_input, file_output, configurations):
   for object_id in objects_to_remove:
     del project.objects[object_id]
 
+  AddMarkdownToProject(project, root_dir, json_data['rootObject'])
+
   objects = collections.OrderedDict(sorted(project.objects.iteritems()))
   WriteXcodeProject(file_output, json.dumps(json_data))
 
+def AddMarkdownToProject(project, root_dir, root_object):
+  list_files_cmd = ['git', '-C', root_dir, 'ls-files', '*.md']
+  paths = subprocess.check_output(list_files_cmd).splitlines()
+  ios_internal_dir = os.path.join(root_dir, 'ios_internal')
+  if os.path.exists(ios_internal_dir):
+    list_files_cmd = ['git', '-C', ios_internal_dir, 'ls-files', '*.md']
+    ios_paths = subprocess.check_output(list_files_cmd).splitlines()
+    paths.extend(["ios_internal/" + path for path in ios_paths])
+  for path in paths:
+    new_markdown_entry = {
+      "fileEncoding": "4",
+      "isa": "PBXFileReference",
+      "lastKnownFileType": "net.daringfireball.markdown",
+      "name": os.path.basename(path),
+      "path": path,
+      "sourceTree": "<group>"
+    }
+    new_markdown_entry_id = project.AddObject('sources', new_markdown_entry)
+    folder = GetFolderForPath(project, root_object, os.path.dirname(path))
+    folder['children'].append(new_markdown_entry_id)
+
+
+def GetFolderForPath(project, rootObject, path):
+  objects = project.objects
+  # 'Sources' is always the first child of
+  # project->rootObject->mainGroup->children.
+  root = objects[objects[objects[rootObject]['mainGroup']]['children'][0]]
+  if not path:
+    return root
+  for folder in path.split('/'):
+    children = root['children']
+    new_root = None
+    for child in children:
+      if objects[child]['isa'] == 'PBXGroup' and \
+         objects[child]['name'] == folder:
+        new_root = objects[child]
+        break
+    if not new_root:
+      # If the folder isn't found we could just cram it into the leaf existing
+      # folder, but that leads to folders with tons of README.md inside.
+      new_group =  {
+        "children": [
+        ],
+        "isa": "PBXGroup",
+        "name": folder,
+        "sourceTree": "<group>"
+      }
+      new_group_id = project.AddObject('sources', new_group)
+      children.append(new_group_id)
+      new_root = objects[new_group_id]
+    root = new_root
+  return root
 
 def DisableNewBuildSystem(output_dir):
   """Disables the new build system due to crbug.com/852522 """
@@ -129,7 +183,7 @@ def DisableNewBuildSystem(output_dir):
   WriteXcodeProject(xcwspacesharedsettings, json.dumps(json_data))
 
 
-def ConvertGnXcodeProject(input_dir, output_dir, configurations):
+def ConvertGnXcodeProject(root_dir,input_dir, output_dir, configurations):
   '''Tweak the Xcode project generated by gn to support multiple configurations.
 
   The Xcode projects generated by "gn gen --ide" only supports a single
@@ -149,7 +203,7 @@ def ConvertGnXcodeProject(input_dir, output_dir, configurations):
   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)
+  UpdateProductsProject(product_input, product_output, configurations, root_dir)
 
   # Copy all workspace.
   xcwspace = os.path.join('all.xcworkspace', 'contents.xcworkspacedata')
@@ -181,6 +235,9 @@ def Main(args):
   parser.add_argument(
       '--add-config', dest='configurations', default=[], action='append',
       help='configuration to add to the Xcode project')
+  parser.add_argument(
+      '--root', type=os.path.abspath,
+      help='root directory of the project')
   args = parser.parse_args(args)
 
   if not os.path.isdir(args.input):
@@ -197,7 +254,8 @@ def Main(args):
     sys.stderr.write('At least one configuration required, see --add-config.\n')
     return 1
 
-  ConvertGnXcodeProject(args.input, args.output, args.configurations)
+  ConvertGnXcodeProject(args.root_dir, args.input, args.output,
+                        args.configurations)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))

ios/build/tools/setup-gn.py

@@ -268,6 +268,7 @@ def GenerateXcodeProject(gn_path, root_dir, out_dir, settings):
     generator = GnGenerator(settings, 'Debug', 'iphonesimulator')
     generator.Generate(gn_path, root_dir, temp_path)
     convert_gn_xcodeproj.ConvertGnXcodeProject(
+        root_dir,
         os.path.join(temp_path),
         os.path.join(out_dir, 'build'),
         SUPPORTED_CONFIGS)