Copy all programs when starting a network (#7069)

This commit is contained in:
Jack May 2019-11-20 14:37:15 -08:00 committed by GitHub
parent 8590326b50
commit a76eb64bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 31 deletions

View File

@ -109,24 +109,8 @@ if [[ -d target/perf-libs ]]; then
cp -a target/perf-libs "$installDir"/bin/perf-libs
fi
for dir in programs/*; do
for program in echo 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
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
set -x
mkdir -p "$installDir/bin/deps"
cp -fv "target/release/deps/libsolana*program.*" "$installDir/bin/deps"
echo "Done after $SECONDS seconds"

View File

@ -16,15 +16,6 @@ programDir="$2"
cargo build --release
)
for dir in "$programDir"/*; do
for program in $programDir/target/release/deps/lib"$(basename "$dir")".{so,dylib,dll}; do
if [[ -f $program ]]; then
(
set -x
mkdir -p "$installDir/bin/deps"
rm -f "$installDir/bin/deps/$(basename "$program")"
cp -v "$program" "$installDir"/bin/deps
)
fi
done
done
set -x
mkdir -p "$installDir/bin/deps"
cp -fv "$programDir/target/release/deps/libsolana*program.*" "$installDir/bin/deps"