Stop bundling ijar's sources in bazel_tools
Instead bundle ijar's zipper binary so the skylark rules that depends on it
can use it from @bazel_tools.
A commit introducing windows config settings broke our appengine tutorial.
--
MOS_MIGRATED_REVID=114857080
diff --git a/src/BUILD b/src/BUILD
index af54201..17c8f2e 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -107,9 +107,16 @@
"//third_party/ijar",
"//third_party/java/apkbuilder:embedded_tools",
] + select({
- ":darwin": [":darwin_tools"],
- ":darwin_x86_64": [":darwin_tools"],
- "//conditions:default": [],
+ ":darwin": [
+ ":darwin_tools",
+ "//third_party/ijar:zipper",
+ ],
+ ":darwin_x86_64": [
+ ":darwin_tools",
+ "//third_party/ijar:zipper",
+ ],
+ ":windows": [], # Windows specifically exclude zipper for now.
+ "//conditions:default": ["//third_party/ijar:zipper"],
}),
outs = ["embedded_tools.zip"],
cmd = "$(location :create_embedded_tools.sh) $@ $(SRCS)",
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index 8b4c07e..e3b751c 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -34,6 +34,8 @@
*Runner_deploy.jar) OUTPUT_PATH=tools/jdk/TestRunner_deploy.jar ;;
*ijar.exe) OUTPUT_PATH=tools/jdk/ijar/ijar.exe ;;
*ijar) OUTPUT_PATH=tools/jdk/ijar/ijar ;;
+ *zipper.exe) OUTPUT_PATH=tools/zip/zipper/zipper.exe ;;
+ *zipper) OUTPUT_PATH=tools/zip/zipper/zipper ;;
*src/objc_tools/*) OUTPUT_PATH=tools/objc/precomp_${i##*/} ;;
*xcode*StdRedirect.dylib) OUTPUT_PATH=tools/objc/StdRedirect.dylib ;;
*xcode*realpath) OUTPUT_PATH=tools/objc/realpath ;;
diff --git a/third_party/BUILD b/third_party/BUILD
index 4680120..9a1949a 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -3,7 +3,6 @@
filegroup(
name = "srcs",
srcs = glob(["**"]) + [
- "//third_party/ijar:srcs",
"//third_party/iossim:srcs",
"//third_party/java/buck-ios-support:srcs",
"//third_party/java/dd_plist:srcs",
diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index edd6bf1..56e2d5a 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -7,12 +7,6 @@
licenses(["notice"]) # Apache 2.0
-filegroup(
- name = "srcs",
- srcs = glob(["**"]),
- visibility = ["//third_party:__pkg__"],
-)
-
cc_library(
name = "zip",
srcs = [
diff --git a/tools/BUILD b/tools/BUILD
index aa30e07..6455ad0 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -20,29 +20,6 @@
)
filegroup(
- name = "package-srcs",
- srcs = glob(["**"]) + [
- "//tools/build_defs/d:srcs",
- "//tools/build_defs/docker:srcs",
- "//tools/build_defs/jsonnet:srcs",
- "//tools/build_defs/pkg:srcs",
- "//tools/build_defs/sass:srcs",
- "//tools/build_rules/appengine:srcs",
- "//tools/build_rules/closure:srcs",
- "//tools/build_rules/go:srcs",
- "//tools/build_rules/rust:srcs",
- "//tools/buildstamp:srcs",
- "//tools/jdk:package-srcs",
- "//tools/genrule:srcs",
- "//tools/cpp:srcs",
- "//tools/j2objc:srcs",
- "//tools/objc:srcs",
- "//tools/test:srcs",
- "//tools/python:srcs",
- ],
-)
-
-filegroup(
name = "embedded_tools_srcs",
srcs = glob(["**"]) + [
"//tools/android/jack:srcs",
@@ -65,5 +42,6 @@
"//tools/objc:srcs",
"//tools/python:srcs",
"//tools/test:srcs",
+ "//tools/zip:srcs",
],
)
diff --git a/tools/build_defs/groovy/groovy.bzl b/tools/build_defs/groovy/groovy.bzl
index 0766325..0ddbbd9 100644
--- a/tools/build_defs/groovy/groovy.bzl
+++ b/tools/build_defs/groovy/groovy.bzl
@@ -96,7 +96,7 @@
default = Label("//tools/defaults:jdk"),
),
"_zipper": attr.label(
- default = Label("//third_party/ijar:zipper"),
+ default = Label("@bazel_tools//tools/zip:zipper"),
executable = True,
single_file = True,
),
diff --git a/tools/build_rules/appengine/appengine.bzl b/tools/build_rules/appengine/appengine.bzl
index 2fc25fa..1b2d631 100644
--- a/tools/build_rules/appengine/appengine.bzl
+++ b/tools/build_rules/appengine/appengine.bzl
@@ -192,7 +192,7 @@
single_file = True,
),
"_zipper": attr.label(
- default = Label("@bazel_tools//third_party/ijar:zipper"),
+ default = Label("@bazel_tools//tools/zip:zipper"),
single_file = True,
),
"_runner_template": attr.label(
diff --git a/tools/zip/BUILD b/tools/zip/BUILD
new file mode 100644
index 0000000..30fd8c0
--- /dev/null
+++ b/tools/zip/BUILD
@@ -0,0 +1,13 @@
+# Build file to expose zipper to the @bazel_tools repository.
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+ name = "srcs",
+ srcs = ["BUILD"],
+)
+
+# zipper will be added when creating the @bazel_tools repository.
+filegroup(
+ name = "zipper",
+ srcs = glob(["zipper/*"]),
+)
