From 6e68d116dd6f5cd6e4e6146335f86b967a6e0c69 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 3 Dec 2020 09:39:05 +0000
Subject: [PATCH 1/8] Use release_archive to create java_tools' zips.

---
 src/BUILD                       | 87 +++++++----------------------
 src/main/cpp/util/BUILD         | 20 +++----
 src/main/native/windows/BUILD   |  7 +--
 src/release_archive.bzl         | 98 +++++++++++++++++++++++++++++++++
 src/tools/singlejar/BUILD       | 23 +++-----
 third_party/ijar/BUILD          | 24 ++++----
 third_party/java/jacoco/BUILD   |  9 ++-
 third_party/java/proguard/BUILD |  8 +--
 8 files changed, 155 insertions(+), 121 deletions(-)
 create mode 100644 src/release_archive.bzl

diff --git a/src/BUILD b/src/BUILD
index 8da89dea40b6a7..4fc7553673362a 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -3,6 +3,7 @@
 load("//tools/python:private/defs.bzl", "py_binary", "py_library")
 load(":embedded_tools.bzl", "srcsfile")
 load(":rule_size_test.bzl", "rule_size_test")
+load("//src:release_archive.bzl", "release_archive")
 
 exports_files(["jdeps_modules.golden"])
 
@@ -583,8 +584,6 @@ genrule(
 )
 
 # Following targets build java_tools.zip - platform independent part of java_tools
