From 09de6aff835fbb985ab229d11b17084ecf008cf3 Mon Sep 17 00:00:00 2001 From: d-asnaghi <30296575+hexdae@users.noreply.github.com> Date: Fri, 29 Mar 2024 22:15:44 -0500 Subject: [PATCH] [RENAME] arm_gnu_toolchain -> toolchains_arm_gnu --- .github/workflows/release_prep.sh | 4 ++-- MODULE.bazel | 4 ++-- MODULE.bazel.lock | 24 +++++++++++------------ README.md | 12 ++++++------ deps.bzl | 24 +++++++++++------------ examples/bzlmod/MODULE.bazel | 6 +++--- examples/bzlmod/MODULE.bazel.lock | 24 +++++++++++------------ examples/bzlmod/custom/toolchain/BUILD | 2 +- examples/workspace/WORKSPACE | 4 ++-- examples/workspace/custom/toolchain/BUILD | 2 +- extensions.bzl | 2 +- toolchain/templates/compiler.BUILD | 2 +- toolchain/templates/toolchain.BUILD | 2 +- toolchain/templates/top.BUILD | 2 +- toolchain/toolchain.bzl | 4 ++-- 15 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh index cb15e3b..fa0dbdd 100755 --- a/.github/workflows/release_prep.sh +++ b/.github/workflows/release_prep.sh @@ -22,10 +22,10 @@ cat << EOF 2. Add to your \`MODULE.bazel\` file: \`\`\`starlark -bazel_dep(name = "arm_gnu_toolchain", version = "${TAG:1}") +bazel_dep(name = "toolchains_arm_gnu", version = "${TAG:1}") # Toolchains: arm-none-eabi -arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain") +arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain") arm_toolchain.arm_none_eabi(version = "13.2.1") use_repo( arm_toolchain, diff --git a/MODULE.bazel b/MODULE.bazel index a9678c4..0d99c48 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,7 +1,7 @@ """ARM cross compilation toolchains for bazel""" module( - name = "arm_gnu_toolchain", + name = "toolchains_arm_gnu", version = "0.0.1", compatibility_level = 1, ) @@ -9,7 +9,7 @@ module( bazel_dep(name = "platforms", version = "0.0.8") bazel_dep(name = "rules_cc", version = "0.0.9") -arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain") +arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain") # NOTE: It's important that we update these versions whenever a new toolchain # version is added--otherwise the Minimum Selected Version algorithm in the diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 82bdd60..05d38b7 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "0bb6ed08d84140248cc36b08a8d24b2ee5d2c841af64ff7b75ccd0f224449204", + "moduleFileHash": "26d1bc5070c1e33727ca25c5b2274f1371d7cfc9d663ec6662036c9a8d053a0e", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -17,10 +17,10 @@ }, "moduleDepGraph": { "": { - "name": "arm_gnu_toolchain", + "name": "toolchains_arm_gnu", "version": "0.0.1", "key": "", - "repoName": "arm_gnu_toolchain", + "repoName": "toolchains_arm_gnu", "executionPlatformsToRegister": [], "toolchainsToRegister": [ "@arm_none_eabi//toolchain:all", @@ -28,7 +28,7 @@ ], "extensionUsages": [ { - "extensionBzlFile": "@arm_gnu_toolchain//:extensions.bzl", + "extensionBzlFile": "@toolchains_arm_gnu//:extensions.bzl", "extensionName": "arm_toolchain", "usingModule": "", "location": { @@ -851,7 +851,7 @@ "moduleExtensions": { "//:extensions.bzl%arm_toolchain": { "general": { - "bzlTransitiveDigest": "68x6OPYnfiqMUJFpsDTaan+3xQVMbwI/Jq2kLITElzM=", + "bzlTransitiveDigest": "pdhTMi3AXP4Bw6DTqBvDsEE26W7dV7bGF266MQn5KdU=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -928,7 +928,7 @@ }, "arm_none_eabi": { "bzlFile": "@@//:deps.bzl", - "ruleClassName": "arm_gnu_toolchain_repo", + "ruleClassName": "toolchains_arm_gnu_repo", "attributes": { "name": "_main~arm_toolchain~arm_none_eabi", "toolchain_name": "arm_none_eabi", @@ -962,7 +962,7 @@ }, "arm_none_linux_gnueabihf": { "bzlFile": "@@//:deps.bzl", - "ruleClassName": "arm_gnu_toolchain_repo", + "ruleClassName": "toolchains_arm_gnu_repo", "attributes": { "name": "_main~arm_toolchain~arm_none_linux_gnueabihf", "toolchain_name": "arm_none_linux_gnueabihf", @@ -984,11 +984,6 @@ } }, "recordedRepoMappingEntries": [ - [ - "", - "arm_gnu_toolchain", - "" - ], [ "", "bazel_tools", @@ -999,6 +994,11 @@ "rules_cc", "rules_cc~0.0.9" ], + [ + "", + "toolchains_arm_gnu", + "" + ], [ "rules_cc~0.0.9", "bazel_tools", diff --git a/README.md b/README.md index 6c6d001..95b4dd0 100644 --- a/README.md +++ b/README.md @@ -67,16 +67,16 @@ Please look at the [`examples`](./examples/) folder for reference usage ```python # MODULE.bazel -bazel_dep(name = "arm_gnu_toolchain", version = "0.0.1") +bazel_dep(name = "toolchains_arm_gnu", version = "0.0.1") git_override( - module_name = "arm_gnu_toolchain", + module_name = "toolchains_arm_gnu", remote = "https://github.com/hexdae/bazel-arm-none-eabi", branch = "master", ) # Toolchains: arm-none-eabi -arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain") +arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain") arm_toolchain.arm_none_eabi(version = "9.2.1") use_repo( arm_toolchain, @@ -125,12 +125,12 @@ git_repository( ) # Toolchain: arm-none-eabi -load("@arm_gnu_toolchain//:deps.bzl", "arm_none_eabi_deps", "register_default_arm_none_eabi_toolchains") +load("@toolchains_arm_gnu//:deps.bzl", "arm_none_eabi_deps", "register_default_arm_none_eabi_toolchains") arm_none_eabi_deps() register_default_arm_none_eabi_toolchains() # Toolchain arm-none-linux-gnueabihf -load("@arm_gnu_toolchain//:deps.bzl", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_linux_gnueabihf_toolchains") +load("@toolchains_arm_gnu//:deps.bzl", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_linux_gnueabihf_toolchains") arm_none_linux_gnueabihf_deps() register_default_arm_none_linux_gnueabihf_toolchains() ``` @@ -146,7 +146,7 @@ In a BUILD file: ```python # path/to/toolchains/BUILD -load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "arm_none_eabi_toolchain") +load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "arm_none_eabi_toolchain") arm_none_eabi_toolchain( name = "custom_toolchain", target_compatible_with = [ diff --git a/deps.bzl b/deps.bzl index d3dc96c..026414c 100644 --- a/deps.bzl +++ b/deps.bzl @@ -1,7 +1,7 @@ """deps.bzl""" load( - "@arm_gnu_toolchain//toolchain:toolchain.bzl", + "@toolchains_arm_gnu//toolchain:toolchain.bzl", "register_arm_gnu_toolchain", "target_constraints", ) @@ -81,21 +81,21 @@ GCC_ARM_NONE_LINUX_GNUEABIHF = { "sha256": "df0f4927a67d1fd366ff81e40bd8c385a9324fbdde60437a512d106215f257b3", "strip_prefix": "arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-linux-gnueabihf", "url": "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz?rev=adb0c0238c934aeeaa12c09609c5e6fc&hash=68DA67DE12CBAD82A0FA4B75247E866155C93053", - "patches": ["@arm_gnu_toolchain//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"], + "patches": ["@toolchains_arm_gnu//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"], }, { "name": "arm_none_linux_gnueabihf_linux_aarch64", "sha256": "8ad384bb328bccc44396d85c8f8113b7b8c5e11bcfef322e77cda3ebe7baadb5", "strip_prefix": "arm-gnu-toolchain-13.2.Rel1-aarch64-arm-none-linux-gnueabihf", "url": "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz?rev=fbdb67e76c8349e5ad27a7c40fb270c9&hash=8CD3EBFFDC5E211275B705F6F9BCC0F6F5B4A53E", - "patches": ["@arm_gnu_toolchain//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"], + "patches": ["@toolchains_arm_gnu//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"], }, { "name": "arm_none_linux_gnueabihf_windows_x86_64", "sha256": "047e72bcef8f7767691f36929a8c74ef66f717cf6264a31f48dd31bfb067f4c8", "strip_prefix": "arm-gnu-toolchain-13.2.Rel1-mingw-w64-i686-arm-none-linux-gnueabihf", "url": "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-linux-gnueabihf.zip?rev=14b6dd20622a4beabb60a6ee41a4c141&hash=C1F9FA6DE8259B5ACA0211139F4304F2B942E489", - "patches": ["@arm_gnu_toolchain//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"], + "patches": ["@toolchains_arm_gnu//toolchain:patches/0001-Resolve-libc-relative-to-sysroot.patch"], "bin_extension": ".exe", }, ], @@ -110,7 +110,7 @@ def _arm_gnu_cross_hosted_platform_specific_repo_impl(repository_ctx): ) repository_ctx.template( "BUILD.bazel", - Label("@arm_gnu_toolchain//toolchain:templates/compiler.BUILD"), + Label("@toolchains_arm_gnu//toolchain:templates/compiler.BUILD"), substitutions = { "%toolchain_prefix%": repository_ctx.attr.toolchain_prefix, "%version%": repository_ctx.attr.version, @@ -137,7 +137,7 @@ def _arm_gnu_toolchain_repo_impl(repository_ctx): """Defines the top-level toolchain repository.""" repository_ctx.template( "BUILD", - Label("@arm_gnu_toolchain//toolchain:templates/top.BUILD"), + Label("@toolchains_arm_gnu//toolchain:templates/top.BUILD"), substitutions = { "%toolchain_name%": repository_ctx.attr.toolchain_name, "%version%": repository_ctx.attr.version, @@ -147,7 +147,7 @@ def _arm_gnu_toolchain_repo_impl(repository_ctx): repository_ctx.template( "toolchain/BUILD", - Label("@arm_gnu_toolchain//toolchain:templates/toolchain.BUILD"), + Label("@toolchains_arm_gnu//toolchain:templates/toolchain.BUILD"), substitutions = { "%toolchain_name%": repository_ctx.attr.toolchain_name, "%version%": repository_ctx.attr.version, @@ -155,7 +155,7 @@ def _arm_gnu_toolchain_repo_impl(repository_ctx): }, ) -arm_gnu_toolchain_repo = repository_rule( +toolchains_arm_gnu_repo = repository_rule( implementation = _arm_gnu_toolchain_repo_impl, attrs = { "toolchain_name": attr.string(mandatory = True), @@ -164,8 +164,8 @@ arm_gnu_toolchain_repo = repository_rule( }, ) -def arm_gnu_toolchain_deps(toolchain, toolchain_prefix, version, archives): - arm_gnu_toolchain_repo( +def toolchains_arm_gnu_deps(toolchain, toolchain_prefix, version, archives): + toolchains_arm_gnu_repo( name = toolchain, toolchain_name = toolchain, toolchain_prefix = toolchain_prefix, @@ -195,7 +195,7 @@ def arm_none_eabi_deps(version = "13.2.1", archives = GCC_ARM_NONE_EABI): version: The version of the toolchain to use. If None, the latest version is used. archives: A dictionary of version to archive attributes. """ - arm_gnu_toolchain_deps( + toolchains_arm_gnu_deps( "arm_none_eabi", "arm-none-eabi", version, @@ -217,7 +217,7 @@ def arm_none_linux_gnueabihf_deps(version = "13.2.1", archives = GCC_ARM_NONE_LI version: The version of the toolchain to use. If None, the latest version is used. archives: A dictionary of the version to archive attributes. """ - arm_gnu_toolchain_deps( + toolchains_arm_gnu_deps( "arm_none_linux_gnueabihf", "arm-none-linux-gnueabihf", version, diff --git a/examples/bzlmod/MODULE.bazel b/examples/bzlmod/MODULE.bazel index 22df4e8..36458fa 100644 --- a/examples/bzlmod/MODULE.bazel +++ b/examples/bzlmod/MODULE.bazel @@ -7,13 +7,13 @@ module( bazel_dep(name = "aspect_bazel_lib", version = "2.0.0") bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "arm_gnu_toolchain") +bazel_dep(name = "toolchains_arm_gnu") local_path_override( - module_name = "arm_gnu_toolchain", + module_name = "toolchains_arm_gnu", path = "../..", ) -arm_toolchain = use_extension("@arm_gnu_toolchain//:extensions.bzl", "arm_toolchain") +arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolchain") arm_toolchain.arm_none_eabi(version = "13.2.1") use_repo( arm_toolchain, diff --git a/examples/bzlmod/MODULE.bazel.lock b/examples/bzlmod/MODULE.bazel.lock index 1895161..f8beca7 100644 --- a/examples/bzlmod/MODULE.bazel.lock +++ b/examples/bzlmod/MODULE.bazel.lock @@ -13,7 +13,7 @@ "compatibilityMode": "ERROR" }, "localOverrideHashes": { - "arm_gnu_toolchain": "9a1aced68749934422568fffb9081a7b1fdf4710f5b8881852008b4c480309c3", + "toolchains_arm_gnu": "9a1aced68749934422568fffb9081a7b1fdf4710f5b8881852008b4c480309c3", "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0" }, "moduleDepGraph": { @@ -30,7 +30,7 @@ ], "extensionUsages": [ { - "extensionBzlFile": "@arm_gnu_toolchain//:extensions.bzl", + "extensionBzlFile": "@toolchains_arm_gnu//:extensions.bzl", "extensionName": "arm_toolchain", "usingModule": "", "location": { @@ -84,7 +84,7 @@ "deps": { "aspect_bazel_lib": "aspect_bazel_lib@2.0.0", "bazel_skylib": "bazel_skylib@1.5.0", - "arm_gnu_toolchain": "arm_gnu_toolchain@_", + "toolchains_arm_gnu": "toolchains_arm_gnu@_", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" } @@ -257,20 +257,20 @@ } } }, - "arm_gnu_toolchain@_": { - "name": "arm_gnu_toolchain", + "toolchains_arm_gnu@_": { + "name": "toolchains_arm_gnu", "version": "0.0.1", - "key": "arm_gnu_toolchain@_", - "repoName": "arm_gnu_toolchain", + "key": "toolchains_arm_gnu@_", + "repoName": "toolchains_arm_gnu", "executionPlatformsToRegister": [], "toolchainsToRegister": [], "extensionUsages": [ { - "extensionBzlFile": "@arm_gnu_toolchain//:extensions.bzl", + "extensionBzlFile": "@toolchains_arm_gnu//:extensions.bzl", "extensionName": "arm_toolchain", - "usingModule": "arm_gnu_toolchain@_", + "usingModule": "toolchains_arm_gnu@_", "location": { - "file": "@@arm_gnu_toolchain~//:MODULE.bazel", + "file": "@@toolchains_arm_gnu~//:MODULE.bazel", "line": 12, "column": 30 }, @@ -295,7 +295,7 @@ }, "devDependency": false, "location": { - "file": "@@arm_gnu_toolchain~//:MODULE.bazel", + "file": "@@toolchains_arm_gnu~//:MODULE.bazel", "line": 18, "column": 28 } @@ -307,7 +307,7 @@ }, "devDependency": false, "location": { - "file": "@@arm_gnu_toolchain~//:MODULE.bazel", + "file": "@@toolchains_arm_gnu~//:MODULE.bazel", "line": 30, "column": 39 } diff --git a/examples/bzlmod/custom/toolchain/BUILD b/examples/bzlmod/custom/toolchain/BUILD index 6455951..f4b525f 100644 --- a/examples/bzlmod/custom/toolchain/BUILD +++ b/examples/bzlmod/custom/toolchain/BUILD @@ -1,4 +1,4 @@ -load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "arm_none_eabi_toolchain") +load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "arm_none_eabi_toolchain") # Cortex-M3 toolchain arm_none_eabi_toolchain( diff --git a/examples/workspace/WORKSPACE b/examples/workspace/WORKSPACE index f71d316..3d517ea 100644 --- a/examples/workspace/WORKSPACE +++ b/examples/workspace/WORKSPACE @@ -20,11 +20,11 @@ git_repository( ) local_repository( - name = "arm_gnu_toolchain", + name = "toolchains_arm_gnu", path = "../../", ) -load("@arm_gnu_toolchain//:deps.bzl", "arm_none_eabi_deps", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_eabi_toolchains", "register_default_arm_none_linux_gnueabihf_toolchains") +load("@toolchains_arm_gnu//:deps.bzl", "arm_none_eabi_deps", "arm_none_linux_gnueabihf_deps", "register_default_arm_none_eabi_toolchains", "register_default_arm_none_linux_gnueabihf_toolchains") # Toolchain: arm-none-eabi arm_none_eabi_deps() diff --git a/examples/workspace/custom/toolchain/BUILD b/examples/workspace/custom/toolchain/BUILD index 6455951..f4b525f 100644 --- a/examples/workspace/custom/toolchain/BUILD +++ b/examples/workspace/custom/toolchain/BUILD @@ -1,4 +1,4 @@ -load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "arm_none_eabi_toolchain") +load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "arm_none_eabi_toolchain") # Cortex-M3 toolchain arm_none_eabi_toolchain( diff --git a/extensions.bzl b/extensions.bzl index 5104ed5..ef404c8 100644 --- a/extensions.bzl +++ b/extensions.bzl @@ -1,5 +1,5 @@ load( - "@arm_gnu_toolchain//:deps.bzl", + "@toolchains_arm_gnu//:deps.bzl", "arm_none_eabi_deps", "arm_none_linux_gnueabihf_deps", ) diff --git a/toolchain/templates/compiler.BUILD b/toolchain/templates/compiler.BUILD index 5255ab1..4cce8fd 100644 --- a/toolchain/templates/compiler.BUILD +++ b/toolchain/templates/compiler.BUILD @@ -3,7 +3,7 @@ This BUILD file marks the top of the host-specific cross-toolchain repository. If the host needs @arm_none_eabi_linux_x86_64, this is the build file at the top of that repository. """ -load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "tools") +load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "tools") package(default_visibility = ["//visibility:public"]) diff --git a/toolchain/templates/toolchain.BUILD b/toolchain/templates/toolchain.BUILD index b43bbc6..ce13de8 100644 --- a/toolchain/templates/toolchain.BUILD +++ b/toolchain/templates/toolchain.BUILD @@ -7,7 +7,7 @@ For example, "@arm_none_eabi//toolchain:*" package(default_visibility = ["//visibility:public"]) load( - "@arm_gnu_toolchain//toolchain:toolchain.bzl", + "@toolchains_arm_gnu//toolchain:toolchain.bzl", "%toolchain_name%_toolchain", "target_constraints", ) diff --git a/toolchain/templates/top.BUILD b/toolchain/templates/top.BUILD index a650042..648fe46 100644 --- a/toolchain/templates/top.BUILD +++ b/toolchain/templates/top.BUILD @@ -4,7 +4,7 @@ repository, i.e., the targets defined here appear in the workspace as "@arm_none_eabi//:*" for arm-none-eabi toolchains. """ -load("@arm_gnu_toolchain//toolchain:toolchain.bzl", "hosts", "tools") +load("@toolchains_arm_gnu//toolchain:toolchain.bzl", "hosts", "tools") package(default_visibility = ["//visibility:public"]) diff --git a/toolchain/toolchain.bzl b/toolchain/toolchain.bzl index 7e691cb..711ab13 100644 --- a/toolchain/toolchain.bzl +++ b/toolchain/toolchain.bzl @@ -2,7 +2,7 @@ This module provides functions to register an arm-none-eabi toolchain """ -load("@arm_gnu_toolchain//toolchain:config.bzl", "cc_arm_gnu_toolchain_config") +load("@toolchains_arm_gnu//toolchain:config.bzl", "cc_arm_gnu_toolchain_config") load("@rules_cc//cc:defs.bzl", "cc_toolchain") tools = [ @@ -117,7 +117,7 @@ def arm_none_eabi_toolchain(name, version = "13.2.1", **kwargs): Args: name: The name of the toolchain. version: The version of the gcc toolchain. - **kwargs: same as arm_gnu_toolchain + **kwargs: same as toolchains_arm_gnu """ _arm_gnu_toolchain( name,