mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fix build_arch() in package-release.sh so that quoted input arguments behave normally 

Signed-off-by: Juuso Alasuutari <juuso.alasuutari@gmail.com>
This commit is contained in:
Juuso Alasuutari 2020-11-05 18:25:16 +02:00 committed by Joshie
parent 8dea487861
commit 6bfead391d
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package-release.sh
View File

@ -45,28 +45,30 @@ while [ $# -gt 0 ]; do
done done
function build_arch { function build_arch {
local arch="$1"
shift
cd "$VKD3D_SRC_DIR" cd "$VKD3D_SRC_DIR"
# shellcheck disable=SC2086 meson "$@" \
meson $2 \
--buildtype "release" \ --buildtype "release" \
--prefix "$VKD3D_BUILD_DIR" \ --prefix "$VKD3D_BUILD_DIR" \
--strip \ --strip \
--bindir "x$1" \ --bindir "x${arch}" \
--libdir "x$1" \ --libdir "x${arch}" \
"$VKD3D_BUILD_DIR/build.$1" "$VKD3D_BUILD_DIR/build.${arch}"
cd "$VKD3D_BUILD_DIR/build.$1" cd "$VKD3D_BUILD_DIR/build.${arch}"
ninja install ninja install
if [ $opt_devbuild -eq 0 ]; then if [ $opt_devbuild -eq 0 ]; then
if [ $opt_native -eq 0 ]; then if [ $opt_native -eq 0 ]; then
# get rid of some useless .a files # get rid of some useless .a files
rm "$VKD3D_BUILD_DIR/x$1/"*.!(dll) rm "$VKD3D_BUILD_DIR/x${arch}/"*.!(dll)
# get rid of vkd3d-proton-utils.dll # get rid of vkd3d-proton-utils.dll
rm "$VKD3D_BUILD_DIR/x$1/libvkd3d-proton-utils-2.dll" rm "$VKD3D_BUILD_DIR/x${arch}/libvkd3d-proton-utils-2.dll"
fi fi
rm -R "$VKD3D_BUILD_DIR/build.$1" rm -R "$VKD3D_BUILD_DIR/build.${arch}"
fi fi
} }
@ -82,12 +84,12 @@ function package {
} }
if [ $opt_native -eq 0 ]; then if [ $opt_native -eq 0 ]; then
build_arch 64 "--cross-file build-win64.txt" build_arch 64 --cross-file build-win64.txt
build_arch 86 "--cross-file build-win32.txt" build_arch 86 --cross-file build-win32.txt
build_script build_script
else else
build_arch 64 build_arch 64
build_arch 86 "--cross-file build-linux32.txt" build_arch 86 --cross-file build-linux32.txt
fi fi
if [ $opt_nopackage -eq 0 ]; then if [ $opt_nopackage -eq 0 ]; then