Rename musl-builder -> binary-builder

Cargo.toml

@@ -81,7 +81,7 @@ members = [
 	"node/core/provisioner",
 	"node/core/pvf",
 	"node/core/pvf/common",
-	"node/core/pvf/musl-builder",
+	"node/core/pvf/binary-builder",
 	"node/core/pvf/execute-worker",
 	"node/core/pvf/prepare-worker",
 	"node/core/pvf-checker",

node/core/pvf/musl-builder/Cargo.toml → node/core/pvf/binary-builder/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "polkadot-node-core-pvf-musl-builder"
+name = "polkadot-node-core-pvf-binary-builder"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true

node/core/pvf/binary-builder/README.md

@@ -0,0 +1,18 @@
+# binary-builder
+
+binary-builder is a tool that integrates the process of building the binary of a
+crate into the main `cargo` build process. The binary can then be embedded into
+other crates and extracted at runtime.
+
+<!-- TODO: add project setup -->
+
+## Prerequisites
+
+binary-builder requires the chosen toolchain (e.g. `x86_64-unknown-linux-musl`)
+to be installed:
+
+```sh
+rustup target add x86_64-unknown-linux-musl
+```
+
+<!-- TODO: What to do with License? (wasm-builder is Apache-2.0) -->

node/core/pvf/musl-builder/src/lib.rs → node/core/pvf/binary-builder/src/lib.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-// TODO: Extract common parts into a generalized builder that wasm/musl builders are based on.
+// TODO: Extract common parts into a generalized builder that wasm-builder is based on.
 
 // TODO: Make sure we build with O2 and LTO.
 
@@ -33,6 +33,8 @@ use std::{
 };
 use version::Version;
 
+// TODO: Allow customizing the env vars, for wasm-builder.
+
 /// Environment variable that tells us to skip building the binary.
 const SKIP_BUILD_ENV: &str = "BUILDER_SKIP_BUILD";
 
@@ -195,7 +197,7 @@ impl CargoCommand {
 	///
 	/// Assumes that cargo version matches the rustc version.
 	fn supports_env(&self) -> bool {
-		// TODO: Just a stub for now -- not sure this is needed for musl-builder.
+		// TODO: Just a stub for now -- generalize.
 		true
 	}
 }

node/core/pvf/execute-worker/Cargo.toml

@@ -31,7 +31,7 @@ sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", br
 tikv-jemalloc-ctl = "0.5.0"
 
 [build-dependencies]
-polkadot-node-core-pvf-musl-builder = { path = "../musl-builder" }
+polkadot-node-core-pvf-binary-builder = { path = "../binary-builder" }
 
 [features]
 builder = []

node/core/pvf/execute-worker/build.rs

@@ -15,7 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 fn main() {
-	let builder = polkadot_node_core_pvf_musl_builder::Builder::new()
+	let builder = polkadot_node_core_pvf_binary_builder::Builder::new()
 		// Tell the builder to build the project (crate) this `build.rs` is part of.
 		.with_current_project();
 

node/core/pvf/prepare-worker/Cargo.toml

@@ -30,7 +30,7 @@ sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master
 tikv-jemalloc-ctl = "0.5.0"
 
 [build-dependencies]
-polkadot-node-core-pvf-musl-builder = { path = "../musl-builder" }
+polkadot-node-core-pvf-binary-builder = { path = "../binary-builder" }
 
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 

node/core/pvf/prepare-worker/build.rs

@@ -17,7 +17,7 @@
 fn main() {
 	substrate_build_script_utils::generate_cargo_keys();
 
-	let builder = polkadot_node_core_pvf_musl_builder::Builder::new()
+	let builder = polkadot_node_core_pvf_binary_builder::Builder::new()
 		// Tell the builder to build the project (crate) this `build.rs` is part of.
 		.with_current_project();
 

node/core/pvf/src/host.rs

@@ -916,7 +916,7 @@ async fn extract_worker_binaries(prepare_worker_path: &Path, execute_worker_path
 		let prepare_exe = decompress(
 			PREPARE_EXE.expect(
 				"prepare-worker binary is not available. \
-				 This means it was built with `SKIP_BUILD` flag",
+				 This means it was built with `BUILDER_SKIP_BUILD` flag",
 			),
 			CODE_BLOB_BOMB_LIMIT,
 		)
@@ -935,7 +935,7 @@ async fn extract_worker_binaries(prepare_worker_path: &Path, execute_worker_path
 		let execute_exe = decompress(
 			EXECUTE_EXE.expect(
 				"execute-worker binary is not available. \
-				 This means it was built with `SKIP_BUILD` flag",
+				 This means it was built with `BUILDER_SKIP_BUILD` flag",
 			),
 			CODE_BLOB_BOMB_LIMIT,
 		)