From fc40516744790ffefabf19dde03aa223472c6d47 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 24 Dec 2014 13:03:20 -0500 Subject: [PATCH] A little more work on the Emscripten buildbot script. Should upload tarballs now, etc. --- build-scripts/emscripten-buildbot.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/build-scripts/emscripten-buildbot.sh b/build-scripts/emscripten-buildbot.sh index 90cf9e2a4e82d..aeef83b44517e 100755 --- a/build-scripts/emscripten-buildbot.sh +++ b/build-scripts/emscripten-buildbot.sh @@ -7,6 +7,11 @@ if [ ! -f "$ENVSCRIPT" ]; then exit 1 fi +TARBALL="$1" +if [ -z $1 ]; then + TARBALL=sdl-emscripten.tar.xz +fi + cd `dirname "$0"` cd .. SDLBASE=`pwd` @@ -39,21 +44,26 @@ echo "Setting up Emscripten SDK environment..." source "$ENVSCRIPT" echo "Setting up..." -set -e set -x cd "$SDLBASE" rm -rf buildbot +rm -rf emscripten-sdl2-installed mkdir buildbot -cd buildbot +pushd buildbot echo "Configuring..." -emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths" +emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$SDLBASE/emscripten-sdl2-installed" echo "Building..." emmake $MAKE -set +x -echo "Done! The library is in $SDLBASE/buildbot/build/.libs/libSDL2.a ..." +echo "Moving things around..." +emmake $MAKE install +mkdir -p ./usr +mv "$SDLBASE/emscripten-sdl2-installed" ./usr/local +popd +tar -cJvvf $TARBALL -C buildbot usr +rm -rf buildbot exit 0