From 66ae3a57ff456b4633db58772f1ddf78727bbdb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lio=E6=9D=8E=E6=AC=A7?= Date: Tue, 11 Jun 2019 22:00:27 +0800 Subject: [PATCH] Passthru build.sh/script.sh command line arguments (#2837) --- substrate/ci/script.sh | 4 ++-- substrate/core/executor/wasm/build.sh | 2 +- substrate/core/test-runtime/wasm/build.sh | 2 +- substrate/node-template/runtime/wasm/build.sh | 2 +- substrate/node-template/scripts/build.sh | 2 +- substrate/node/runtime/wasm/build.sh | 2 +- substrate/scripts/build.sh | 2 +- substrate/scripts/update.sh | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/substrate/ci/script.sh b/substrate/ci/script.sh index 0ab5f34fb2..b1b7dd3edf 100755 --- a/substrate/ci/script.sh +++ b/substrate/ci/script.sh @@ -20,12 +20,12 @@ case $TARGET in sudo apt-get -y update sudo apt-get install -y cmake pkg-config libssl-dev - cargo test --all --release --locked + cargo test --all --release --locked "$@" ;; "wasm") # Install prerequisites and build all wasm projects ./scripts/init.sh - ./scripts/build.sh + ./scripts/build.sh "$@" ;; esac diff --git a/substrate/core/executor/wasm/build.sh b/substrate/core/executor/wasm/build.sh index fe2faeec62..9414c8037b 100755 --- a/substrate/core/executor/wasm/build.sh +++ b/substrate/core/executor/wasm/build.sh @@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then else CARGO_CMD="cargo +nightly" fi -CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release $@ +CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release "$@" for i in test do wasm-gc target/wasm32-unknown-unknown/release/runtime_$i.wasm target/wasm32-unknown-unknown/release/runtime_$i.compact.wasm diff --git a/substrate/core/test-runtime/wasm/build.sh b/substrate/core/test-runtime/wasm/build.sh index 0529a974ff..059e475c71 100755 --- a/substrate/core/test-runtime/wasm/build.sh +++ b/substrate/core/test-runtime/wasm/build.sh @@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then else CARGO_CMD="cargo +nightly" fi -CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release $@ +CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release "$@" for i in substrate_test_runtime do wasm-gc "target/wasm32-unknown-unknown/release/$i.wasm" "target/wasm32-unknown-unknown/release/$i.compact.wasm" diff --git a/substrate/node-template/runtime/wasm/build.sh b/substrate/node-template/runtime/wasm/build.sh index 566e5de35d..a549eeb50a 100755 --- a/substrate/node-template/runtime/wasm/build.sh +++ b/substrate/node-template/runtime/wasm/build.sh @@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then else CARGO_CMD="cargo +nightly" fi -CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release $@ +CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release "$@" for i in node_template_runtime_wasm do wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm diff --git a/substrate/node-template/scripts/build.sh b/substrate/node-template/scripts/build.sh index 01d0fee354..980a8fa802 100755 --- a/substrate/node-template/scripts/build.sh +++ b/substrate/node-template/scripts/build.sh @@ -17,7 +17,7 @@ do echo "${bold}Building webassembly binary in $SRC...${normal}" cd "$PROJECT_ROOT/$SRC" - ./build.sh + ./build.sh "$@" cd - >> /dev/null done diff --git a/substrate/node/runtime/wasm/build.sh b/substrate/node/runtime/wasm/build.sh index 9a9f412bfc..4a81e47f9e 100755 --- a/substrate/node/runtime/wasm/build.sh +++ b/substrate/node/runtime/wasm/build.sh @@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then else CARGO_CMD="cargo +nightly" fi -CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release $@ +CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release "$@" for i in node_runtime do wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm diff --git a/substrate/scripts/build.sh b/substrate/scripts/build.sh index 8b3557159b..d79ebe5230 100755 --- a/substrate/scripts/build.sh +++ b/substrate/scripts/build.sh @@ -19,7 +19,7 @@ do echo "*** Building wasm binaries in $SRC" cd "$PROJECT_ROOT/$SRC" - ./build.sh $@ + ./build.sh "$@" cd - >> /dev/null done diff --git a/substrate/scripts/update.sh b/substrate/scripts/update.sh index cbf81b57cd..a264fab43d 100755 --- a/substrate/scripts/update.sh +++ b/substrate/scripts/update.sh @@ -20,7 +20,7 @@ do cd "$PROJECT_ROOT/$SRC" cargo update - ./build.sh + ./build.sh "$@" cd - >> /dev/null done