Rename musl-toolchain cell to rules_musl. (#3)

zadlg · Mar 10, 2024 · 21f951b · 21f951b
1 parent fd17808
commit 21f951b
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 189 deletions.
diff --git a/.buckconfig b/.buckconfig
@@ -1,6 +1,6 @@
 [repositories]
 root = .
-musl-toolchain = .
+rules_musl = .
 prelude = prelude
 toolchains = toolchains
 none = none
@@ -15,4 +15,4 @@ buck = none
 
 [parser]
 target_platform_detector_spec = target:root//...->prelude//platforms:default
-target_platform_detector_spec = target:musl-toolchain//...->prelude//platforms:default
+target_platform_detector_spec = target:rules_musl//...->prelude//platforms:default
diff --git a/docs/generate.sh b/docs/generate.sh
@@ -6,11 +6,11 @@ buck2 docs starlark \
   --format markdown_files \
   --markdown-files-starlark-subdir "" \
   --markdown-files-destination-dir "${PWD}/docs/" \
-  -- @musl-toolchain//musl-toolchain:rules.bzl \
-  @musl-toolchain//musl-toolchain/archive:rules.bzl \
-  @musl-toolchain//musl-toolchain:providers.bzl \
-  @musl-toolchain//musl-toolchain:define_toolchain.bzl \
-  @musl-toolchain//musl-toolchain:types.bzl
+  -- @rules_musl//musl:rules.bzl \
+  @rules_musl//musl/archive:rules.bzl \
+  @rules_musl//musl:providers.bzl \
+  @rules_musl//musl:define_toolchain.bzl \
+  @rules_musl//musl:types.bzl
 
 if ! [ "$1" = "generate" ]; then
   if [ -d ".git" ]; then

diff --git a/docs/musl-toolchain/musl-toolchain/archive.bzl.md b/docs/musl-toolchain/musl-toolchain/archive.bzl.md
diff --git a/...chain/musl-toolchain/archive/rules.bzl.md → docs/root/musl/archive/rules.bzl.md b/...chain/musl-toolchain/archive/rules.bzl.md → docs/root/musl/archive/rules.bzl.md
diff --git a/...in/musl-toolchain/define_toolchain.bzl.md → docs/root/musl/define_toolchain.bzl.md b/...in/musl-toolchain/define_toolchain.bzl.md → docs/root/musl/define_toolchain.bzl.md
diff --git a/...toolchain/musl-toolchain/providers.bzl.md → docs/root/musl/providers.bzl.md b/...toolchain/musl-toolchain/providers.bzl.md → docs/root/musl/providers.bzl.md
diff --git a/...usl-toolchain/musl-toolchain/rules.bzl.md → docs/root/musl/rules.bzl.md b/...usl-toolchain/musl-toolchain/rules.bzl.md → docs/root/musl/rules.bzl.md
diff --git a/...usl-toolchain/musl-toolchain/types.bzl.md → docs/root/musl/types.bzl.md b/...usl-toolchain/musl-toolchain/types.bzl.md → docs/root/musl/types.bzl.md
diff --git a/musl-toolchain/all_archives.bzl → musl/all_archives.bzl b/musl-toolchain/all_archives.bzl → musl/all_archives.bzl
diff --git a/musl-toolchain/archive/BUCK → musl/archive/BUCK b/musl-toolchain/archive/BUCK → musl/archive/BUCK
diff --git a/musl-toolchain/archive/rules.bzl → musl/archive/rules.bzl b/musl-toolchain/archive/rules.bzl → musl/archive/rules.bzl
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@musl-toolchain//musl-toolchain:providers.bzl", "ArchiveInfo", "ArchiveToolchainInfo")
-load("@musl-toolchain//musl-toolchain:types.bzl", "Architecture", "Archive", "ArchiveManifest", "Mode", "Platform")
-load("@musl-toolchain//musl-toolchain:rules.bzl", "manifest_from_flat_dict", "manifest_get_default", "manifest_to_flat_dict")
+load("@rules_musl//musl:providers.bzl", "ArchiveInfo", "ArchiveToolchainInfo")
+load("@rules_musl//musl:types.bzl", "Architecture", "Archive", "ArchiveManifest", "Mode", "Platform")
+load("@rules_musl//musl:rules.bzl", "manifest_from_flat_dict", "manifest_get_default", "manifest_to_flat_dict")
 
 # Prefix in the archive.
 _ARCHIVE_PREFIX_FORMAT = "{arch}-{platform}-musl-{mode}"

diff --git a/musl-toolchain/default-toolchains/BUCK → musl/default-toolchains/BUCK b/musl-toolchain/default-toolchains/BUCK → musl/default-toolchains/BUCK
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@musl-toolchain//musl-toolchain/archive:rules.bzl", "new_archive")
-load("@musl-toolchain//musl-toolchain:types.bzl", "Architecture", "Mode", "Platform")
-load("@musl-toolchain//musl-toolchain:define_toolchain.bzl", "define_cxx_toolchain")
-load("@musl-toolchain//musl-toolchain:all_archives.bzl", "X86_64_LINUX_NATIVE")
+load("@rules_musl//musl/archive:rules.bzl", "new_archive")
+load("@rules_musl//musl:types.bzl", "Architecture", "Mode", "Platform")
+load("@rules_musl//musl:define_toolchain.bzl", "define_cxx_toolchain")
+load("@rules_musl//musl:all_archives.bzl", "X86_64_LINUX_NATIVE")
 
 new_archive(
     name = "x86_64-linux-native",

diff --git a/musl-toolchain/define_toolchain.bzl → musl/define_toolchain.bzl b/musl-toolchain/define_toolchain.bzl → musl/define_toolchain.bzl
diff --git a/musl-toolchain/providers.bzl → musl/providers.bzl b/musl-toolchain/providers.bzl → musl/providers.bzl
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@musl-toolchain//musl-toolchain/providers:archive_info.bzl", "ArchiveInfo")
-load("@musl-toolchain//musl-toolchain/providers:archive_toolchain_info.bzl", "ArchiveToolchainInfo")
+load("@rules_musl//musl/providers:archive_info.bzl", "ArchiveInfo")
+load("@rules_musl//musl/providers:archive_toolchain_info.bzl", "ArchiveToolchainInfo")
 
 load_symbols({
     "ArchiveInfo": ArchiveInfo,

diff --git a/musl-toolchain/providers/archive_info.bzl → musl/providers/archive_info.bzl b/musl-toolchain/providers/archive_info.bzl → musl/providers/archive_info.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@musl-toolchain//musl-toolchain/types:archive.bzl", "Archive")
+load("@rules_musl//musl/types:archive.bzl", "Archive")
 
 ArchiveInfo = provider(
     doc = "Info about an archive",

diff --git a/...hain/providers/archive_toolchain_info.bzl → musl/providers/archive_toolchain_info.bzl b/...hain/providers/archive_toolchain_info.bzl → musl/providers/archive_toolchain_info.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@musl-toolchain//musl-toolchain/types:archive.bzl", "Archive")
+load("@rules_musl//musl/types:archive.bzl", "Archive")
 
 ArchiveToolchainInfo = provider(
     doc = "Toolchain related info from an archive",

diff --git a/musl-toolchain/rules.bzl → musl/rules.bzl b/musl-toolchain/rules.bzl → musl/rules.bzl
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 load(
-    "@musl-toolchain//musl-toolchain/types:manifest.bzl",
+    "@rules_musl//musl/types:manifest.bzl",
     manifest_from_flat_dict = "from_flat_dict",
     manifest_get_default = "default",
     manifest_to_flat_dict = "to_flat_dict",

diff --git a/musl-toolchain/types.bzl → musl/types.bzl b/musl-toolchain/types.bzl → musl/types.bzl
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@musl-toolchain//musl-toolchain/types:architecture.bzl", "Architecture")
-load("@musl-toolchain//musl-toolchain/types:archive.bzl", "Archive")
-load("@musl-toolchain//musl-toolchain/types:manifest.bzl", "ArchiveManifest", "ArchiveManifestLibraries", "ArchiveManifestTools")
-load("@musl-toolchain//musl-toolchain/types:mode.bzl", "Mode")
-load("@musl-toolchain//musl-toolchain/types:platform.bzl", "Platform")
+load("@rules_musl//musl/types:architecture.bzl", "Architecture")
+load("@rules_musl//musl/types:archive.bzl", "Archive")
+load("@rules_musl//musl/types:manifest.bzl", "ArchiveManifest", "ArchiveManifestLibraries", "ArchiveManifestTools")
+load("@rules_musl//musl/types:mode.bzl", "Mode")
+load("@rules_musl//musl/types:platform.bzl", "Platform")
 
 load_symbols({
     "Architecture": Architecture,

diff --git a/musl-toolchain/types/architecture.bzl → musl/types/architecture.bzl b/musl-toolchain/types/architecture.bzl → musl/types/architecture.bzl
diff --git a/musl-toolchain/types/archive.bzl → musl/types/archive.bzl b/musl-toolchain/types/archive.bzl → musl/types/archive.bzl
diff --git a/musl-toolchain/types/manifest.bzl → musl/types/manifest.bzl b/musl-toolchain/types/manifest.bzl → musl/types/manifest.bzl
diff --git a/musl-toolchain/types/mode.bzl → musl/types/mode.bzl b/musl-toolchain/types/mode.bzl → musl/types/mode.bzl
diff --git a/musl-toolchain/types/platform.bzl → musl/types/platform.bzl b/musl-toolchain/types/platform.bzl → musl/types/platform.bzl
diff --git a/toolchains/BUCK b/toolchains/BUCK
@@ -1,6 +1,6 @@
 load("@prelude//toolchains:genrule.bzl", "system_genrule_toolchain")
 load("@prelude//toolchains:python.bzl", "system_python_bootstrap_toolchain", "system_python_toolchain")
-load("@musl-toolchain//musl-toolchain:define_toolchain.bzl", "define_cxx_toolchain")
+load("@rules_musl//musl:define_toolchain.bzl", "define_cxx_toolchain")
 
 system_python_bootstrap_toolchain(
     name = "python_bootstrap",
@@ -14,6 +14,6 @@ system_genrule_toolchain(
 
 define_cxx_toolchain(
     name = "cxx",
-    archive = "@musl-toolchain//musl-toolchain/default-toolchains:x86_64-linux-native",
+    archive = "@rules_musl//musl/default-toolchains:x86_64-linux-native",
     visibility = ["PUBLIC"],
 )