Fix build for bazel 0.9.0
Change-Id: Ib2ce3e2c197824984fb332f93ff38a3570949084
This commit is contained in:
parent
3222b751fa
commit
e486718005
|
@ -1,32 +1,32 @@
|
||||||
load('//tools/bzl:genrule2.bzl', 'genrule2')
|
load("//tools/bzl:genrule2.bzl", "genrule2")
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = 'query_exception',
|
name = "query_exception",
|
||||||
srcs = ['src/main/java/com/google/gerrit/server/query/QueryParseException.java'],
|
srcs = ["src/main/java/com/google/gerrit/server/query/QueryParseException.java"],
|
||||||
visibility = ['//visibility:public'],
|
visibility = ["//visibility:public"],
|
||||||
)
|
)
|
||||||
|
|
||||||
genrule2(
|
genrule2(
|
||||||
name = 'query_antlr',
|
name = "query_antlr",
|
||||||
srcs = ['src/main/antlr3/com/google/gerrit/server/query/Query.g'],
|
srcs = ["src/main/antlr3/com/google/gerrit/server/query/Query.g"],
|
||||||
cmd = ' && '.join([
|
out = "query_antlr.srcjar",
|
||||||
'$(location //lib/antlr:antlr-tool) -o $$TMP $<',
|
cmd = " && ".join([
|
||||||
'cd $$TMP',
|
"$(location //lib/antlr:antlr-tool) -o $$TMP $<",
|
||||||
'$$ROOT/$(location @bazel_tools//tools/zip:zipper) cC $$ROOT/$@ $$(find .)'
|
"cd $$TMP",
|
||||||
]),
|
"zip $$ROOT/$@ $$(find . -type f )",
|
||||||
tools = [
|
]),
|
||||||
'@bazel_tools//tools/zip:zipper',
|
tools = [
|
||||||
'//lib/antlr:antlr-tool',
|
"//lib/antlr:antlr-tool",
|
||||||
],
|
"@bazel_tools//tools/zip:zipper",
|
||||||
out = 'query_antlr.srcjar',
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = 'query_parser',
|
name = "query_parser",
|
||||||
srcs = [':query_antlr'],
|
srcs = [":query_antlr"],
|
||||||
deps = [
|
visibility = ["//visibility:public"],
|
||||||
':query_exception',
|
deps = [
|
||||||
'//lib/antlr:java_runtime',
|
":query_exception",
|
||||||
],
|
"//lib/antlr:java_runtime",
|
||||||
visibility = ['//visibility:public'],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -22,7 +22,7 @@ def prolog_cafe_library(
|
||||||
genrule2(
|
genrule2(
|
||||||
name = name + '__pl2j',
|
name = name + '__pl2j',
|
||||||
cmd = '$(location //lib/prolog:compiler_bin) ' +
|
cmd = '$(location //lib/prolog:compiler_bin) ' +
|
||||||
'$$TMP $@ ' +
|
'$$(dirname $@) $@ ' +
|
||||||
'$(SRCS)',
|
'$(SRCS)',
|
||||||
srcs = srcs,
|
srcs = srcs,
|
||||||
tools = ['//lib/prolog:compiler_bin'],
|
tools = ['//lib/prolog:compiler_bin'],
|
||||||
|
|
|
@ -18,9 +18,9 @@ load('//tools/bzl:java.bzl', 'java_library2')
|
||||||
|
|
||||||
def gwt_module(gwt_xml=None, resources=[], srcs=[], **kwargs):
|
def gwt_module(gwt_xml=None, resources=[], srcs=[], **kwargs):
|
||||||
if gwt_xml:
|
if gwt_xml:
|
||||||
resources += [gwt_xml]
|
resources = resources + [gwt_xml]
|
||||||
if srcs:
|
if srcs:
|
||||||
resources += srcs
|
resources = resources + srcs
|
||||||
|
|
||||||
java_library2(
|
java_library2(
|
||||||
srcs = srcs,
|
srcs = srcs,
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
|
|
||||||
def java_library2(deps=[], exported_deps=[], exports=[], **kwargs):
|
def java_library2(deps=[], exported_deps=[], exports=[], **kwargs):
|
||||||
if exported_deps:
|
if exported_deps:
|
||||||
deps += exported_deps
|
deps = deps + exported_deps
|
||||||
exports += exported_deps
|
exports = exports + exported_deps
|
||||||
native.java_library(
|
native.java_library(
|
||||||
deps = deps,
|
deps = deps,
|
||||||
exports = exports,
|
exports = exports,
|
||||||
|
|
Loading…
Reference in New Issue