Bazel: code reorganization

redsun82 · redsun82 · commit 7cddfba9375e · 2022-04-08T15:58:33.000+02:00
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -27,6 +27,6 @@ http_archive(
     ],
 )
 
-load("@ql//:defs.bzl", "ql_utils")
+load("@ql//misc/bazel:workspace.bzl", "ql_workspace")
 
-ql_utils(name = "utils")
+ql_workspace()
diff --git a/defs.bzl b/defs.bzl
@@ -3,17 +3,3 @@ codeql_platform = select({
     "@platforms//os:macos": "osx64",
     "@platforms//os:windows": "win64",
 })
-
-_paths_bzl = """
-def source_dir():
-    return '%s/' + native.package_name()
-"""
-
-def _ql_utils_impl(repository_ctx):
-    root = repository_ctx.path(Label("@ql//:WORKSPACE.bazel")).realpath.dirname
-    repository_ctx.file("BUILD.bazel")
-    repository_ctx.file("paths.bzl", content = _paths_bzl % root)
-
-ql_utils = repository_rule(
-    implementation = _ql_utils_impl,
-)
diff --git a/misc/bazel/BUILD.bazel b/misc/bazel/BUILD.bazel
diff --git a/misc/bazel/source_dir.bzl.tpl b/misc/bazel/source_dir.bzl.tpl
@@ -0,0 +1,11 @@
+def root_source_dir():
+    """ get absolute path to the root source directory
+
+        This can break hermeticity if used in a build step"""
+    return '{root}'
+
+def current_source_dir():
+    """ get absolute path to the source directory of this bazel package
+
+        This can break hermeticity if used in a build step"""
+    return root_source_dir() + '/' + native.package_name()
diff --git a/misc/bazel/workspace.bzl b/misc/bazel/workspace.bzl
@@ -0,0 +1,15 @@
+def _ql_utils_impl(repository_ctx):
+    root = repository_ctx.path(Label("//:WORKSPACE.bazel")).realpath.dirname
+    repository_ctx.file("BUILD.bazel")
+    repository_ctx.template(
+        "source_dir.bzl",
+        Label("@ql//misc/bazel:source_dir.bzl.tpl"),
+        substitutions = {"{root}": str(root)},
+    )
+
+_ql_utils = repository_rule(
+    implementation = _ql_utils_impl,
+)
+
+def ql_workspace():
+    _ql_utils(name = "utils")
diff --git a/swift/install/BUILD.bazel b/swift/install/BUILD.bazel
@@ -1,11 +1,11 @@
-load("@utils//:paths.bzl", "source_dir")
+load("@utils//:source_dir.bzl", "current_source_dir")
 load("@rules_pkg//:install.bzl", "pkg_install")
 
 pkg_install(
     name = "install",
     srcs = ["//swift:extractor-pack"],
     args = [
         "--destdir",
-        source_dir() + "/../extractor_pack",
+        current_source_dir() + "/../extractor_pack",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ http_archive(`
`27`	`27`	`],`
`28`	`28`	`)`
`29`	`29`
`30`		`-load("@ql//:defs.bzl", "ql_utils")`
	`30`	`+load("@ql//misc/bazel:workspace.bzl", "ql_workspace")`
`31`	`31`
`32`		`-ql_utils(name = "utils")`
	`32`	`+ql_workspace()`