-
Notifications
You must be signed in to change notification settings - Fork 10.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed builld-llvm.py to use .json files
LLDB has many branches in a variety of repositories. The build-script.py file is subtly different for each set. This is unnecessary and causes merge headaches. This patch makes build-llvm.py consult a directory full of .json files, each one of which matches a particular branch using a regular expression. Differential revision: https://reviews.llvm.org/D30275 llvm-svn: 295897
- Loading branch information
Showing
3 changed files
with
80 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
{ | ||
"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"} | ||
] | ||
} |