Prepare deps generator for external use (#49)

* delete annex_proto * delete annex_scalafmt * BUILD files edited * AnxAnalysisStoreSpec.scala & ZincRunner.scala modified * Dependencies.scala updated * Printer.scala added * some test fixed * annex_install.json deleted * annex_install.json deleted * munit-diff dependency added * ZincRunner.scala modified * init.bzl modified * WORKSPACE modified * prepare scala_deps.bzl to external use * prepare init.bzl to external use * prepare workspace.bzl to external use * remove maven_install with annex_deps from WORKSPACE * automated project-root resolution added * jar_artifact_callback.bzl deleted --------- Co-authored-by: anna-skrodzka <annaskrod@h=gmail.com>
timothyklim · Oct 29, 2024 · a61eca3 · a61eca3
1 parent 581a9df
commit a61eca3
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 74 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -13,28 +13,6 @@ http_archive(
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
-maven_install(
-    name = "annex_deps",
-    artifacts = [
-        "com.github.scopt:scopt_3:4.1.0",
-        "org.scala-sbt:librarymanagement-core_3:2.0.0-M2",
-        "org.scala-sbt:librarymanagement-coursier_3:2.0.0-alpha8",
-    ],
-    fetch_sources = True,
-    maven_install_json = "@rules_scala3//:annex_deps_install.json",
-    repositories = [
-        "https://repo1.maven.org/maven2",
-        "https://repo.maven.apache.org/maven2",
-        "https://maven-central.storage-download.googleapis.com/maven2",
-        "https://mirror.bazel.build/repo1.maven.org/maven2",
-        "https://scala-ci.typesafe.com/artifactory/scala-integration/",
-    ],
-)
-
-load("@annex_deps//:defs.bzl", "pinned_maven_install")
-
-pinned_maven_install()
-
 rules_cc_version = "0.0.9"
 
 http_archive(

diff --git a/deps/BUILD b/deps/BUILD
@@ -5,15 +5,14 @@ scala_binary(
     srcs = ["//deps/src:deps"],
     args = [
         "--project-root=.",
-        "--scala-version=3.5.1-RC1",  #TODO
+        "--scala-version=3.5.2",  #TODO
     ],
     main_class = "rules_scala3.deps.src.Deps",
-    resources = ["//deps/src/templates:jar_artifact_callback"],
     scala = "//scala:bootstrap_3",
     visibility = ["//visibility:public"],
     deps = [
         "@annex_deps//:com_github_scopt_scopt_3",
         "@annex_deps//:org_scala_sbt_librarymanagement_core_3",
         "@annex_deps//:org_scala_sbt_librarymanagement_coursier_3",
     ],
-)
+)
diff --git a/deps/scala_deps.bzl b/deps/scala_deps.bzl
@@ -13,10 +13,9 @@ def scala_deps(
     scala_binary(
         name = name,
         main_class = "rules_scala3.deps.src.Deps",
-        resources = ["//deps/src/templates:jar_artifact_callback"],
-        scala = "//scala:bootstrap_3",
+        scala = "@rules_scala3//scala:bootstrap_3",
         visibility = ["//visibility:public"],
-        srcs = ["//deps/src:deps", src],
+        srcs = ["@rules_scala3//deps/src:deps", src],
         args = [
             "--project-root=" + project_root,
             "--scala-version=" + scala_version,

diff --git a/deps/src/BazelExt.scala b/deps/src/BazelExt.scala
@@ -1,7 +1,44 @@
 package rules_scala3.deps.src
 
 object BazelExt:
-  private lazy val jarArtifactCallback = String(getClass.getResourceAsStream("/deps/src/templates/jar_artifact_callback.bzl").readAllBytes())
+  private val jarArtifactCallback =
+    "def _jar_artifact_impl(ctx):\n" +
+      "    jar_name = \"%s.jar\" % ctx.name\n" +
+      "    ctx.download(\n" +
+      "        output = ctx.path(\"jar/%s\" % jar_name),\n" +
+      "        url = ctx.attr.urls,\n" +
+      "        executable = False,\n" +
+      "    )\n" +
+      "    build_file_contents = \"\"\"\n" +
+      "package(default_visibility = ['//visibility:public'])\n" +
+      "filegroup(\n" +
+      "    name = 'jar',\n" +
+      "    srcs = ['{jar_name}'],\n" +
+      "    visibility = ['//visibility:public'],\n" +
+      ")\n" +
+      "alias(\n" +
+      "    name = \"file\",\n" +
+      "    actual = \":jar\",\n" +
+      "    visibility = [\"//visibility:public\"],\n" +
+      ")\\n\"\"\".format(artifact = ctx.attr.artifact, jar_name = jar_name)\n" +
+      "    ctx.file(ctx.path(\"jar/BUILD\"), build_file_contents, False)\n" +
+      "    return None\n" +
+      "\n" +
+      "jar_artifact = repository_rule(\n" +
+      "    attrs = {\n" +
+      "        \"artifact\": attr.string(mandatory = True),\n" +
+      "        \"urls\": attr.string_list(mandatory = True),\n" +
+      "    },\n" +
+      "    implementation = _jar_artifact_impl,\n" +
+      ")\n" +
+      "\n" +
+      "def jar_artifact_callback(hash):\n" +
+      "    jar_artifact(\n" +
+      "        artifact = hash[\"artifact\"],\n" +
+      "        name = hash[\"name\"],\n" +
+      "        urls = [hash[\"url\"]],\n" +
+      "    )\n" +
+      "    native.bind(name = hash[\"bind\"], actual = hash[\"actual\"])"
 
   def apply(targets: Vector[Target]): String =
     val dependencyLines: String = targets

diff --git a/deps/src/Vars.scala b/deps/src/Vars.scala
@@ -27,7 +27,12 @@ object Vars:
     help('h', "help").text("Prints this usage text"),
     opt[File]('r', "project-root")
       .required()
-      .action((value, vars) => vars.copy(projectRoot = value))
+      .action((value, vars) => {
+        val resolvedPath = value.getPath match
+          case "." => new File(sys.env.getOrElse("BUILD_WORKSPACE_DIRECTORY", ".")).getAbsoluteFile
+          case _ => value.getAbsoluteFile
+        vars.copy(projectRoot = resolvedPath)
+      })
       .text("The ABSOLUTE path to the root of the bazel repo"),
     opt[String]('s', "scala-version")
       .required()

diff --git a/deps/src/templates/BUILD b/deps/src/templates/BUILD
diff --git a/deps/src/templates/jar_artifact_callback.bzl b/deps/src/templates/jar_artifact_callback.bzl
diff --git a/rules/scala/init.bzl b/rules/scala/init.bzl
@@ -1,3 +1,4 @@
+load("@annex_deps//:defs.bzl", "pinned_maven_install")
 load("@bazel_features//:deps.bzl", "bazel_features_deps")
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
@@ -18,8 +19,8 @@ def rules_scala3_init():
     protobuf_deps()
     rules_proto_dependencies()
     rules_proto_toolchains()
-
     bazel_features_deps()
 
+    pinned_maven_install()
     load_maven_dependencies()
     scalafmt_default_config(".scalafmt.conf")
diff --git a/rules/scala/workspace.bzl b/rules/scala/workspace.bzl
@@ -24,6 +24,12 @@ filegroup(
 )
 """
 
+_ANNEX_DEPS_ARTIFACTS = [
+    "com.github.scopt:scopt_3:4.1.0",
+    "org.scala-sbt:librarymanagement-core_3:2.0.0-M2",
+    "org.scala-sbt:librarymanagement-coursier_3:2.0.0-alpha8",
+]
+
 repositories = [
     "https://repo1.maven.org/maven2",
     "https://repo.maven.apache.org/maven2",
@@ -36,6 +42,14 @@ sbt_version = "2.0.0-M2"
 zinc_version = "2.0.0-alpha14"
 
 def scala_repositories():
+    maven_install(
+        name = "annex_deps",
+        artifacts = _ANNEX_DEPS_ARTIFACTS,
+        fetch_sources = True,
+        maven_install_json = "@rules_scala3//:annex_deps_install.json",
+        repositories = repositories,
+    )
+
     http_archive(
         name = "compiler_bridge_2_13",
         build_file_content = _SRC_FILEGROUP_BUILD_FILE_CONTENT,

diff --git a/rules/scala_proto/3rdparty/workspace.bzl b/rules/scala_proto/3rdparty/workspace.bzl
@@ -37,7 +37,6 @@ def jar_artifact_callback(hash):
     )
     native.bind(name = hash["bind"], actual = hash["actual"])
 
-
 def list_dependencies():
     return [
         {"artifact":"com.google.protobuf:protobuf-java:4.28.2","url":"https://oss.sonatype.org/service/local/repositories/releases/content/com/google/protobuf/protobuf-java/4.28.2/protobuf-java-4.28.2.jar","name":"com_google_protobuf_protobuf_java","actual":"@com_google_protobuf_protobuf_java//jar","bind": "jar/com/google/protobuf/protobuf_java"},