Support Bazel 0.5.1

Bazel 0.5.1 is using "bazel-out/darwin_x86_64-fastbuild/", which
failed these extraction patterns.  Allow anything before the
-fastbuild part of the path.

Change-Id: I850271bb1c657a5ffe77946a6beaf54a3680af75
This commit is contained in:
Shawn Pearce 2017-06-11 10:30:35 -07:00 committed by David Pursehouse
parent 4847c3de4e
commit 41c2e73da2
2 changed files with 2 additions and 2 deletions

View File

@ -139,7 +139,7 @@ def gen_classpath(ext):
plugins = set()
# Classpath entries are absolute for cross-cell support
java_library = re.compile('bazel-out/local-fastbuild/bin/(.*)/[^/]+[.]jar$')
java_library = re.compile('bazel-out/.*?-fastbuild/bin/(.*)/[^/]+[.]jar$')
srcs = re.compile('(.*/external/[^/]+)/jar/(.*)[.]jar')
for p in _query_classpath(MAIN):
if p.endswith('-src.jar'):

View File

@ -76,7 +76,7 @@ def build_bower_json(version_targets, seeds):
seeds = set(seeds)
for v in version_targets:
fn = os.path.join("bazel-out/local-fastbuild/bin", v.lstrip("/").replace(":", "/"))
fn = os.path.join("bazel-out/.*?-fastbuild/bin", v.lstrip("/").replace(":", "/"))
with open(fn) as f:
j = json.load(f)
if "" in j: