Merge pull request 901

61e8ac5 use array for files to copy, exit on error
This commit is contained in:
luigi1111 2017-10-23 13:55:46 -05:00
commit b888396ab4
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -17,13 +17,13 @@ fi
if [[ "$BUILD_TYPE" == "Release" ]]; then if [[ "$BUILD_TYPE" == "Release" ]]; then
echo "Release build" echo "Release build"
ICU_FILES="libicuuc57.dll libicuin57.dll libicudt57.dll" ICU_FILES=(libicuuc57.dll libicuin57.dll libicudt57.dll)
else else
echo "Debug build" echo "Debug build"
ICU_FILES="libicuucd57.dll libicuind57.dll libicudtd57.dll" ICU_FILES=(libicuucd57.dll libicuind57.dll libicudtd57.dll)
fi fi
FILES="zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libjasper-1.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll" FILES=(zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libjasper-1.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll)
platform=$(get_platform) platform=$(get_platform)
@ -33,10 +33,9 @@ elif [[ "$platform" == "mingw32" ]]; then
PLATFORM_FILES="libgcc_s_dw2-1.dll" PLATFORM_FILES="libgcc_s_dw2-1.dll"
fi fi
for f in $FILES; do cp $MSYSTEM_PREFIX/bin/$f $TARGET; done for f in "${FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
for f in $ICU_FILES; do cp $MSYSTEM_PREFIX/bin/$f $TARGET; done for f in "${ICU_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
for f in $PLATFORM_FILES; do cp $MSYSTEM_PREFIX/bin/$f $TARGET; done
for f in "${PLATFORM_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done