Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Release new version of wasm-builder-runner #7283

Merged
merged 4 commits into from
Oct 9, 2020
Merged

Release new version of wasm-builder-runner #7283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18ab866
Release new version of wasm-builder-runner
bkchr Oct 8, 2020
220ecc8
Update utils/wasm-builder-runner/Cargo.toml
bkchr Oct 8, 2020
c351f51
Update utils/wasm-builder-runner/src/lib.rs
bkchr Oct 9, 2020
6488abb
Update versions
bkchr Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/node-template/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ hex-literal = { version = "0.3.1", optional = true }
template = { version = "2.0.0", default-features = false, path = "../pallets/template", package = "pallet-template" }

[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bin/node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-featur
pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }

[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }

[dev-dependencies]
sp-io = { version = "2.0.0", path = "../../../primitives/io" }
Expand Down
2 changes: 1 addition & 1 deletion client/executor/runtime-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../../pri
sp-allocator = { version = "2.0.0", default-features = false, path = "../../../primitives/allocator" }

[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }

[features]
default = [ "std" ]
Expand Down
2 changes: 1 addition & 1 deletion primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sp-io = { version = "2.0.0", default-features = false, path = "../../io" }
sp-core = { version = "2.0.0", default-features = false, path = "../../core" }

[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }

[features]
default = [ "std" ]
Expand Down
2 changes: 1 addition & 1 deletion primitives/runtime-interface/test-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sp-io = { version = "2.0.0", default-features = false, path = "../../io" }
sp-core = { version = "2.0.0", default-features = false, path = "../../core" }

[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }

[features]
default = [ "std" ]
Expand Down
2 changes: 1 addition & 1 deletion test-utils/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ sc-executor = { version = "0.8.0", path = "../../client/executor" }
substrate-test-runtime-client = { version = "2.0.0", path = "./client" }

[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../utils/wasm-builder-runner" }
wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../utils/wasm-builder-runner" }

[features]
default = [
Expand Down
2 changes: 1 addition & 1 deletion utils/wasm-builder-runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "substrate-wasm-builder-runner"
version = "1.0.6"
version = "2.0.0"
authors = ["Parity Technologies <[email protected]>"]
description = "Runner for substrate-wasm-builder"
edition = "2018"
Expand Down
45 changes: 30 additions & 15 deletions utils/wasm-builder-runner/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,19 @@ impl WasmBuilder {

/// Build the WASM binary.
pub fn build(self) {
let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo!"));
let file_path = out_dir.join(self.file_name.unwrap_or_else(|| "wasm_binary.rs".into()));

if check_skip_build() {
// If we skip the build, we still want to make sure to be called when an env variable
// changes
generate_rerun_if_changed_instructions();

provide_dummy_wasm_binary(&file_path, true);

return;
}

let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo!"));
let file_path = out_dir.join(self.file_name.unwrap_or_else(|| "wasm_binary.rs".into()));

// Hash the path to the project cargo toml.
let mut hasher = DefaultHasher::new();
self.project_cargo_toml.hash(&mut hasher);
Expand All @@ -252,7 +255,7 @@ impl WasmBuilder {
.join(format!("{}{}", project_name, hasher.finish()));

if check_provide_dummy_wasm_binary() {
provide_dummy_wasm_binary(&file_path);
provide_dummy_wasm_binary(&file_path, false);
} else {
create_project(
&project_folder,
Expand Down Expand Up @@ -381,7 +384,7 @@ fn create_project(
fs::create_dir_all(project_folder.join("src"))
.expect("WASM build runner dir create can not fail; qed");

fs::write(
write_file_if_changed(
project_folder.join("Cargo.toml"),
format!(
r#"
Expand All @@ -396,10 +399,10 @@ fn create_project(
[workspace]
"#,
wasm_builder_source = wasm_builder_source.to_cargo_source(&get_manifest_dir()),
)
).expect("WASM build runner `Cargo.toml` writing can not fail; qed");
),
);

fs::write(
write_file_if_changed(
project_folder.join("src/main.rs"),
format!(
r#"
Expand All @@ -418,8 +421,8 @@ fn create_project(
file_path = replace_back_slashes(file_path.display()),
cargo_toml_path = replace_back_slashes(cargo_toml_path.display()),
default_rustflags = default_rustflags,
)
).expect("WASM build runner `main.rs` writing can not fail; qed");
),
);
}

fn run_project(project_folder: &Path) {
Expand Down Expand Up @@ -465,11 +468,16 @@ fn check_provide_dummy_wasm_binary() -> bool {
}

/// Provide the dummy WASM binary
fn provide_dummy_wasm_binary(file_path: &Path) {
fs::write(
file_path,
"pub const WASM_BINARY: Option<&[u8]> = None; pub const WASM_BINARY_BLOATY: Option<&[u8]> = None;",
).expect("Writing dummy WASM binary should not fail");
///
/// If `skip_build` is `true`, it will only generate the wasm binary if it doesn't exist.
fn provide_dummy_wasm_binary(file_path: &Path, skip_build: bool) {
if !skip_build || !file_path.exists() {
write_file_if_changed(
file_path.into(),
"pub const WASM_BINARY: Option<&[u8]> = None;\
pub const WASM_BINARY_BLOATY: Option<&[u8]> = None;".into(),
);
}
}

/// Generate the `rerun-if-changed` instructions for cargo to make sure that the WASM binary is
Expand All @@ -481,3 +489,10 @@ fn generate_rerun_if_changed_instructions() {
println!("cargo:rerun-if-env-changed={}", FORCE_WASM_BUILD_ENV);
println!("cargo:rerun-if-env-changed={}", generate_crate_skip_build_env_name());
}

/// Write to the given `file` if the `content` is different.
fn write_file_if_changed(file: PathBuf, content: String) {
if fs::read_to_string(&file).ok().as_ref() != Some(&content) {
fs::write(&file, content).unwrap_or_else(|_| panic!("Writing `{}` can not fail!", file.display()));
}
}