From 15222fc32f7536320463f8d27d8f294ecee5f01c Mon Sep 17 00:00:00 2001 From: Wolfgang Meyers Date: Wed, 16 Mar 2016 15:27:10 +0000 Subject: [PATCH] Use jar command from bazel in eclipse setup Original eclipse setup used the jar command from the system path which resulted in different behavior on different systems. This change modifies the build target to use the jar command provided by bazel: @local_jdk//:bin/jar --- java/com/google/domain/registry/eclipse/BUILD | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java/com/google/domain/registry/eclipse/BUILD b/java/com/google/domain/registry/eclipse/BUILD index c4d999b77..821231ba7 100644 --- a/java/com/google/domain/registry/eclipse/BUILD +++ b/java/com/google/domain/registry/eclipse/BUILD @@ -45,14 +45,20 @@ genrule( name = "eclipse_deps", srcs = ["//java/com/google/domain/registry/eclipse:registry_deps_deploy.jar"], outs = ["eclipse_deps.jar"], + tools = [ + "@local_jdk//:bin/jar", + "@local_jdk//:jdk-lib", + "@local_jdk//:jre-default", + ], cmd = " && ".join([ + "JAR=$$(pwd)/$(location @local_jdk//:bin/jar)", "IN=$$(pwd)/$(SRCS)", "OUT=$$(pwd)/$@", "TMP=$$(mktemp -d $${TMPDIR:-/tmp}/eclipse_deps.XXXXXXXX)", "cd $$TMP", - "jar -xf $$IN", + "$$JAR -xf $$IN", "rm -rf com/google/domain/registry", - "jar -cmf META-INF/MANIFEST.MF eclipse_deps.jar .", + "$$JAR -cmf META-INF/MANIFEST.MF eclipse_deps.jar .", "mv eclipse_deps.jar $$OUT", "rm -rf $$TMP", ]),