From 380cf822ea19171705e5cd2ed6b282e580d84759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 10 Sep 2020 23:04:24 +0200
Subject: [PATCH] Rename `TRIGGER_WASM_BUILD` to `FORCE_WASM_BUILD` (#7080)
Because apparently I can not speak properly ;)
---
substrate/docs/README.adoc | 6 +++---
substrate/utils/wasm-builder-runner/src/lib.rs | 4 ++--
substrate/utils/wasm-builder/README.md | 6 +++---
substrate/utils/wasm-builder/src/lib.rs | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/substrate/docs/README.adoc b/substrate/docs/README.adoc
index e1ed86c2d52..7f3d50faac7 100644
--- a/substrate/docs/README.adoc
+++ b/substrate/docs/README.adoc
@@ -318,9 +318,9 @@ we support multiple environment variables:
for `cargo check` runs.
* `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
- needs to change. As WASM builder instructs `cargo` to watch for file changes
- this environment variable should only be required in certain circumstances.
+* `FORCE_WASM_BUILD` - Can be set to force 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_TARGET_DIRECTORY` - Will copy release build WASM binary to the given directory. The path needs
to be absolute.
* `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
diff --git a/substrate/utils/wasm-builder-runner/src/lib.rs b/substrate/utils/wasm-builder-runner/src/lib.rs
index 7990ea2bb97..b0b1ac479e7 100644
--- a/substrate/utils/wasm-builder-runner/src/lib.rs
+++ b/substrate/utils/wasm-builder-runner/src/lib.rs
@@ -44,7 +44,7 @@ const SKIP_BUILD_ENV: &str = "SKIP_WASM_BUILD";
const DUMMY_WASM_BINARY_ENV: &str = "BUILD_DUMMY_WASM_BINARY";
/// Environment variable that makes sure the WASM build is triggered.
-const TRIGGER_WASM_BUILD_ENV: &str = "TRIGGER_WASM_BUILD";
+const FORCE_WASM_BUILD_ENV: &str = "FORCE_WASM_BUILD";
/// Replace all backslashes with slashes.
fn replace_back_slashes<T: ToString>(path: T) -> String {
@@ -476,6 +476,6 @@ fn generate_rerun_if_changed_instructions() {
// Make sure that the `build.rs` is called again if one of the following env variables changes.
println!("cargo:rerun-if-env-changed={}", SKIP_BUILD_ENV);
println!("cargo:rerun-if-env-changed={}", DUMMY_WASM_BINARY_ENV);
- println!("cargo:rerun-if-env-changed={}", TRIGGER_WASM_BUILD_ENV);
+ println!("cargo:rerun-if-env-changed={}", FORCE_WASM_BUILD_ENV);
println!("cargo:rerun-if-env-changed={}", generate_crate_skip_build_env_name());
}
diff --git a/substrate/utils/wasm-builder/README.md b/substrate/utils/wasm-builder/README.md
index b72e7e16d4f..1e24d2cebab 100644
--- a/substrate/utils/wasm-builder/README.md
+++ b/substrate/utils/wasm-builder/README.md
@@ -51,9 +51,9 @@ By using environment variables, you can configure which Wasm binaries are built
for `cargo check` runs.
- `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
- needs to change. As wasm builder instructs `cargo` to watch for file changes
- this environment variable should only be required in certain circumstances.
+- `FORCE_WASM_BUILD` - Can be set to force 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_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
diff --git a/substrate/utils/wasm-builder/src/lib.rs b/substrate/utils/wasm-builder/src/lib.rs
index f1a1c7729a0..500025c2967 100644
--- a/substrate/utils/wasm-builder/src/lib.rs
+++ b/substrate/utils/wasm-builder/src/lib.rs
@@ -68,9 +68,9 @@
//! for `cargo check` runs.
//! - `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
-//! needs to change. As wasm builder instructs `cargo` to watch for file changes
-//! this environment variable should only be required in certain circumstances.
+//! - `FORCE_WASM_BUILD` - Can be set to force 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_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
--
GitLab