clean up some more

Author: philsc

python/bin/BUILD.bazel

@@ -1,6 +1,5 @@
-load("//python:py_binary.bzl", "py_binary")
 load("//python/private:interpreter.bzl", _interpreter_binary = "interpreter_binary")
-load("//python/private:repl.bzl", "generate_repl_main")
+load("//python/private:repl.bzl", "py_repl_binary")
 
 filegroup(
     name = "distribution",
@@ -25,10 +24,14 @@ label_flag(
     build_setting_default = "//python:none",
 )
 
-generate_repl_main(
-    name = "repl_py",
-    src = "repl_stub",
-    out = "repl.py",
+py_repl_binary(
+    name = "repl",
+    visibility = ["//visibility:public"],
+    stub = ":repl_stub",
+    deps = [
+        ":repl_dep",
+        ":repl_stub_dep",
+    ],
 )
 
 # The user can replace this with their own stub. E.g. they can use this to
@@ -46,20 +49,6 @@ label_flag(
     build_setting_default = "//python/private:empty",
 )
 
-py_binary(
-    name = "repl",
-    srcs = [":repl.py"],
-    visibility = ["//visibility:public"],
-    data = [
-        ":repl_stub",
-    ],
-    deps = [
-        ":repl_dep",
-        ":repl_stub_dep",
-        "//python/runfiles",
-    ],
-)
-
 # The user can modify this flag to make arbitrary PyInfo targets available for
 # import on the REPL.
 label_flag(

python/private/repl.bzl

@@ -1,3 +1,5 @@
+load("//python:py_binary.bzl", "py_binary")
+
 def _generate_repl_main_impl(ctx):
     stub_repo = ctx.attr.src.label.repo_name or ctx.workspace_name
     stub_path = "/".join([stub_repo, ctx.file.src.short_path])
@@ -10,7 +12,7 @@ def _generate_repl_main_impl(ctx):
         },
     )
 
-generate_repl_main = rule(
+_generate_repl_main = rule(
     implementation = _generate_repl_main_impl,
     attrs = {
         "out": attr.output(
@@ -31,3 +33,24 @@ generate_repl_main = rule(
         ),
     },
 )
+
+def py_repl_binary(name, stub, deps=[], data=[], **kwargs):
+    _generate_repl_main(
+        name = "%s_py" % name,
+        src = stub,
+        out = "%s.py" % name,
+    )
+
+    py_binary(
+        name = name,
+        srcs = [
+            ":%s.py" % name,
+        ],
+        data = data + [
+            stub,
+        ],
+        deps = deps + [
+            "//python/runfiles",
+        ],
+        **kwargs,
+    )