Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Adjust names of prolog dependencies
Change-Id: I84a725069ed1afd1bde28c398664e85bc77fd00c
diff --git a/lib/prolog/BUILD b/lib/prolog/BUILD
index bbbc0de..ceff892 100644
--- a/lib/prolog/BUILD
+++ b/lib/prolog/BUILD
@@ -1,17 +1,17 @@
java_binary(
- name = "compiler_bin",
+ name = "compiler-bin",
main_class = "PrologCompiler",
visibility = ["//visibility:public"],
- runtime_deps = [":compiler_lib"],
+ runtime_deps = [":compiler-lib"],
)
java_library(
- name = "compiler_lib",
+ name = "compiler-lib",
srcs = ["java/PrologCompiler.java"],
visibility = ["//visibility:public"],
deps = [
- "@prolog_compiler//jar",
- "@prolog_runtime//jar",
- "@prolog_io//jar",
+ "@prolog-compiler//jar",
+ "@prolog-runtime//jar",
+ "@prolog-io//jar",
],
)
diff --git a/lib/prolog/prolog.bzl b/lib/prolog/prolog.bzl
index dad82b4..fe300c4 100644
--- a/lib/prolog/prolog.bzl
+++ b/lib/prolog/prolog.bzl
@@ -19,16 +19,16 @@
**kwargs):
native.genrule(
name = name + '__pl2j',
- cmd = '$(location @com_googlesource_gerrit_bazlets//lib/prolog:compiler_bin) ' +
+ cmd = '$(location @com_googlesource_gerrit_bazlets//lib/prolog:compiler-bin) ' +
'$$(dirname $@) $@ ' +
'$(SRCS)',
srcs = srcs,
- tools = ['@com_googlesource_gerrit_bazlets//lib/prolog:compiler_bin'],
+ tools = ['@com_googlesource_gerrit_bazlets//lib/prolog:compiler-bin'],
outs = [ name + '.srcjar' ],
)
native.java_library(
name = name,
srcs = [':' + name + '__pl2j'],
- deps = ['@prolog_runtime//jar:neverlink'] + deps,
+ deps = ['@prolog-runtime//jar:neverlink'] + deps,
**kwargs
)
