opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Support Bazel 0.5.1

Change-Id: I32f7de2e404fd0d61abb2060e0d35d1a98af94e5
This commit is contained in:
David Pursehouse 2017-06-12 08:54:40 +09:00
commit c9e55e621b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/eclipse/project.py
View File

@ -139,7 +139,7 @@ def gen_classpath(ext):
plugins = set() plugins = set()
# Classpath entries are absolute for cross-cell support # 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') srcs = re.compile('(.*/external/[^/]+)/jar/(.*)[.]jar')
for p in _query_classpath(MAIN): for p in _query_classpath(MAIN):
if p.endswith('-src.jar'): if p.endswith('-src.jar'):

2
tools/js/bower2bazel.py
View File

@ -76,7 +76,7 @@ def build_bower_json(version_targets, seeds):
seeds = set(seeds) seeds = set(seeds)
for v in version_targets: 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: with open(fn) as f:
j = json.load(f) j = json.load(f)
if "" in j: if "" in j: