osxbuild.sh: Potential fix for the $commonargs bash variable.

git-svn-id: https://svn.eduke32.com/eduke32@2494 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-18 08:49:22 +00:00
parent 3503a42a9a
commit d03ec12e92

View file

@ -94,7 +94,8 @@ if [ $buildtools -eq 1 ] && [ -d "build" ]; then
if [ $build64 == 1 ]; then if [ $build64 == 1 ]; then
if [ $builddebug == 1 ]; then if [ $builddebug == 1 ]; then
make veryclean make veryclean
ARCH='-arch x86_64' EXESUFFIX_OVERRIDE=.debug.x64 $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 utils cmdline="ARCH='-arch x86_64' EXESUFFIX_OVERRIDE=.debug.x64 $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 utils"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo buildtools: x86_64 debug build succeeded. echo buildtools: x86_64 debug build succeeded.
else else
@ -103,7 +104,8 @@ if [ $buildtools -eq 1 ] && [ -d "build" ]; then
fi fi
make veryclean make veryclean
ARCH='-arch x86_64' EXESUFFIX_OVERRIDE=.x64 $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 utils cmdline="ARCH='-arch x86_64' EXESUFFIX_OVERRIDE=.x64 $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 utils"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo buildtools: x86_64 release build succeeded. echo buildtools: x86_64 release build succeeded.
else else
@ -114,7 +116,8 @@ if [ $buildtools -eq 1 ] && [ -d "build" ]; then
if [ $build86 == 1 ]; then if [ $build86 == 1 ]; then
if [ $builddebug == 1 ]; then if [ $builddebug == 1 ]; then
make veryclean make veryclean
EXESUFFIX_OVERRIDE=.debug.x86 $commonargs RELEASE=0 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3 utils cmdline="EXESUFFIX_OVERRIDE=.debug.x86 $commonargs RELEASE=0 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3 utils"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo buildtools: x86 debug build succeeded. echo buildtools: x86 debug build succeeded.
else else
@ -123,7 +126,8 @@ if [ $buildtools -eq 1 ] && [ -d "build" ]; then
fi fi
make veryclean make veryclean
EXESUFFIX_OVERRIDE=.x86 $commonargs RELEASE=1 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3 utils cmdline="EXESUFFIX_OVERRIDE=.x86 $commonargs RELEASE=1 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3 utils"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo buildtools: x86 release build succeeded. echo buildtools: x86 release build succeeded.
else else
@ -134,7 +138,8 @@ if [ $buildtools -eq 1 ] && [ -d "build" ]; then
if [ $buildppc == 1 ]; then if [ $buildppc == 1 ]; then
if [ $builddebug == 1 ]; then if [ $builddebug == 1 ]; then
make veryclean make veryclean
ARCH='-arch ppc' EXESUFFIX_OVERRIDE=.debug.ppc $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3 utils cmdline="ARCH='-arch ppc' EXESUFFIX_OVERRIDE=.debug.ppc $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3 utils"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo buildtools: PowerPC debug build succeeded. echo buildtools: PowerPC debug build succeeded.
else else
@ -143,7 +148,8 @@ if [ $buildtools -eq 1 ] && [ -d "build" ]; then
fi fi
make veryclean make veryclean
ARCH='-arch ppc' EXESUFFIX_OVERRIDE=.ppc $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3 utils cmdline="ARCH='-arch ppc' EXESUFFIX_OVERRIDE=.ppc $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3 utils"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo buildtools: PowerPC release build succeeded. echo buildtools: PowerPC release build succeeded.
else else
@ -194,7 +200,8 @@ if [ $onlyzip -eq 0 ]; then
if [ $build64 == 1 ]; then if [ $build64 == 1 ]; then
if [ $builddebug == 1 ]; then if [ $builddebug == 1 ]; then
make veryclean make veryclean
ARCH='-arch x86_64' $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 cmdline="ARCH='-arch x86_64' $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo x86_64 debug build succeeded. echo x86_64 debug build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.x64 cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.x64
@ -205,7 +212,8 @@ if [ $onlyzip -eq 0 ]; then
fi fi
make veryclean make veryclean
ARCH='-arch x86_64' $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 cmdline="ARCH='-arch x86_64' $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo x86_64 release build succeeded. echo x86_64 release build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.x64 cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.x64
@ -218,7 +226,8 @@ if [ $onlyzip -eq 0 ]; then
if [ $build86 == 1 ]; then if [ $build86 == 1 ]; then
if [ $builddebug == 1 ]; then if [ $builddebug == 1 ]; then
make veryclean make veryclean
$commonargs RELEASE=0 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3 cmdline="$commonargs RELEASE=0 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo x86 debug build succeeded. echo x86 debug build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.x86 cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.x86
@ -229,7 +238,8 @@ if [ $onlyzip -eq 0 ]; then
fi fi
make veryclean make veryclean
$commonargs RELEASE=1 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3 cmdline="$commonargs RELEASE=1 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo x86 release build succeeded. echo x86 release build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.x86 cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.x86
@ -242,7 +252,8 @@ if [ $onlyzip -eq 0 ]; then
if [ $buildppc == 1 ]; then if [ $buildppc == 1 ]; then
if [ $builddebug == 1 ]; then if [ $builddebug == 1 ]; then
make veryclean make veryclean
ARCH='-arch ppc' $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3 cmdline="ARCH='-arch ppc' $commonargs RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo PowerPC debug build succeeded. echo PowerPC debug build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.ppc cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.ppc
@ -253,7 +264,8 @@ if [ $onlyzip -eq 0 ]; then
fi fi
make veryclean make veryclean
ARCH='-arch ppc' $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3 cmdline="ARCH='-arch ppc' $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3"
eval $cmdline
if [ $? ]; then if [ $? ]; then
echo PowerPC release build succeeded. echo PowerPC release build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.ppc cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.ppc