Commit fc40516744790ffefabf19dde03aa223472c6d47
2014-12-24T13:03:20
A little more work on the Emscripten buildbot script. Should upload tarballs now, etc.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/build-scripts/emscripten-buildbot.sh b/build-scripts/emscripten-buildbot.sh
index 90cf9e2..aeef83b 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