Rewire toolchain targets After this, we only reference toolchain type targets under @bazel_tools//tools/jdk - @bazel_tools//tools/jdk:toolchain_type - @bazel_tools//tools/jdk:runtime_toolchain_type
diff --git a/toolchains/BUILD b/toolchains/BUILD index 6f7fef4..06f0448 100644 --- a/toolchains/BUILD +++ b/toolchains/BUILD
@@ -1,5 +1,5 @@ load( - "@bazel_tools//tools/jdk:default_java_toolchain.bzl", + "//toolchains:default_java_toolchain.bzl", "DEFAULT_TOOLCHAIN_CONFIGURATION", "JVM8_TOOLCHAIN_CONFIGURATION", "PREBUILT_TOOLCHAIN_CONFIGURATION", @@ -9,12 +9,13 @@ "java_runtime_files", ) load( - "//tools/jdk:java_toolchain_alias.bzl", + "//toolchains:java_toolchain_alias.bzl", "java_host_runtime_alias", "java_runtime_alias", "java_runtime_version_alias", "java_toolchain_alias", ) +load("@rules_python//python:defs.bzl", "py_binary", "py_test") package(default_visibility = ["//visibility:public"]) @@ -26,16 +27,13 @@ visibility = ["@//:__pkg__"], ) - -load("//tools/python:private/defs.bzl", "py_binary", "py_test") - -package(default_visibility = ["//visibility:public"]) - # Used to distinguish toolchains used for Java development, ie the JavaToolchainProvider. -toolchain_type(name = "toolchain_type") +# TODO: migrate away from using @bazel_tools//tools/jdk:toolchain_type ? +# toolchain_type(name = "toolchain_type") # Used to distinguish toolchains used for Java execution, ie the JavaRuntimeInfo. -toolchain_type(name = "runtime_toolchain_type") +# TODO: migrate away from using @bazel_tools//tools/jdk:runtime_toolchain_type ? +# toolchain_type(name = "runtime_toolchain_type") # Points to toolchain[":runtime_toolchain_type"] (was :legacy_current_java_runtime) java_runtime_alias(name = "current_java_runtime") @@ -57,7 +55,7 @@ # *before* the transition. alias( name = "java_runtime_alias", - actual = "//tools/jdk:current_java_runtime", + actual = ":current_java_runtime", ) # These individual jni_* targets are exposed for legacy reasons. @@ -102,29 +100,29 @@ cc_library( name = "jni", hdrs = [":jni_header"] + select({ - "//src/conditions:linux_aarch64": [":jni_md_header-linux"], - "//src/conditions:linux_ppc64le": [":jni_md_header-linux"], - "//src/conditions:linux_s390x": [":jni_md_header-linux"], - "//src/conditions:linux_mips64": [":jni_md_header-linux"], - "//src/conditions:linux_riscv64": [":jni_md_header-linux"], - "//src/conditions:linux_x86_64": [":jni_md_header-linux"], - "//src/conditions:darwin": [":jni_md_header-darwin"], - "//src/conditions:freebsd": [":jni_md_header-freebsd"], - "//src/conditions:openbsd": [":jni_md_header-openbsd"], - "//src/conditions:windows": [":jni_md_header-windows"], + "@bazel_tools//src/conditions:linux_aarch64": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_ppc64le": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_s390x": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_mips64": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_riscv64": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_x86_64": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:darwin": [":jni_md_header-darwin"], + "@bazel_tools//src/conditions:freebsd": [":jni_md_header-freebsd"], + "@bazel_tools//src/conditions:openbsd": [":jni_md_header-openbsd"], + "@bazel_tools//src/conditions:windows": [":jni_md_header-windows"], "//conditions:default": [], }), includes = ["include"] + select({ - "//src/conditions:linux_aarch64": ["include/linux"], - "//src/conditions:linux_ppc64le": ["include/linux"], - "//src/conditions:linux_s390x": ["include/linux"], - "//src/conditions:linux_mips64": [":include/linux"], - "//src/conditions:linux_riscv64": [":include/linux"], - "//src/conditions:linux_x86_64": ["include/linux"], - "//src/conditions:darwin": ["include/darwin"], - "//src/conditions:freebsd": ["include/freebsd"], - "//src/conditions:openbsd": ["include/openbsd"], - "//src/conditions:windows": ["include/win32"], + "@bazel_tools//src/conditions:linux_aarch64": ["include/linux"], + "@bazel_tools//src/conditions:linux_ppc64le": ["include/linux"], + "@bazel_tools//src/conditions:linux_s390x": ["include/linux"], + "@bazel_tools//src/conditions:linux_mips64": [":include/linux"], + "@bazel_tools//src/conditions:linux_riscv64": [":include/linux"], + "@bazel_tools//src/conditions:linux_x86_64": ["include/linux"], + "@bazel_tools//src/conditions:darwin": ["include/darwin"], + "@bazel_tools//src/conditions:freebsd": ["include/freebsd"], + "@bazel_tools//src/conditions:openbsd": ["include/openbsd"], + "@bazel_tools//src/conditions:windows": ["include/win32"], "//conditions:default": [], }), ) @@ -180,9 +178,9 @@ alias( name = "ijar_prebuilt_binary_or_cc_binary", actual = select({ - "//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", - "//src/conditions:darwin": ":ijar_prebuilt_binary_darwin", - "//src/conditions:windows": ":ijar_prebuilt_binary_windows", + "@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", + "@bazel_tools//src/conditions:darwin": ":ijar_prebuilt_binary_darwin", + "@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows", "//conditions:default": "@remote_java_tools//:ijar_cc_binary", }), ) @@ -190,9 +188,9 @@ alias( name = "ijar_prebuilt_binary", actual = select({ - "//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", - "//src/conditions:darwin": ":ijar_prebuilt_binary_darwin", - "//src/conditions:windows": ":ijar_prebuilt_binary_windows", + "@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", + "@bazel_tools//src/conditions:darwin": ":ijar_prebuilt_binary_darwin", + "@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows", }), ) @@ -210,9 +208,9 @@ alias( name = "singlejar_prebuilt_or_cc_binary", actual = select({ - "//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", - "//src/conditions:darwin": ":prebuilt_singlejar_darwin", - "//src/conditions:windows": ":prebuilt_singlejar_windows", + "@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", + "@bazel_tools//src/conditions:darwin": ":prebuilt_singlejar_darwin", + "@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows", "//conditions:default": "@remote_java_tools//:singlejar_cc_bin", }), ) @@ -220,9 +218,9 @@ alias( name = "prebuilt_singlejar", actual = select({ - "//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", - "//src/conditions:darwin": ":prebuilt_singlejar_darwin", - "//src/conditions:windows": ":prebuilt_singlejar_windows", + "@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", + "@bazel_tools//src/conditions:darwin": ":prebuilt_singlejar_darwin", + "@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows", }), ) @@ -372,20 +370,11 @@ for release in RELEASES ] -# A toolchain that targets java 14. -default_java_toolchain( - name = "toolchain_jdk_14", - configuration = dict(), - java_runtime = "@bazel_tools//tools/jdk:remotejdk_14", - source_version = "14", - target_version = "14", -) - # A toolchain that targets java 15. default_java_toolchain( name = "toolchain_jdk_15", configuration = dict(), - java_runtime = "@bazel_tools//tools/jdk:remotejdk_15", + java_runtime = "//toolchains:remotejdk_15", source_version = "15", target_version = "15", ) @@ -394,7 +383,7 @@ default_java_toolchain( name = "toolchain_jdk_16", configuration = dict(), - java_runtime = "@bazel_tools//tools/jdk:remotejdk_16", + java_runtime = "//toolchains:remotejdk_16", source_version = "16", target_version = "16", ) @@ -403,7 +392,7 @@ default_java_toolchain( name = "toolchain_jdk_17", configuration = dict(), - java_runtime = "@bazel_tools//tools/jdk:remotejdk_17", + java_runtime = "//toolchains:remotejdk_17", source_version = "17", target_version = "17", )
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl index ac8ed5d..1e83e3c 100644 --- a/toolchains/default_java_toolchain.bzl +++ b/toolchains/default_java_toolchain.bzl
@@ -62,16 +62,16 @@ genclass = ["@remote_java_tools//:GenClass"], header_compiler = ["@remote_java_tools//:TurbineDirect"], header_compiler_direct = ["@remote_java_tools//:TurbineDirect"], - ijar = ["@bazel_tools//tools/jdk:ijar"], + ijar = ["//toolchains:ijar"], javabuilder = ["@remote_java_tools//:JavaBuilder"], javac_supports_workers = True, jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup", jvm_opts = BASE_JDK9_JVM_OPTS, misc = DEFAULT_JAVACOPTS, - singlejar = ["@bazel_tools//tools/jdk:singlejar"], + singlejar = ["//toolchains:singlejar"], # Code to enumerate target JVM boot classpath uses host JVM. Because # java_runtime-s are involved, its implementation is in @bazel_tools. - bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], + bootclasspath = ["//toolchains:platformclasspath"], source_version = "8", target_version = "8", reduced_classpath_incompatible_processors = [ @@ -82,7 +82,7 @@ JVM8_TOOLCHAIN_CONFIGURATION = dict( tools = ["@remote_java_tools//:javac_jar"], jvm_opts = ["-Xbootclasspath/p:$(location @remote_java_tools//:javac_jar)"], - java_runtime = "@bazel_tools//tools/jdk:jdk_8", + java_runtime = "//toolchains:jdk_8", ) DEFAULT_TOOLCHAIN_CONFIGURATION = dict( @@ -98,7 +98,7 @@ "@remote_java_tools//:java_compiler_jar", "@remote_java_tools//:jdk_compiler_jar", ], - java_runtime = "@bazel_tools//tools/jdk:remote_jdk11", + java_runtime = "//toolchains:remote_jdk11", ) # The 'vanilla' toolchain is an unsupported alternative to the default. @@ -137,9 +137,9 @@ "@remote_java_tools//:java_compiler_jar", "@remote_java_tools//:jdk_compiler_jar", ], - ijar = ["@bazel_tools//tools/jdk:ijar_prebuilt_binary"], - singlejar = ["@bazel_tools//tools/jdk:prebuilt_singlejar"], - java_runtime = "@bazel_tools//tools/jdk:remote_jdk11", + ijar = ["//toolchains:ijar_prebuilt_binary"], + singlejar = ["//toolchains:prebuilt_singlejar"], + java_runtime = "//toolchains:remote_jdk11", ) # The new toolchain is using all the tools from sources. @@ -158,7 +158,7 @@ ], ijar = ["@remote_java_tools//:ijar_cc_binary"], singlejar = ["@remote_java_tools//:singlejar_cc_bin"], - java_runtime = "@bazel_tools//tools/jdk:remote_jdk11", + java_runtime = "//toolchains:remote_jdk11", ) def default_java_toolchain(name, configuration = DEFAULT_TOOLCHAIN_CONFIGURATION, toolchain_definition = True, **kwargs): @@ -194,8 +194,8 @@ for src in srcs: native.genrule( name = "gen_%s" % src, - srcs = ["@bazel_tools//tools/jdk:current_java_runtime"], - toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"], + srcs = ["//toolchains:current_java_runtime"], + toolchains = ["//toolchains:current_java_runtime"], cmd = "cp $(JAVABASE)/%s $@" % src, outs = [src], )
diff --git a/toolchains/java_toolchain_alias.bzl b/toolchains/java_toolchain_alias.bzl index ddf6d3f..27bf4e4 100644 --- a/toolchains/java_toolchain_alias.bzl +++ b/toolchains/java_toolchain_alias.bzl
@@ -55,7 +55,7 @@ implementation = _java_host_runtime_alias, attrs = { "_runtime": attr.label( - default = Label("@bazel_tools//tools/jdk:current_java_runtime"), + default = Label("//toolchains:current_java_runtime"), providers = [ java_common.JavaRuntimeInfo, platform_common.TemplateVariableInfo,
diff --git a/toolchains/local_java_repository.bzl b/toolchains/local_java_repository.bzl index 4c0a433..1745813 100644 --- a/toolchains/local_java_repository.bzl +++ b/toolchains/local_java_repository.bzl
@@ -56,6 +56,12 @@ runtime_name: name of java_runtime target if it already exists. visibility: Visibility that will be applied to the java runtime target """ + + # The repository name in Bzlmod will be "<module canonical name>.<module extension name>.local_jdk" + # instead of "local_jdk", therefore we cannot just use it as the config_setting value, + # because it won't match the default value of --java_runtime_version (which is "local_jdk"). + name = name.split(".")[-1] + if runtime_name == None: runtime_name = name native.java_runtime( @@ -168,7 +174,7 @@ repository_ctx.file( "BUILD.bazel", - 'load("@bazel_tools//tools/jdk:local_java_repository.bzl", "local_java_runtime")\n' + + 'load("@rules_java//toolchains:local_java_repository.bzl", "local_java_runtime")\n' + build_file + local_java_runtime_macro, ) @@ -178,7 +184,7 @@ repository_ctx.symlink(file, file.basename) # Build file template, when JDK does not exist -_NOJDK_BUILD_TPL = '''load("@bazel_tools//tools/jdk:fail_rule.bzl", "fail_rule") +_NOJDK_BUILD_TPL = '''load("@rules_java//toolchains:fail_rule.bzl", "fail_rule") fail_rule( name = "jdk", header = "Auto-Configuration Error:", @@ -229,4 +235,3 @@ version: optionally java version """ _local_java_repository_rule(name = name, java_home = java_home, version = version, build_file = build_file) - native.register_toolchains("@" + name + "//:runtime_toolchain_definition")
diff --git a/toolchains/remote_java_repository.bzl b/toolchains/remote_java_repository.bzl index 050903c..33c0d6e 100644 --- a/toolchains/remote_java_repository.bzl +++ b/toolchains/remote_java_repository.bzl
@@ -47,7 +47,7 @@ """ http_archive( name = name, - build_file = "@bazel_tools//tools/jdk:jdk.BUILD", + build_file = Label("//toolchains:jdk.BUILD"), **kwargs ) _toolchain_config( @@ -85,4 +85,3 @@ toolchain = "@{repo}//:jdk".format(repo = name), ), ) - native.register_toolchains("@" + name + "_toolchain_config_repo//:toolchain")