-# It is painstainkingly built by renaming single files, zipping them and merging zips together
-# TODO(bazel-team): Replace this with a single target, for example "release_archive" in rules_kotlin
 JAVA_TOOLS_DEPLOY_JARS = [
     "//src/java_tools/buildjar:JavaBuilder_deploy.jar",
     "//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar",
@@ -595,88 +594,42 @@ JAVA_TOOLS_DEPLOY_JARS = [
     "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar_deploy.jar",
 ]
 
-genrule(
+release_archive(
     name = "jars_java_tools_zip",
     srcs = JAVA_TOOLS_DEPLOY_JARS + [
         "@java_tools_langtools_javac11//:jdk_compiler_jar",
         "@java_tools_langtools_javac11//:java_compiler_jar",
         "@java_tools_langtools_javac11//:javac_jar",
     ],
-    outs = ["jars_java_tools.zip"],
-    cmd = "zip -qjX $@ $$(echo $(SRCS) | sort)",
+    package_dir = "java_tools",
     visibility = ["//visibility:private"],
 )
 
-genrule(
-    name = "java_tools_build_zip",
-    srcs = ["//tools/jdk:BUILD.java_tools"],
-    outs = ["java_tools_build.zip"],
-    cmd = "cat $(SRCS) > BUILD; zip -qjX $@ BUILD",
-)
-
-genrule(
-    name = "java_tools_no_build_zip",
-    srcs = [
-        ":jars_java_tools.zip",
+release_archive(
+    name = "java_tools_zip",
+    src_map = {
+        "//tools/jdk:BUILD.java_tools": "BUILD",
+    },
+    deps = [
+        ":jars_java_tools_zip",
         "//src/tools/singlejar:singlejar_transitive_zip",
         "//third_party/ijar:ijar_transitive_srcs_zip",
         "//third_party/java/jacoco:jacoco_jars_zip",
         "//third_party/java/proguard:proguard_zip",
     ],
-    outs = ["java_tools_no_build.zip"],
-    cmd = "$(location //src:merge_zip_files) java_tools $@ $(SRCS)",
-    output_to_bindir = 1,
-    tools = ["//src:merge_zip_files"],
-    visibility = ["//src/test/shell/bazel:__pkg__"],
 )
 
-genrule(
-    name = "java_tools_zip",
-    srcs = [
-        "java_tools_no_build.zip",
-        "java_tools_build.zip",
-    ],
-    outs = ["java_tools.zip"],
-    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
-    output_to_bindir = 1,
-    tools = ["//src:merge_zip_files"],
+# Following target builds java_tools_prebuilt.zip part of java_tools
+release_archive(
+    name = "java_tools_prebuilt_zip",
+    src_map = {
+        "//tools/jdk:BUILD.java_tools_prebuilt": "BUILD",
+    },
     visibility = ["//src/test/shell/bazel:__pkg__"],
-)
-
-# Following targets build java_tools_prebuilt.zip part of java_tools
-# It is painstainkingly built by renaming single files, zipping them and merging zips together
-# TODO(bazel-team): Replace this with a single target, for example "release_archive" in rules_kotlin
-genrule(
-    name = "java_tools_prebuilt_build_zip",
-    srcs = ["//tools/jdk:BUILD.java_tools_prebuilt"],
-    outs = ["java_tools_prebuilt_build.zip"],
-    cmd = "cat $(SRCS) > BUILD; zip -qjX $@ BUILD",
-)
-
-genrule(
-    name = "java_tools_prebuilt_no_build_zip",
-    srcs = [
+    deps = [
         "//src/tools/singlejar:singlejar_deploy_zip",
         "//third_party/ijar:ijar_deploy_zip",
     ],
-    outs = ["java_tools_prebuilt_no_build.zip"],
-    cmd = "$(location //src:merge_zip_files) java_tools $@ $(SRCS)",
-    output_to_bindir = True,
-    tools = ["//src:merge_zip_files"],
-    visibility = ["//src/test/shell/bazel:__pkg__"],
-)
-
-genrule(
-    name = "java_tools_prebuilt_zip",
-    srcs = [
-        "java_tools_prebuilt_no_build.zip",
-        "java_tools_prebuilt_build.zip",
-    ],
-    outs = ["java_tools_prebuilt.zip"],
-    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
-    output_to_bindir = 1,
-    tools = ["//src:merge_zip_files"],
-    visibility = ["//src/test/shell/bazel:__pkg__"],
 )
 
 # Following targets used by the java_tools_binaries Buildkite pipeline to upload
@@ -727,12 +680,10 @@ sh_binary(
 )
 
 # Part of the Java tools remote archive. Not embedded or used in Bazel.
-genrule(
+release_archive(
     name = "zlib_zip",
     srcs = ["//third_party/zlib:embedded_tools"],
-    outs = ["zlib.zip"],
-    cmd = "$(location //src:zip_files) zlib $@ $(SRCS)",
-    tools = ["//src:zip_files"],
+    package_dir = "zlib",
     visibility = [
         "//src/tools/singlejar:__pkg__",
         "//third_party/ijar:__pkg__",
diff --git a/src/main/cpp/util/BUILD b/src/main/cpp/util/BUILD
index 5a9c53c4135626..414ec963423a96 100644
--- a/src/main/cpp/util/BUILD
+++ b/src/main/cpp/util/BUILD
@@ -8,6 +8,7 @@ package_group(
 )
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
+load("//src:release_archive.bzl", "release_archive")
 
 cc_library(
     name = "util",
@@ -177,26 +178,21 @@ filegroup(
 )
 
 # A zip containing source files used by ijar.
-genrule(
+release_archive(
     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 = [
         "//src/tools/singlejar:__pkg__",
         "//third_party/ijar:__pkg__",
     ],
+    deps = [
+        ":cpp_util_zip",
+        "//src/main/native/windows:native_windows_zip",
+    ],
 )
 
-genrule(
+release_archive(
     name = "cpp_util_zip",
     srcs = glob(["*.cc"]) + glob(["*.h"]),
-    outs = ["cpp_util.zip"],
-    cmd = "$(location //src:zip_files) src/main/cpp/util $@ $(SRCS)",
-    tools = ["//src:zip_files"],
+    package_dir = "src/main/cpp/util",
     visibility = ["//visibility:private"],
 )
diff --git a/src/main/native/windows/BUILD b/src/main/native/windows/BUILD
index cc90b561b968c2..a53c13f5a28a7c 100644
--- a/src/main/native/windows/BUILD
+++ b/src/main/native/windows/BUILD
@@ -1,4 +1,5 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
+load("//src:release_archive.bzl", "release_archive")
 
 filegroup(
     name = "srcs",
@@ -85,11 +86,9 @@ filegroup(
 )
 
 # A zip containing source files used by ijar.
-genrule(
+release_archive(
     name = "native_windows_zip",
     srcs = [":embedded_java_tools"],
-    outs = ["native_windows.zip"],
-    cmd = "$(location //src:zip_files) src/main/native/windows $@ $(SRCS)",
-    tools = ["//src:zip_files"],
+    package_dir = "src/main/native/windows",
     visibility = ["//src/main/cpp/util:__pkg__"],
 )
diff --git a/src/release_archive.bzl b/src/release_archive.bzl
new file mode 100644
index 00000000000000..dfab9c081e0d16
--- /dev/null
+++ b/src/release_archive.bzl
@@ -0,0 +1,98 @@
+# Copyright 2020 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.
+
+def release_archive(name, srcs = [], src_map = {}, package_dir = "-", deps = [], visibility = []):
+    """
+    Creates an zip of the srcs, and renamed label artifacts.
+    Usage:
+    //:BUILD
+    load("//src:release_archive.bzl", "release_archive")
+    release_archive(
+        name = "release_archive",
+        src_map = {
+            "BUILD.release.bazel.bazel": "BUILD.bazel",
+            "WORKSPACE.release.bazel": "WORKSPACE",
+        },
+        deps = [
+            "//dep:pkg"
+        ],
+    )
+    //dep:BUILD
+    load("//src:release_archive.bzl", "release_archive")
+    release_archive(
+        name = "pkg",
+        srcs = [
+            ":label_of_artifact",
+        ],
+    )
+    Args:
+        name: target identifier, points to a pkg_tar target.
+        package_dir: directory to place the srcs, src_map, and dist_files under. Defaults to the current directory.
+        dist_files: dict of <filename string>:<contents string> for files to be generated in the distribution artifact.
+        src_map: dict of <label>:<name string> for labels to be renamed and included in the distribution.
+        srcs: files to include in the distribution.
+        deps: release_archives to be included.
+    """
+    srcs = list(srcs)
+    for source, target in src_map.items():
+        rename_name = name + "_" + target
+        _rename(
+            name = rename_name,
+            source = source,
+            target = target,
+        )
+        srcs += [rename_name]
+
+    if srcs != []:
+        native.genrule(
+            name = name + "_srcs",
+            srcs = srcs,
+            outs = [name + "_srcs.zip"],
+            cmd = "zip -qjX $@ $$(echo $(SRCS) | sort)",
+            visibility = ["//visibility:private"],
+        )
+        deps = [name + "_srcs.zip"] + deps
+
+    native.genrule(
+        name = name,
+        srcs = deps,
+        outs = [(name[:-len("_zip")] if name.endswith("_zip") else name) + ".zip"],
+        cmd = "$(location //src:merge_zip_files) %s $@ $(SRCS)" % package_dir,
+        output_to_bindir = 1,
+        tools = ["//src:merge_zip_files"],
+        visibility = visibility,
+    )
+
+def _rename_impl(ctx):
+    out_file = ctx.actions.declare_file(ctx.label.name + "/" + ctx.attr.target)
+    in_file = ctx.file.source
+    ctx.actions.run_shell(
+        inputs = [in_file],
+        outputs = [out_file],
+        progress_message = "%s -> %s" % (in_file, ctx.attr.target),
+        command = "mkdir -p {dir} && cp {in_file} {out_file}".format(
+            dir = ctx.label.name,
+            in_file = in_file.path,
+            out_file = out_file.path,
+        ),
+    )
+    return [DefaultInfo(files = depset([out_file]))]
+
+_rename = rule(
+    implementation = _rename_impl,
+    attrs = {
+        "source": attr.label(allow_single_file = True, mandatory = True),
+        "target": attr.string(mandatory = True),
+    },
+)
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index a2dd5b78cc3c2a..e4e7fe0f1a232d 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -1,5 +1,6 @@
 load("@rules_java//java:defs.bzl", "java_library")
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
+load("//src:release_archive.bzl", "release_archive")
 
 # Description:
 #   singlejar C++ implementation.
@@ -43,35 +44,29 @@ filegroup(
     visibility = ["//src:__pkg__"],
 )
 
-genrule(
+release_archive(
     name = "singlejar_transitive_zip",
-    srcs = [
+    package_dir = "java_tools",
+    visibility = ["//src:__pkg__"],
+    deps = [
         ":singlejar_zip",
         "//src:zlib_zip",
         "//src/main/cpp/util:cpp_util_with_deps_zip",
         "//src/main/protobuf:desugar_deps_zip",
     ],
-    outs = ["singlejar_transitive.zip"],
-    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
-    tools = ["//src:merge_zip_files"],
-    visibility = ["//src:__pkg__"],
 )
 
-genrule(
+release_archive(
     name = "singlejar_zip",
     srcs = SOURCES,
-    outs = ["singlejar.zip"],
-    cmd = "$(location //src:zip_files) src/tools/singlejar $@ $$(echo $(SRCS) | sort)",
-    tools = ["//src:zip_files"],
+    package_dir = "java_tools/src/tools/singlejar",
     visibility = ["//visibility:private"],
 )
 
-genrule(
+release_archive(
     name = "singlejar_deploy_zip",
     srcs = [":singlejar_local"],
-    outs = ["singlejar_deploy.zip"],
-    cmd = "$(location //src:zip_files) src/tools/singlejar $@ $$(echo $(SRCS) | sort)",
-    tools = ["//src:zip_files"],
+    package_dir = "src/tools/singlejar",
     visibility = ["//src:__pkg__"],
 )
 
diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index e55bf5f1aa2148..b4a42948c03185 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -7,6 +7,8 @@ package(
 
 licenses(["notice"])  # Apache 2.0
 
+load("//src:release_archive.bzl", "release_archive")
+
 cc_library(
     name = "zip",
     srcs = [
@@ -136,39 +138,33 @@ genrule(
     visibility = ["//visibility:public"],
 )
 
-genrule(
+release_archive(
     name = "ijar_transitive_srcs_zip",
-    srcs = [
+    package_dir = "java_tools",
+    visibility = ["//visibility:public"],
+    deps = [
         ":ijar_srcs_zip",
         "//src:zlib_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 = ["//visibility:public"],
 )
 
-genrule(
+release_archive(
     name = "ijar_deploy_zip",
     srcs = [
         ":ijar",
         ":zipper",
     ],
-    outs = ["ijar_deploy.zip"],
-    cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
-    tools = ["//src:zip_files"],
+    package_dir = "java_tools/ijar",
     visibility = ["//visibility:public"],
 )
 
-genrule(
+release_archive(
     name = "ijar_srcs_zip",
     srcs = glob(
         ["**"],
         exclude = ["BUILD"],
     ),
-    outs = ["ijar_srcs.zip"],
-    cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
-    tools = ["//src:zip_files"],
+    package_dir = "ijar",
     visibility = ["//visibility:private"],
 )
diff --git a/third_party/java/jacoco/BUILD b/third_party/java/jacoco/BUILD
index 1002c63c2c0575..e03d01997e4f4e 100644
--- a/third_party/java/jacoco/BUILD
+++ b/third_party/java/jacoco/BUILD
@@ -4,6 +4,7 @@
 # http://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.3/jacoco-0.8.3.zip
 
 load("//tools/distributions:distribution_rules.bzl", "distrib_jar_filegroup", "distrib_java_import")
+load("//src:release_archive.bzl", "release_archive")
 
 licenses(["reciprocal"])  # EPL 1.0 (Eclipse Public License)
 
@@ -18,17 +19,15 @@ filegroup(
     srcs = glob(["**"]),
 )
 
-genrule(
+release_archive(
     name = "jacoco_jars_zip",
     srcs = glob(["*.jar"]) + ["LICENSE"] + [
         "//third_party:asm",
         "//third_party:asm-commons",
         "//third_party:asm-tree",
     ],
-    outs = ["jacoco_jars.zip"],
-    cmd = "$(location //src:zip_files) third_party/java/jacoco $@ $(SRCS)",
-    output_to_bindir = 1,
-    tools = ["//src:zip_files"],
+    package_dir = "java_tools/third_party/java/jacoco",
+    visibility = ["//visibility:public"],
 )
 
 filegroup(
diff --git a/third_party/java/proguard/BUILD b/third_party/java/proguard/BUILD
index 2d36e95abd7c28..0c66a6fd77f58a 100644
--- a/third_party/java/proguard/BUILD
+++ b/third_party/java/proguard/BUILD
@@ -1,5 +1,7 @@
 licenses(["restricted"])  # GNU GPL v2
 
+load("//src:release_archive.bzl", "release_archive")
+
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
@@ -19,14 +21,12 @@ filegroup(
     visibility = ["//src:__pkg__"],
 )
 
-genrule(
+release_archive(
     name = "proguard_zip",
     srcs = [
         "proguard5.3.3/docs/GPL.html",
         "proguard5.3.3/lib/proguard.jar",
     ],
-    outs = ["proguard.zip"],
-    cmd = "$(location //src:zip_files) third_party/java/proguard $@ $(SRCS)",
-    tools = ["//src:zip_files"],
+    package_dir = "java_tools/third_party/java/proguard",
     visibility = ["//src:__pkg__"],
 )

From 621eaaad34bdfd9ec25276b979cd6a8427e429d4 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 3 Dec 2020 09:57:57 +0000
Subject: [PATCH 2/8] Visibility for tests.

---
 src/BUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/BUILD b/src/BUILD
index 4fc7553673362a..0d12d48c682aac 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -610,6 +610,7 @@ release_archive(
     src_map = {
         "//tools/jdk:BUILD.java_tools": "BUILD",
     },
+    visibility = ["//src/test/shell/bazel:__pkg__"],
     deps = [
         ":jars_java_tools_zip",
         "//src/tools/singlejar:singlejar_transitive_zip",
@@ -626,6 +627,7 @@ release_archive(
         "//tools/jdk:BUILD.java_tools_prebuilt": "BUILD",
     },
     visibility = ["//src/test/shell/bazel:__pkg__"],
+    visibility = ["//src/test/shell/bazel:__pkg__"],
     deps = [
         "//src/tools/singlejar:singlejar_deploy_zip",
         "//third_party/ijar:ijar_deploy_zip",

From 34a9fcc2c57357ce0b6d42d14d8d9800b743f8bb Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 3 Dec 2020 11:05:40 +0000
Subject: [PATCH 3/8] Duplicated visibility

---
 src/BUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/BUILD b/src/BUILD
index 0d12d48c682aac..32b45405887a4f 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -627,7 +627,6 @@ release_archive(
         "//tools/jdk:BUILD.java_tools_prebuilt": "BUILD",
     },
     visibility = ["//src/test/shell/bazel:__pkg__"],
-    visibility = ["//src/test/shell/bazel:__pkg__"],
     deps = [
         "//src/tools/singlejar:singlejar_deploy_zip",
         "//third_party/ijar:ijar_deploy_zip",

From f228fdf494b44cefea548a98261c600e3ad0e8db Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 3 Dec 2020 13:10:08 +0000
Subject: [PATCH 4/8] Revert ijar/BUILD

---
 third_party/ijar/BUILD | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index b4a42948c03185..e55bf5f1aa2148 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -7,8 +7,6 @@ package(
 
 licenses(["notice"])  # Apache 2.0
 
-load("//src:release_archive.bzl", "release_archive")
-
 cc_library(
     name = "zip",
     srcs = [
@@ -138,33 +136,39 @@ genrule(
     visibility = ["//visibility:public"],
 )
 
-release_archive(
+genrule(
     name = "ijar_transitive_srcs_zip",
-    package_dir = "java_tools",
-    visibility = ["//visibility:public"],
-    deps = [
+    srcs = [
         ":ijar_srcs_zip",
         "//src:zlib_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 = ["//visibility:public"],
 )
 
-release_archive(
+genrule(
     name = "ijar_deploy_zip",
     srcs = [
         ":ijar",
         ":zipper",
     ],
-    package_dir = "java_tools/ijar",
+    outs = ["ijar_deploy.zip"],
+    cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
+    tools = ["//src:zip_files"],
     visibility = ["//visibility:public"],
 )
 
-release_archive(
+genrule(
     name = "ijar_srcs_zip",
     srcs = glob(
         ["**"],
         exclude = ["BUILD"],
     ),
-    package_dir = "ijar",
+    outs = ["ijar_srcs.zip"],
+    cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
+    tools = ["//src:zip_files"],
     visibility = ["//visibility:private"],
 )

From 58036aa559ac26caf07c2dd383699283feb5858e Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 3 Dec 2020 13:15:59 +0000
Subject: [PATCH 5/8] Revert src/main/cpp/util/BUILD

---
 src/main/cpp/util/BUILD | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/cpp/util/BUILD b/src/main/cpp/util/BUILD
index 414ec963423a96..5a9c53c4135626 100644
--- a/src/main/cpp/util/BUILD
+++ b/src/main/cpp/util/BUILD
@@ -8,7 +8,6 @@ package_group(
 )
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("//src:release_archive.bzl", "release_archive")
 
 cc_library(
     name = "util",
@@ -178,21 +177,26 @@ filegroup(
 )
 
 # A zip containing source files used by ijar.
-release_archive(
+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 = [
         "//src/tools/singlejar:__pkg__",
         "//third_party/ijar:__pkg__",
     ],
-    deps = [
-        ":cpp_util_zip",
-        "//src/main/native/windows:native_windows_zip",
-    ],
 )
 
-release_archive(
+genrule(
     name = "cpp_util_zip",
     srcs = glob(["*.cc"]) + glob(["*.h"]),
-    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"],
 )

From 5d748c9c5f90c9b656bda8ea01ab1ecd09a15bd1 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 3 Dec 2020 14:53:32 +0000
Subject: [PATCH 6/8] Fixed paths.

---
 src/tools/singlejar/BUILD |  4 ++--
 third_party/ijar/BUILD    | 18 ++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index e4e7fe0f1a232d..51eb0ea77f8d2d 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -59,14 +59,14 @@ release_archive(
 release_archive(
     name = "singlejar_zip",
     srcs = SOURCES,
-    package_dir = "java_tools/src/tools/singlejar",
+    package_dir = "src/tools/singlejar",
     visibility = ["//visibility:private"],
 )
 
 release_archive(
     name = "singlejar_deploy_zip",
     srcs = [":singlejar_local"],
-    package_dir = "src/tools/singlejar",
+    package_dir = "java_tools/src/tools/singlejar",
     visibility = ["//src:__pkg__"],
 )
 
diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index e55bf5f1aa2148..28f05bf44366da 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -122,20 +122,6 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-genrule(
-    name = "ijar_transitive_zip",
-    srcs = [
-        ":ijar_srcs_zip",
-        ":ijar_deploy_zip",
-        "//src:zlib_zip",
-        "//src/main/cpp/util:cpp_util_with_deps_zip",
-    ],
-    outs = ["ijar_with_deps.zip"],
-    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
-    tools = ["//src:merge_zip_files"],
-    visibility = ["//visibility:public"],
-)
-
 genrule(
     name = "ijar_transitive_srcs_zip",
     srcs = [
@@ -144,7 +130,7 @@ genrule(
         "//src/main/cpp/util:cpp_util_with_deps_zip",
     ],
     outs = ["ijar_srcs_with_deps.zip"],
-    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
+    cmd = "$(location //src:merge_zip_files) java_tools $@ $(SRCS)",
     tools = ["//src:merge_zip_files"],
     visibility = ["//visibility:public"],
 )
@@ -156,7 +142,7 @@ genrule(
         ":zipper",
     ],
     outs = ["ijar_deploy.zip"],
-    cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
+    cmd = "$(location //src:zip_files) java_tools/ijar $@ $(SRCS)",
     tools = ["//src:zip_files"],
     visibility = ["//visibility:public"],
 )

From 776952cd59e3e8ccfbea52b6605bab509d1993e0 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 3 Dec 2020 15:07:57 +0000
Subject: [PATCH 7/8] Revert src/main/native/windows/BUILD

---
 src/main/native/windows/BUILD | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/native/windows/BUILD b/src/main/native/windows/BUILD
index a53c13f5a28a7c..cc90b561b968c2 100644
--- a/src/main/native/windows/BUILD
+++ b/src/main/native/windows/BUILD
@@ -1,5 +1,4 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
-load("//src:release_archive.bzl", "release_archive")
 
 filegroup(
     name = "srcs",
@@ -86,9 +85,11 @@ filegroup(
 )
 
 # A zip containing source files used by ijar.
-release_archive(
+genrule(
     name = "native_windows_zip",
     srcs = [":embedded_java_tools"],
-    package_dir = "src/main/native/windows",
+    outs = ["native_windows.zip"],
+    cmd = "$(location //src:zip_files) src/main/native/windows $@ $(SRCS)",
+    tools = ["//src:zip_files"],
     visibility = ["//src/main/cpp/util:__pkg__"],
 )

From 954b7c3ebee9465797547a2ccd86df02a5880595 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Fri, 4 Dec 2020 12:38:49 +0000
Subject: [PATCH 8/8] Use dirname

---
 src/release_archive.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/release_archive.bzl b/src/release_archive.bzl
index dfab9c081e0d16..505f8a0da96fce 100644
--- a/src/release_archive.bzl
+++ b/src/release_archive.bzl
@@ -82,7 +82,7 @@ def _rename_impl(ctx):
         outputs = [out_file],
         progress_message = "%s -> %s" % (in_file, ctx.attr.target),
         command = "mkdir -p {dir} && cp {in_file} {out_file}".format(
-            dir = ctx.label.name,
+            dir = out_file.dirname,
             in_file = in_file.path,
             out_file = out_file.path,
         ),