diff options
Diffstat (limited to 'lldb/scripts/Xcode')
| -rwxr-xr-x | lldb/scripts/Xcode/build-llvm.py | 59 | ||||
| -rw-r--r-- | lldb/scripts/Xcode/repo.py | 33 | ||||
| -rw-r--r-- | lldb/scripts/Xcode/repos/svn-trunk.json | 19 |
3 files changed, 31 insertions, 80 deletions
diff --git a/lldb/scripts/Xcode/build-llvm.py b/lldb/scripts/Xcode/build-llvm.py index 15b6a6b8c50..792f92558b4 100755 --- a/lldb/scripts/Xcode/build-llvm.py +++ b/lldb/scripts/Xcode/build-llvm.py @@ -6,7 +6,6 @@ import fnmatch import os import platform import re -import repo import subprocess import sys @@ -18,38 +17,42 @@ from lldbbuild import * def LLVM_HASH_INCLUDES_DIFFS(): return False -# For use with Xcode-style builds +# The use of "x = "..."; return x" here is important because tooling looks for +# it with regexps. Only change how this works if you know what you are doing. -def process_vcs(vcs): - return { - "svn": VCS.svn, - "git": VCS.git - }[vcs] -def process_root(name): - return { - "llvm": llvm_source_path(), - "clang": clang_source_path(), - "ninja": ninja_source_path() - }[name] +def LLVM_REF(): + llvm_ref = "master" + return llvm_ref + + +def CLANG_REF(): + clang_ref = "master" + return clang_ref + +# For use with Xcode-style builds -def process_repo(r): - return { - 'name': r["name"], - 'vcs': process_vcs(r["vcs"]), - 'root': process_root(r["name"]), - 'url': r["url"], - 'ref': r["ref"] - } def XCODE_REPOSITORIES(): - identifier = repo.identifier() - if identifier == None: - sys.exit("Couldn't identify the current branch") - set = repo.find(identifier) - if set == None: - sys.exit("Couldn't find a repository set for the current branch") - return [process_repo(r) for r in set] + return [ + {'name': "llvm", + 'vcs': VCS.git, + 'root': llvm_source_path(), + 'url': "http://llvm.org/git/llvm.git", + 'ref': LLVM_REF()}, + + {'name': "clang", + 'vcs': VCS.git, + 'root': clang_source_path(), + 'url': "http://llvm.org/git/clang.git", + 'ref': CLANG_REF()}, + + {'name': "ninja", + 'vcs': VCS.git, + 'root': ninja_source_path(), + 'url': "https://github.com/ninja-build/ninja.git", + 'ref': "master"} + ] def get_c_compiler(): diff --git a/lldb/scripts/Xcode/repo.py b/lldb/scripts/Xcode/repo.py deleted file mode 100644 index 2f737b5186c..00000000000 --- a/lldb/scripts/Xcode/repo.py +++ /dev/null @@ -1,33 +0,0 @@ -import json -import os -import re -import subprocess - -def identifier(): - try: - svn_output = subprocess.check_output(["svn", "info", "--show-item", "url"], stderr=subprocess.STDOUT).rstrip() - return svn_output - except: - pass - try: - git_remote_and_branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"]).rstrip() - git_remote = git_remote_and_branch.split("/")[0] - git_branch = "/".join(git_remote_and_branch.split("/")[1:]) - git_url = subprocess.check_output(["git", "remote", "get-url", git_remote]).rstrip() - return git_url + ":" + git_branch - except: - pass - return None - -def find(identifier): - dir = os.path.dirname(os.path.realpath(__file__)) - repos_dir = os.path.join(dir, "repos") - json_regex = re.compile(r"^.*.json$") - override_path = os.path.join(repos_dir, "OVERRIDE.json") - if os.path.isfile(override_path): - override_set = json.load(open(override_path)) - return override_set["repos"] - for set in [json.load(open(os.path.join(repos_dir, f))) for f in filter(json_regex.match, os.listdir(repos_dir))]: - if re.match(set["regexp"], identifier): - return set["repos"] - return None diff --git a/lldb/scripts/Xcode/repos/svn-trunk.json b/lldb/scripts/Xcode/repos/svn-trunk.json deleted file mode 100644 index e4a1af122e1..00000000000 --- a/lldb/scripts/Xcode/repos/svn-trunk.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "regexp" : ".*llvm\\.org.*", - "repos" : [ - {"name": "llvm", - "vcs": "git", - "url": "http://llvm.org/git/llvm.git", - "ref": "master"}, - - {"name": "clang", - "vcs": "git", - "url": "http://llvm.org/git/clang.git", - "ref": "master"}, - - {"name": "ninja", - "vcs": "git", - "url": "https://github.com/ninja-build/ninja.git", - "ref": "master"} - ] -} |
