Merge pull request swiftlang#26182 from apple/shahmishal/update-checkout-llvm-monorepo

[update-checkout] Add support for LLVM-Project mono repo by creating symlink

Author: shahmishal

utils/update_checkout/update-checkout-config.json

@@ -45,7 +45,9 @@
         "indexstore-db": {
             "remote": { "id": "apple/indexstore-db" } },
         "sourcekit-lsp": {
-            "remote": { "id": "apple/sourcekit-lsp" } }
+            "remote": { "id": "apple/sourcekit-lsp" } },
+        "llvm-project": {
+            "remote": { "id": "apple/llvm-project-v1" } }
     },
     "default-branch-scheme": "master",
     "branch-schemes": {
@@ -75,6 +77,27 @@
                 "sourcekit-lsp": "master"
             }
         },
+        "master-llvm-monorepo": {
+            "aliases": ["master-llvm-monorepo"],
+            "repos": {
+                "llvm-project": "swift/master",
+                "swift": "master",
+                "cmark": "master",
+                "llbuild": "master",
+                "swiftpm": "master",
+                "swift-syntax": "master",
+                "swift-stress-tester": "master",
+                "swift-corelibs-xctest": "master",
+                "swift-corelibs-foundation": "master",
+                "swift-corelibs-libdispatch": "master",
+                "swift-integration-tests": "master",
+                "swift-xcode-playground-support": "master",
+                "ninja": "release",
+                "icu": "release-61-1",
+                "indexstore-db": "master",
+                "sourcekit-lsp": "master"
+            }
+        },
         "next" : {
             "aliases": ["next", "master-next",
                         "stable-next", "upstream",
@@ -103,6 +126,27 @@
                 "sourcekit-lsp": "master"
             }
         },
+        "master-next-llvm-monorepo" : {
+            "aliases": ["master-next-llvm-monorepo"],
+            "repos": {
+                "llvm-project": "swift/master-next",
+                "swift": "master-next",
+                "cmark": "master",
+                "llbuild": "master",
+                "swiftpm": "master",
+                "swift-syntax": "master",
+                "swift-stress-tester": "master",
+                "swift-corelibs-xctest": "master",
+                "swift-corelibs-foundation": "master",
+                "swift-corelibs-libdispatch": "master",
+                "swift-integration-tests": "master",
+                "swift-xcode-playground-support": "master",
+                "ninja": "release",
+                "icu": "release-61-1",
+                "indexstore-db": "master",
+                "sourcekit-lsp": "master"
+            }
+        },
         "swift-3.0-branch" : {
             "aliases": ["swift-3.0-branch"],
             "repos": {

utils/update_checkout/update_checkout/update_checkout.py

@@ -85,7 +85,7 @@ def update_single_repository(pool_args):
     source_root, config, repo_name, scheme_name, scheme_map, tag, timestamp, \
         reset_to_remote, should_clean, cross_repos_pr = pool_args
     repo_path = os.path.join(source_root, repo_name)
-    if not os.path.isdir(repo_path):
+    if not os.path.isdir(repo_path) or os.path.islink(repo_path):
         return
 
     try:
@@ -408,6 +408,23 @@ def skip_list_for_platform(config):
     return skip_list
 
 
+def symlink_llvm_monorepo(args):
+    print("Create symlink for LLVM Project")
+    llvm_projects = ['clang',
+                     'llvm',
+                     'lldb',
+                     'compiler-rt',
+                     'libcxx',
+                     'clang-tools-extra']
+    for project in llvm_projects:
+        src_path = os.path.join(args.source_root,
+                                'llvm-project',
+                                project)
+        dst_path = os.path.join(args.source_root, project)
+        if not os.path.islink(dst_path):
+            os.symlink(src_path, dst_path)
+
+
 def main():
     freeze_support()
     parser = argparse.ArgumentParser(
@@ -489,6 +506,10 @@ def main():
         help="The root directory to checkout repositories",
         default=SWIFT_SOURCE_ROOT,
         dest='source_root')
+    parser.add_argument(
+        '--symlink-llvm-monorepo',
+        help='Create symlink from LLVM-Project to source root directory',
+        action='store_true')
     args = parser.parse_args()
 
     if not args.scheme:
@@ -560,6 +581,8 @@ def main():
     if fail_count > 0:
         print("update-checkout failed, fix errors and try again")
     else:
+        if args.symlink_llvm_monorepo:
+            symlink_llvm_monorepo(args)
         print("update-checkout succeeded")
         print_repo_hashes(args, config)
     sys.exit(fail_count)