Simplify mvn.py invocation
mvn.py is resolved relative to external package of Bazel project.
Simplify invocation for the callers of this utility, by prefixing
the utility with environment variable: OUTPUT_BASE.
The callers can use it:
export OUTPUT_BASE=`bazel info output_base`
./bazel-genfiles/tools/maven/api_install.sh
where api_install.sh is a script generated by package.bzl Skylark rule.
Also replace py_binary with exports_files, because py_binary rule
wasn't actually used.
Change-Id: I2e9cd679a1ba0b11c6e57b8fe64f6095e6cd74f3
diff --git a/tools/maven/BUILD b/tools/maven/BUILD
index 2e5433e..acb7840 100644
--- a/tools/maven/BUILD
+++ b/tools/maven/BUILD
@@ -1,10 +1 @@
-package(
- default_visibility = ["//visibility:public"],
-)
-
-py_binary(
- name = "mvn",
- srcs = ["mvn.py"],
- main = "mvn.py",
-)
-
+exports_files(["mvn.py"])
diff --git a/tools/maven/package.bzl b/tools/maven/package.bzl
index d1d9775..6adfa65 100644
--- a/tools/maven/package.bzl
+++ b/tools/maven/package.bzl
@@ -20,7 +20,7 @@
"echo \"\" >> $@",
"echo %s >> $@",
"echo \"\" >> $@",
- "echo %s >> $@",
+ "echo 'python $$OUTPUT_BASE/%s' >> $@",
]))
def maven_package(
@@ -33,7 +33,7 @@
war = {}):
build_cmd = ['bazel', 'build']
- mvn_cmd = ['python', '$(location @com_googlesource_gerrit_bazlets//tools/maven:mvn.py)', '-v', version, '-r', '.']
+ mvn_cmd = ['$(location @com_googlesource_gerrit_bazlets//tools/maven:mvn.py)', '-v', version, '-r', '.']
api_cmd = mvn_cmd[:]
api_targets = []
for type,d in [('jar', jar), ('java-source', src), ('javadoc', doc)]:
