From d2c66c40c63e538663abf7c4b9ff97f7369b9f5b Mon Sep 17 00:00:00 2001 From: TristanDebrunner Date: Thu, 31 Oct 2019 14:40:54 -0700 Subject: [PATCH] Have cargo-install-all.sh also look in program target dirs for so's (#6631) --- programs/librapay_api/.gitignore | 1 + programs/move_loader_program/.gitignore | 1 + scripts/cargo-install-all.sh | 10 ++++++++++ 3 files changed, 12 insertions(+) create mode 100644 programs/librapay_api/.gitignore create mode 100644 programs/move_loader_program/.gitignore diff --git a/programs/librapay_api/.gitignore b/programs/librapay_api/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/programs/librapay_api/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/programs/move_loader_program/.gitignore b/programs/move_loader_program/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/programs/move_loader_program/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh index e61f3d712b..35de7139a6 100755 --- a/scripts/cargo-install-all.sh +++ b/scripts/cargo-install-all.sh @@ -90,4 +90,14 @@ for dir in programs/*; do done done +for dir in programs/*; do + for program in echo programs/"$(basename "$dir")"/target/$buildVariant/deps/libsolana_"$(basename "$dir")".{so,dylib,dll}; do + if [[ -f $program ]]; then + mkdir -p "$installDir/bin/deps" + rm -f "$installDir/bin/deps/$(basename "$program")" + cp -v "$program" "$installDir"/bin/deps + fi + done +done + echo "Done after $SECONDS seconds"