pretty

Author: aiuto

bazel/rules/macos/pkg/BUILD.bazel

@@ -1,3 +1,5 @@
+"""Macos packaging rules."""
+
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "pkg_mklink")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load(":pkg_mac_pkg.bzl", "pkg_mac_pkg")
@@ -11,11 +13,6 @@ py_binary(
     visibility = ["//visibility:public"],
 )
 
-exports_files([
-    "pkg_mac_pkg.bzl",
-    "materialize_root.py",
-])
-
 # Manual smoke test: exercises the full materialize+pkgbuild pipeline against
 # real pkg_files srcs. Not wired into any real package yet.
 pkg_files(

bazel/rules/macos/pkg/build_mac_pkg.py

@@ -26,7 +26,12 @@
 import tempfile
 
 
-def parse_args():
+def _install_script(src, dst):
+    shutil.copyfile(src, dst)
+    os.chmod(dst, 0o755)
+
+
+def main():
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument("--materialize-root-py", required=True, help="Path to materialize_root.py.")
     parser.add_argument("--root", required=True, help="pkg_install-materialized root directory (symlink farm).")
@@ -38,16 +43,8 @@ def parse_args():
     parser.add_argument("--preinstall", default="", help="Optional path to a preinstall script.")
     parser.add_argument("--postinstall", default="", help="Optional path to a postinstall script.")
     parser.add_argument("--signing-identity", default="", help="Optional pkgbuild --sign identity name.")
-    return parser.parse_args()
-
 
-def _install_script(src, dst):
-    shutil.copyfile(src, dst)
-    os.chmod(dst, 0o755)
-
-
-def main():
-    args = parse_args()
+    args = parser.parse_args()
 
     real_root_dir = tempfile.mkdtemp()
     scripts_dir = tempfile.mkdtemp()
@@ -57,16 +54,13 @@ def main():
             check=True,
         )
 
+        # fmt: off
         pkgbuild_args = [
             args.pkgbuild,
-            "--root",
-            real_root_dir,
-            "--identifier",
-            args.identifier,
-            "--version",
-            args.version,
-            "--install-location",
-            args.install_location,
+            "--root", real_root_dir,
+            "--identifier", args.identifier,
+            "--version", args.version,
+            "--install-location", args.install_location,
         ]
 
         if args.preinstall or args.postinstall:

bazel/rules/macos/pkg/pkg_mac_pkg.bzl

@@ -15,8 +15,6 @@ bespoke manifest interpreter.
 load("@rules_pkg//pkg:install.bzl", "pkg_install")
 
 def _pkg_mac_pkg_impl(ctx):
-    # This is a temporary solution. In the future, we'll write the payload
-    # directly from the source inputs, like pkg_tar
     # `pkg_install` produces a `bazel run`-able installer whose CLI insists on
     # an absolute --destdir (or BUILD_WORKSPACE_DIRECTORY for resolving a
     # relative one), since it's normally invoked interactively. Inside a
@@ -144,7 +142,6 @@ def pkg_mac_pkg(
     pkg_install(
         name = name + "_installer",
         srcs = srcs,
-        tags = ["manual"],
         visibility = ["//visibility:private"],
     )