refactor(build): extract esp/arm/mcu platform crates for parallel compiles (#1008 A2)

Cargo.toml

@@ -8,6 +8,9 @@ members = [
     "crates/fbuild-serial",
     "crates/fbuild-build",
     "crates/fbuild-build-engine",
+    "crates/fbuild-build-esp",
+    "crates/fbuild-build-arm",
+    "crates/fbuild-build-mcu",
     "crates/fbuild-deploy",
     "crates/fbuild-daemon",
     "crates/fbuild-cli",

ci/check_workspace_crates.py

@@ -45,8 +45,12 @@
         "crates/fbuild-serial",
         "crates/fbuild-build",
         # FastLED/fbuild#1008: compile-parallelism split — shared build engine
-        # extracted from fbuild-build so per-platform crates compile in parallel.
+        # + per-platform crates extracted from fbuild-build so they compile in
+        # parallel behind the fbuild-build facade.
         "crates/fbuild-build-engine",
+        "crates/fbuild-build-esp",
+        "crates/fbuild-build-arm",
+        "crates/fbuild-build-mcu",
         "crates/fbuild-deploy",
         "crates/fbuild-daemon",
         "crates/fbuild-cli",

ci/hooks/crate_guard.py

@@ -53,6 +53,9 @@
         # FastLED/fbuild#1008: compile-parallelism split of fbuild-build into a
         # shared engine + per-platform crates behind the fbuild-build facade.
         "crates/fbuild-build-engine",
+        "crates/fbuild-build-esp",
+        "crates/fbuild-build-arm",
+        "crates/fbuild-build-mcu",
         "crates/fbuild-deploy",
         "crates/fbuild-daemon",
         "crates/fbuild-cli",

crates/fbuild-build-arm/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "fbuild-build-arm"
+description = "ARM-family (generic_arm, STM32, RP2040, Apollo3, NXP LPC, SAM, nRF52, SiLabs, Teensy, Renesas) build orchestrators for fbuild (parallel platform crate). FastLED/fbuild#1008."
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+# Not published to crates.io — internal compile-parallelism split. FastLED/fbuild#1008.
+publish = false
+
+[dependencies]
+fbuild-build-engine = { path = "../fbuild-build-engine" }
+fbuild-core = { path = "../fbuild-core" }
+fbuild-config = { path = "../fbuild-config" }
+fbuild-paths = { path = "../fbuild-paths" }
+fbuild-packages = { path = "../fbuild-packages" }
+fbuild-library-select = { path = "../fbuild-library-select" }
+tokio = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+async-trait = { workspace = true }
+regex = { workspace = true }
+walkdir = { workspace = true }
+sha2 = { workspace = true }
+blake3 = { workspace = true }
+tempfile = { workspace = true }
+object = { workspace = true }
+owo-colors = { workspace = true }
+reqwest = { workspace = true }
+flate2 = { workspace = true }
+tar = { workspace = true }
+zip = { workspace = true }
+tree-sitter = { workspace = true }
+tree-sitter-cpp = { workspace = true }
+zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" }
+
+[dev-dependencies]
+filetime = { workspace = true }
+fbuild-test-support = { path = "../fbuild-test-support" }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread", "sync"] }

crates/fbuild-build-arm/README.md

@@ -0,0 +1,6 @@
+# fbuild-build-arm
+
+Per-platform build orchestrators extracted from `fbuild-build` for compile
+parallelism (FastLED/fbuild#1008). Depends only on `fbuild-build-engine`;
+compiles in parallel with the sibling platform crates. Re-exported by the
+`fbuild-build` facade at unchanged paths.

crates/fbuild-build/src/generic_arm/mcu_config.rs → crates/fbuild-build-arm/src/generic_arm/mcu_config.rs

@@ -9,7 +9,7 @@ use std::collections::HashMap;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
+use crate::mcu_config::DefineEntry;
 
 /// Generic ARM MCU configuration parsed from JSON.
 ///

crates/fbuild-build-arm/src/lib.rs

@@ -0,0 +1,17 @@
+//! Platform build orchestrators (arm family) — FastLED/fbuild#1008.
+//!
+//! Re-exports the whole `fbuild-build-engine` surface at the crate root so the
+//! platform modules' `crate::<engine_mod>` paths resolve unchanged, then declares
+//! the platform modules. Re-exported by the `fbuild-build` facade.
+pub use fbuild_build_engine::*;
+
+pub mod apollo3;
+pub mod generic_arm;
+pub mod nrf52;
+pub mod nxplpc;
+pub mod renesas;
+pub mod rp2040;
+pub mod sam;
+pub mod silabs;
+pub mod stm32;
+pub mod teensy;

crates/fbuild-build/src/nrf52/mcu_config.rs → crates/fbuild-build-arm/src/nrf52/mcu_config.rs

@@ -9,7 +9,7 @@ use fbuild_core::Result;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
+use crate::mcu_config::DefineEntry;
 
 const NRF52840_JSON: &str = include_str!("configs/nrf52840.json");
 

crates/fbuild-build/src/nxplpc/mcu_config.rs → crates/fbuild-build-arm/src/nxplpc/mcu_config.rs

@@ -14,8 +14,8 @@ use fbuild_core::Result;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
 use crate::generic_arm::ArmMcuConfig;
+use crate::mcu_config::DefineEntry;
 
 const NXPLPC_JSON: &str = include_str!("configs/nxplpc.json");
 

crates/fbuild-build/src/renesas/mcu_config.rs → crates/fbuild-build-arm/src/renesas/mcu_config.rs

@@ -9,7 +9,7 @@ use fbuild_core::Result;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
+use crate::mcu_config::DefineEntry;
 
 const RA4M1_JSON: &str = include_str!("configs/ra4m1.json");
 

crates/fbuild-build/src/sam/mcu_config.rs → crates/fbuild-build-arm/src/sam/mcu_config.rs

@@ -9,7 +9,7 @@ use fbuild_core::Result;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
+use crate::mcu_config::DefineEntry;
 
 const SAM3X_JSON: &str = include_str!("configs/sam3x.json");
 const SAMD21_JSON: &str = include_str!("configs/samd21.json");

crates/fbuild-build/src/silabs/mcu_config.rs → crates/fbuild-build-arm/src/silabs/mcu_config.rs

@@ -9,7 +9,7 @@ use fbuild_core::Result;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
+use crate::mcu_config::DefineEntry;
 
 const EFR32MG24_JSON: &str = include_str!("configs/efr32mg24.json");
 

crates/fbuild-build/src/teensy/mcu_config.rs → crates/fbuild-build-arm/src/teensy/mcu_config.rs

@@ -9,7 +9,7 @@ use fbuild_core::Result;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
+use crate::mcu_config::DefineEntry;
 
 const TEENSY30_JSON: &str = include_str!("configs/teensy30.json");
 const TEENSY31_JSON: &str = include_str!("configs/teensy31.json");

crates/fbuild-build-esp/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "fbuild-build-esp"
+description = "ESP32/ESP8266 build orchestrators for fbuild (parallel platform crate). FastLED/fbuild#1008."
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+# Not published to crates.io — internal compile-parallelism split. FastLED/fbuild#1008.
+publish = false
+
+[dependencies]
+fbuild-build-engine = { path = "../fbuild-build-engine" }
+fbuild-core = { path = "../fbuild-core" }
+fbuild-config = { path = "../fbuild-config" }
+fbuild-paths = { path = "../fbuild-paths" }
+fbuild-packages = { path = "../fbuild-packages" }
+fbuild-library-select = { path = "../fbuild-library-select" }
+tokio = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+async-trait = { workspace = true }
+regex = { workspace = true }
+walkdir = { workspace = true }
+sha2 = { workspace = true }
+blake3 = { workspace = true }
+tempfile = { workspace = true }
+object = { workspace = true }
+owo-colors = { workspace = true }
+reqwest = { workspace = true }
+flate2 = { workspace = true }
+tar = { workspace = true }
+zip = { workspace = true }
+tree-sitter = { workspace = true }
+tree-sitter-cpp = { workspace = true }
+zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" }
+
+[dev-dependencies]
+filetime = { workspace = true }
+fbuild-test-support = { path = "../fbuild-test-support" }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread", "sync"] }

crates/fbuild-build-esp/README.md

@@ -0,0 +1,6 @@
+# fbuild-build-esp
+
+Per-platform build orchestrators extracted from `fbuild-build` for compile
+parallelism (FastLED/fbuild#1008). Depends only on `fbuild-build-engine`;
+compiles in parallel with the sibling platform crates. Re-exported by the
+`fbuild-build` facade at unchanged paths.

crates/fbuild-build/src/esp8266/mcu_config.rs → crates/fbuild-build-esp/src/esp8266/mcu_config.rs

@@ -9,7 +9,7 @@ use fbuild_core::Result;
 use serde::Deserialize;
 
 use crate::compiler::{CompilerFlags, McuConfig, ObjcopyConfig, ProfileFlags};
-use crate::esp32::mcu_config::DefineEntry;
+use crate::mcu_config::DefineEntry;
 
 const ESP8266_JSON: &str = include_str!("configs/esp8266.json");
 

crates/fbuild-build-esp/src/lib.rs

@@ -0,0 +1,9 @@
+//! Platform build orchestrators (esp family) — FastLED/fbuild#1008.
+//!
+//! Re-exports the whole `fbuild-build-engine` surface at the crate root so the
+//! platform modules' `crate::<engine_mod>` paths resolve unchanged, then declares
+//! the platform modules. Re-exported by the `fbuild-build` facade.
+pub use fbuild_build_engine::*;
+
+pub mod esp32;
+pub mod esp8266;

crates/fbuild-build-mcu/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "fbuild-build-mcu"
+description = "AVR + CH32V build orchestrators for fbuild (parallel platform crate). FastLED/fbuild#1008."
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+# Not published to crates.io — internal compile-parallelism split. FastLED/fbuild#1008.
+publish = false
+
+[dependencies]
+fbuild-build-engine = { path = "../fbuild-build-engine" }
+fbuild-core = { path = "../fbuild-core" }
+fbuild-config = { path = "../fbuild-config" }
+fbuild-paths = { path = "../fbuild-paths" }
+fbuild-packages = { path = "../fbuild-packages" }
+fbuild-library-select = { path = "../fbuild-library-select" }
+tokio = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+async-trait = { workspace = true }
+regex = { workspace = true }
+walkdir = { workspace = true }
+sha2 = { workspace = true }
+blake3 = { workspace = true }
+tempfile = { workspace = true }
+object = { workspace = true }
+owo-colors = { workspace = true }
+reqwest = { workspace = true }
+flate2 = { workspace = true }
+tar = { workspace = true }
+zip = { workspace = true }
+tree-sitter = { workspace = true }
+tree-sitter-cpp = { workspace = true }
+zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" }
+
+[dev-dependencies]
+filetime = { workspace = true }
+fbuild-test-support = { path = "../fbuild-test-support" }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread", "sync"] }