Author: spyffe
Date: Wed Feb 22 18:46:30 2017
New Revision: 295915
URL: http://llvm.org/viewvc/llvm-project?rev=295915&view=rev
Log:
Reverted 295897 pending refinements and fixes for green-dragon.
Removed:
lldb/trunk/scripts/Xcode/repo.py
lldb/trunk/scripts/Xcode/repos/
Modified:
lldb/trunk/scripts/Xcode/build-llvm.py
Modified: lldb/trunk/scripts/Xcode/build-llvm.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Xcode/build-llvm.py?rev=295915&r1=295914&r2=295915&view=diff
==============================================================================
--- lldb/trunk/scripts/Xcode/build-llvm.py (original)
+++ lldb/trunk/scripts/Xcode/build-llvm.py Wed Feb 22 18:46:30 2017
@@ -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
+# 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 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_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 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():
Removed: lldb/trunk/scripts/Xcode/repo.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Xcode/repo.py?rev=295914&view=auto
==============================================================================
--- lldb/trunk/scripts/Xcode/repo.py (original)
+++ lldb/trunk/scripts/Xcode/repo.py (removed)
@@ -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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
