Implement color output for wasm builder (#4004)

* Implement color output for wasm builder

* Fix `Cargo.lock`

substrate/core/utils/wasm-builder/src/lib.rs

@@ -54,16 +54,17 @@
 //!
 //! By using environment variables, you can configure which WASM binaries are built and how:
 //!
-//! - `SKIP_WASM_BUILD` - Skips building any WASM binary. This is useful when only native should be recompiled.
-//! - `BUILD_DUMMY_WASM_BINARY` - Builds dummy WASM binaries. These dummy binaries are empty and useful
+//! - `SKIP_WASM_BUILD` - Skips building any wasm binary. This is useful when only native should be recompiled.
+//! - `BUILD_DUMMY_WASM_BINARY` - Builds dummy wasm binaries. These dummy binaries are empty and useful
 //!                              for `cargo check` runs.
-//! - `WASM_BUILD_TYPE` - Sets the build type for building WASM binaries. Supported values are `release` or `debug`.
+//! - `WASM_BUILD_TYPE` - Sets the build type for building wasm binaries. Supported values are `release` or `debug`.
 //!                       By default the build type is equal to the build type used by the main build.
-//! - `TRIGGER_WASM_BUILD` - Can be set to trigger a WASM build. On subsequent calls the value of the variable
+//! - `TRIGGER_WASM_BUILD` - Can be set to trigger a wasm build. On subsequent calls the value of the variable
 //!                          needs to change. As WASM builder instructs `cargo` to watch for file changes
 //!                          this environment variable should only be required in certain circumstances.
-//! - `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the WASM binary.
-//! - `WASM_TARGET_DIRECTORY` - Will copy any build WASM binary to the given directory. The path needs
+//! - `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
+//! - `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build.
+//! - `WASM_TARGET_DIRECTORY` - Will copy any build wasm binary to the given directory. The path needs
 //!                            to be absolute.
 //!
 //! Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`.
@@ -82,24 +83,27 @@ use std::{env, fs, path::PathBuf, process::{Command, Stdio, self}};
 mod prerequisites;
 mod wasm_project;
 
-/// Environment variable that tells us to skip building the WASM binary.
+/// Environment variable that tells us to skip building the wasm binary.
 const SKIP_BUILD_ENV: &str = "SKIP_WASM_BUILD";
 
-/// Environment variable to force a certain build type when building the WASM binary.
+/// Environment variable to force a certain build type when building the wasm binary.
 /// Expects "debug" or "release" as value.
 ///
 /// By default the WASM binary uses the same build type as the main cargo build.
 const WASM_BUILD_TYPE_ENV: &str = "WASM_BUILD_TYPE";
 
-/// Environment variable to extend the `RUSTFLAGS` variable given to the WASM build.
+/// Environment variable to extend the `RUSTFLAGS` variable given to the wasm build.
 const WASM_BUILD_RUSTFLAGS_ENV: &str = "WASM_BUILD_RUSTFLAGS";
 
-/// Environment variable to set the target directory to copy the final WASM binary.
+/// Environment variable to set the target directory to copy the final wasm binary.
 ///
 /// The directory needs to be an absolute path.
 const WASM_TARGET_DIRECTORY: &str = "WASM_TARGET_DIRECTORY";
 
-/// Build the currently built project as WASM binary.
+/// Environment variable to disable color output of the wasm build.
+const WASM_BUILD_NO_COLOR: &str = "WASM_BUILD_NO_COLOR";
+
+/// Build the currently built project as wasm binary.
 ///
 /// The current project is determined by using the `CARGO_MANIFEST_DIR` environment variable.
 ///
@@ -110,7 +114,7 @@ pub fn build_project(file_name: &str, cargo_manifest: &str) {
 	build_project_with_default_rustflags(file_name, cargo_manifest, "");
 }
 
-/// Build the currently built project as WASM binary.
+/// Build the currently built project as wasm binary.
 ///
 /// The current project is determined by using the `CARGO_MANIFEST_DIR` environment variable.
 ///

substrate/core/utils/wasm-builder/src/wasm_project.rs

@@ -320,12 +320,16 @@ fn build_project(project: &Path, default_rustflags: &str) {
 		env::var(crate::WASM_BUILD_RUSTFLAGS_ENV).unwrap_or_default(),
 	);
 
-	build_cmd.args(&["build", "--target=wasm32-unknown-unknown"])
+	build_cmd.args(&["rustc", "--target=wasm32-unknown-unknown"])
 		.arg(format!("--manifest-path={}", manifest_path.display()))
 		.env("RUSTFLAGS", rustflags)
 		// We don't want to call ourselves recursively
 		.env(crate::SKIP_BUILD_ENV, "");
 
+	if env::var(crate::WASM_BUILD_NO_COLOR).is_err() {
+		build_cmd.arg("--color=always");
+	}
+
 	if is_release_build() {
 		build_cmd.arg("--release");
 	};