Zip Java tools for windows

src/BUILD

@@ -549,3 +549,15 @@ alias(
     actual = "//src/conditions:windows",
     visibility = ["//visibility:public"],
 )
+
+sh_binary(
+    name = "zip_files",
+    srcs = ["zip_files.sh"],
+    visibility = ["//visibility:public"],
+)
+
+sh_binary(
+    name = "merge_zip_files",
+    srcs = ["merge_zip_files.sh"],
+    visibility = ["//visibility:public"],
+)

src/main/cpp/util/BUILD

@@ -196,23 +196,24 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-pkg_tar(
-    name = "cpp_util_with_deps_archive",
-    extension = "tar.gz",
-    mode = "755",
-    visibility = ["//third_party/ijar:__pkg__"],
-    deps = [
-        ":cpp_util_archive",
-        "//src/main/native/windows:src_main_native_windows",
+# A zip containing source files used by ijar.
+genrule(
+    name = "cpp_util_with_deps_zip",
+    srcs = [
+        ":cpp_util_zip",
+        "//src/main/native/windows:native_windows_zip",
     ],
+    outs = ["cpp_util_with_deps.zip"],
+    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
+    tools = ["//src:merge_zip_files"],
+    visibility = ["//third_party/ijar:__pkg__"],
 )
 
-pkg_tar(
-    name = "cpp_util_archive",
+genrule(
+    name = "cpp_util_zip",
     srcs = glob(["*.cc"]) + glob(["*.h"]),
-    extension = "tar.gz",
-    mode = "755",
-    # Create a pkg_tar to preserve the directory structure src/main/cpp/util.
-    package_dir = "src/main/cpp/util",
+    outs = ["cpp_util.zip"],
+    cmd = "$(location //src:zip_files) src/main/cpp/util $@ $(SRCS)",
+    tools = ["//src:zip_files"],
     visibility = ["//visibility:private"],
 )

src/main/native/windows/BUILD

@@ -8,21 +8,6 @@ filegroup(
     visibility = ["//src/main/native:__pkg__"],
 )
 
-pkg_tar(
-    name = "src_main_native_windows",
-    srcs = [
-        "file.cc",
-        "file.h",
-        "util.cc",
-        "util.h",
-    ],
-    extension = "tar.gz",
-    mode = "755",
-    # Create a pkg_tar to preserve the directory structure src/main/native/windows.
-    package_dir = "src/main/native/windows",
-    visibility = ["//src/main/cpp/util:__pkg__"],
-)
-
 filegroup(
     name = "embedded_tools",
     srcs = glob([
@@ -86,3 +71,18 @@ cc_library(
     linkstatic = 1,
     visibility = ["//src/main/cpp:__pkg__"],
 )
+
+# A zip containing source files used by ijar.
+genrule(
+    name = "native_windows_zip",
+    srcs = [
+        "file.cc",
+        "file.h",
+        "util.cc",
+        "util.h",
+    ],
+    outs = ["native_windows.zip"],
+    cmd = "$(location //src:zip_files) src/main/native/windows $@ $(SRCS)",
+    tools = ["//src:zip_files"],
+    visibility = ["//src/main/cpp/util:__pkg__"],
+)

src/merge_zip_files.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Copyright 2019 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# A script that zips the content of the inputs zip files under a given directory
+# structure in the output zip file. "-" can be passed if no top-level directory
+# structure is required.
+
+# Usage: third_party/merge_zip_files.sh directory_prefix output_zip [input_zip_files]
+#
+# For example, if we have the following zips and their content:
+# a.zip:
+#    dir1/a1.cc
+#    a2.cc
+# b.zip:
+#    dir2/b1.cc
+#    b2.cc
+#
+# third_party_zip_files.sh src/main/cpp my_archive.zip a.zip b.zip
+# will create the archive my_archive.zip containing:
+# src/main/cpp/a2.cc
+# src/main/cpp/b2.cc
+# src/main/cpp/dir1/a1.cc
+# src/main/cpp/dir2/b1.cc
+#
+# third_party_zip_files.sh - my_archive.zip a.zip b.zip
+# will create the archive my_archive.zip containing:
+# a2.cc
+# b2.cc
+# dir1/a1.cc
+# dir2/b1.cc
+
+set -euo pipefail
+
+directory_prefix="$1"; shift
+output="$1"; shift
+
+initial_pwd="$(pwd)"
+
+tmp_dir=$(mktemp -d -t 'tmp_bazel_zip_files_XXXXX')
+trap "rm -fr $tmp_dir" EXIT
+tmp_zip="$tmp_dir/archive.zip"
+
+if [[ "$directory_prefix" == "-" ]]; then
+  for curr_zip in "$@"
+  do
+    unzip -q "$curr_zip" -d "$tmp_dir"
+  done
+
+  cd "$tmp_dir"
+  zip -9 -r -q "$tmp_zip" "."
+else
+  mkdir -p "$tmp_dir/$directory_prefix"
+  for curr_zip in "$@"
+  do
+    unzip -q "$curr_zip" -d "$tmp_dir/$directory_prefix"
+  done
+
+  cd "$tmp_dir"
+  zip -9 -r -q "$tmp_zip" "$directory_prefix"
+fi
+
+cd "$initial_pwd"
+mv -f "$tmp_zip" "$output"

src/zip_files.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Copyright 2019 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# A script that zips all the inputs files under the given directory structure
+# in the output zip file.
+
+# Usage: third_party/zip_files.sh directory_prefix output_zip [input_files]
+#
+# For example: third_party_zip_files.sh src/main/cpp my_archive.zip a.cc b.cc
+# will create the archive my_archive.zip containing:
+# src/main/cpp/a.cc
+# src/main/cpp/b.cc
+
+set -euo pipefail
+
+directory_prefix="$1"; shift
+output="$1"; shift
+
+initial_pwd="$(pwd)"
+
+tmp_dir=$(mktemp -d -t 'tmp_bazel_zip_files_XXXXX')
+trap "rm -fr $tmp_dir" EXIT
+tmp_zip="$tmp_dir/archive.zip"
+
+zip -j -q "$tmp_zip" "$@"
+
+mkdir -p "$tmp_dir/$directory_prefix"
+cd "$tmp_dir/$directory_prefix"
+unzip -q "$tmp_zip"
+rm -f "$tmp_zip"
+cd "$tmp_dir"
+zip -r -q "$tmp_zip" "$directory_prefix"
+
+cd "$initial_pwd"
+mv -f "$tmp_zip" "$output"
+rm -r "$tmp_dir"
+

third_party/BUILD

@@ -605,49 +605,29 @@ filegroup(
     ],
 )
 
-# Part of the Java tools remote archive. Not embedded or used in Bazel.
-pkg_tar(
-    name = "zlib_pkg",
-    srcs = ["//third_party/zlib:embedded_tools"],
-    extension = "tar.gz",
-    mode = "755",
-    # Create a new pkg_tar to preserve the directory structure (zlib/).
-    package_dir = "zlib",
-)
-
-# Part of the Java tools remote archive. Not embedded or used in Bazel.
-pkg_tar(
-    name = "ijar_pkg",
-    srcs = [
-        "//third_party/ijar",
-        "//third_party/ijar:embed_into_java_tools",
-        "//third_party/ijar:zipper",
-    ],
-    extension = "tar.gz",
-    mode = "755",
-    # Create a new pkg_tar to preserve the directory structure (ijar/).
-    package_dir = "ijar",
-)
-
 # Builds the remote Java tools archive. Not embedded or used in Bazel, but used
 # by the Java tools release process.
-pkg_tar(
-    name = "java_tools_pkg-gz",
+genrule(
+    name = "java_tools_zip",
     srcs = [
-        "//third_party/java/java_tools",
-        "//third_party/java/jdk/langtools:java_compiler_jar",
-        "//third_party/java/jdk/langtools:javac_jar",
-        "//third_party/java/jdk/langtools:jdk_compiler_jar",
-    ],
-    extension = "tar.gz",
-    mode = "755",
-    package_dir = "java_tools",
-    # Pass these as dependencies rather than srcs to preserve their directory
-    # structures and avoid packaging all the files under the same directory.
-    deps = [
-        ":zlib_pkg",
-        "//third_party/ijar:ijar_with_deps_archive",
+        "//third_party/ijar:ijar_with_deps_zip",
+        "//third_party/java/java_tools:java_tools_zip",
+        ":zlib_zip",
     ],
+    outs = ["java_tools.zip"],
+    cmd = "$(location //src:merge_zip_files) java_tools $@ $(SRCS)",
+    output_to_bindir = 1,
+    tools = ["//src:merge_zip_files"],
+)
+
+# Part of the Java tools remote archive. Not embedded or used in Bazel.
+genrule(
+    name = "zlib_zip",
+    srcs = ["//third_party/zlib:embedded_tools"],
+    outs = ["zlib.zip"],
+    cmd = "$(location //src:zip_files) zlib $@ $(SRCS)",
+    tools = ["//src:zip_files"],
+    visibility = ["//visibility:private"],
 )
 
 load(":compiler_config_setting.bzl", "create_compiler_config_setting")

third_party/ijar/BUILD

@@ -111,19 +111,29 @@ pkg_tar(
     ],
 )
 
-pkg_tar(
-    name = "ijar_archive",
+genrule(
+    name = "ijar_with_deps_zip",
+    srcs = [
+        ":ijar_srcs_zip",
+        "//src/main/cpp/util:cpp_util_with_deps_zip",
+    ],
+    outs = ["ijar_srcs_with_deps.zip"],
+    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
+    tools = ["//src:merge_zip_files"],
+    visibility = ["//third_party:__pkg__"],
+)
+
+genrule(
+    name = "ijar_srcs_zip",
     srcs = glob(
         ["**"],
-        exclude = ["BUILD"]
+        exclude = ["BUILD"],
     ) + [
-        # Also archive the binaries.
         ":ijar",
         ":zipper",
     ],
-    extension = "tar.gz",
-    mode = "755",
-    # Create a new pkg_tar to preserve the directory structure (ijar/).
-    package_dir = "ijar",
+    outs = ["ijar_srcs.zip"],
+    cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
+    tools = ["//src:zip_files"],
     visibility = ["//visibility:private"],
 )

third_party/java/java_tools/BUILD

@@ -27,3 +27,16 @@ filegroup(
         "BUILD.pkg",
     ],
 )
+
+genrule(
+    name = "java_tools_zip",
+    srcs = [
+        ":java_tools",
+        "//third_party/java/jdk/langtools:java_compiler_jar",
+        "//third_party/java/jdk/langtools:javac_jar",
+        "//third_party/java/jdk/langtools:jdk_compiler_jar",
+    ],
+    outs = ["java_tools.zip"],
+    cmd = "zip -q -j $@ $$(echo $(SRCS) | sort)",
+    visibility = ["//third_party:__pkg__"],
+)

third_party/zlib/BUILD

@@ -17,7 +17,10 @@ cc_library(
     srcs = glob(["*.c"]),
     hdrs = glob(["*.h"]),
     # Use -Dverbose=-1 to turn off zlib's trace logging. (#3280)
-    copts = ["-w", "-Dverbose=-1"],
+    copts = [
+        "-w",
+        "-Dverbose=-1",
+    ],
     includes = ["."],
     visibility = ["//visibility:public"],
 )