From be3a0b6b10373493d455373ee975102273305215 Mon Sep 17 00:00:00 2001 From: Jack May Date: Mon, 10 Jun 2019 11:15:28 -0700 Subject: [PATCH] Build/clean all (#4626) automerge --- programs/bpf/rust/build.sh | 14 +++++++++----- programs/bpf/rust/clean.sh | 12 ++++++++---- programs/bpf/rust/dump.sh | 8 ++++---- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/programs/bpf/rust/build.sh b/programs/bpf/rust/build.sh index 80cb70e151..e0ce3073d6 100755 --- a/programs/bpf/rust/build.sh +++ b/programs/bpf/rust/build.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash if [ "$#" -ne 1 ]; then - echo "Error: Must provide name of the project to build" - exit 1 -fi - -./../../../sdk/bpf/rust-utils/build.sh "$PWD"/"$1" + # Build all projects + for project in */ ; do + ./../../../sdk/bpf/rust-utils/build.sh "$PWD/$project" + done +else + # Build requested project + ./../../../sdk/bpf/rust-utils/build.sh "$PWD/$1" + +fi \ No newline at end of file diff --git a/programs/bpf/rust/clean.sh b/programs/bpf/rust/clean.sh index ef845d480f..a0648fd664 100755 --- a/programs/bpf/rust/clean.sh +++ b/programs/bpf/rust/clean.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash if [ "$#" -ne 1 ]; then - echo "Error: Must provide the full path to the project to clean" - exit 1 + # Clean all projects + for project in */ ; do + ./../../../sdk/bpf/rust-utils/clean.sh "$PWD/$project" + done +else + # Clean requested project + ./../../../sdk/bpf/rust-utils/clean.sh "$PWD/$1" + fi - -./../../../sdk/bpf/rust-utils/clean.sh "$PWD"/"$1" diff --git a/programs/bpf/rust/dump.sh b/programs/bpf/rust/dump.sh index e874835b4a..8dac0490d6 100755 --- a/programs/bpf/rust/dump.sh +++ b/programs/bpf/rust/dump.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ "$#" -ne 1 ]; then - echo "Error: Must provide the full path to the project to dump" + echo "Error: Must provide the name of the project to dump" exit 1 fi @@ -14,8 +14,8 @@ cp ./target/dump.txt ./targetdump-last.txt 2>/dev/null set -ex -ls -la ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"$1".so > ./target/dump_mangled.txt -greadelf -aW ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"$1".so >> ./target/dump_mangled.txt -llvm-objdump -print-imm-hex --source --disassemble ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"$1".so >> ./target/dump_mangled.txt +ls -la ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"${1%/}".so > ./target/dump_mangled.txt +greadelf -aW ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"${1%/}".so >> ./target/dump_mangled.txt +llvm-objdump -print-imm-hex --source --disassemble ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"${1%/}".so >> ./target/dump_mangled.txt sed s/://g < ./target/dump_mangled.txt | rustfilt > ./target/dump.txt