opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Update codemirror-plugin to latest revision on master
  project.py: Add support for bazel wrapper bazelisk
  Bazel: Make build tool chain forward compatible

Change-Id: I6d3e0e8b052cbde2ff37738036ef64ca489f305d
This commit is contained in:
David Pursehouse
2019-06-10 10:08:00 +09:00
parent e2794d533e 5a114cd2d9
commit 97b858a6de
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/codemirror-editor

Submodule plugins/codemirror-editor updated: 3baf62e1f1...2d3f265ab1

2
tools/bzl/maven_jar.bzl
View File

@@ -145,7 +145,7 @@ def _maven_jar_impl(ctx):
out = ctx.execute(args) out = ctx.execute(args)
if out.return_code: if out.return_code:
fail("failed %s: %s" % (" ".join(args), out.stderr)) fail("failed %s: %s" % (args, out.stderr))
srcjar = None srcjar = None
if ctx.attr.src_sha1 or ctx.attr.attach_source: if ctx.attr.src_sha1 or ctx.attr.attach_source:

8
tools/eclipse/project.py
View File

@@ -54,15 +54,19 @@ opts.add_option('-j', '--java', action='store',
dest='java', help='Post Java 8 support (9)') dest='java', help='Post Java 8 support (9)')
opts.add_option('-e', '--edge_java', action='store', opts.add_option('-e', '--edge_java', action='store',
dest='edge_java', help='Post Java 9 support (10|11|...)') dest='edge_java', help='Post Java 9 support (10|11|...)')
opts.add_option('--bazel', help='name of the bazel executable',
action='store', default='bazel', dest='bazel_exe')
args, _ = opts.parse_args() args, _ = opts.parse_args()
batch_option = '--batch' if args.batch else None batch_option = '--batch' if args.batch else None
custom_java = args.java custom_java = args.java
edge_java = args.edge_java edge_java = args.edge_java
bazel_exe = args.bazel_exe
def _build_bazel_cmd(*args): def _build_bazel_cmd(*args):
build = False build = False
cmd = ['bazel'] cmd = [bazel_exe]
if batch_option: if batch_option:
cmd.append('--batch') cmd.append('--batch')
for arg in args: for arg in args:
@@ -82,7 +86,7 @@ def retrieve_ext_location():
def gen_bazel_path(ext_location): def gen_bazel_path(ext_location):
bazel = check_output(['which', 'bazel']).strip().decode('UTF-8') bazel = check_output(['which', bazel_exe]).strip().decode('UTF-8')
with open(path.join(ROOT, ".bazel_path"), 'w') as fd: with open(path.join(ROOT, ".bazel_path"), 'w') as fd:
fd.write("output_base=%s\n" % ext_location) fd.write("output_base=%s\n" % ext_location)
fd.write("bazel=%s\n" % bazel) fd.write("bazel=%s\n" % bazel)