From 8ff57070c707d924479cf48d60de75526fc21539 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 23 Jun 2013 14:41:54 +0000
Subject: [PATCH] build: activate the emscripten builds on the build bot.

---
 build/build-html    |  6 +++---
 build/lol-build     | 11 ++++++-----
 build/run-bitten.sh | 10 ++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/build/build-html b/build/build-html
index 2064d026..605666ca 100755
--- a/build/build-html
+++ b/build/build-html
@@ -4,7 +4,7 @@
 make distclean
 
 set -e
-./build/lol-build "$@" bootstrap emscripten-html
-./build/lol-build "$@" configure emscripten-html
-./build/lol-build "$@" build emscripten-html
+./build/lol-build "$@" bootstrap web-html
+./build/lol-build "$@" configure web-html
+./build/lol-build "$@" build web-html
 
diff --git a/build/lol-build b/build/lol-build
index f64aa9c0..cf17da24 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -29,8 +29,8 @@
 #  - win*-i386
 #  - win*-amd64
 #  - raspi-arm
-#  - emscripten-html
-#  - emscripten-js
+#  - web-html
+#  - web-js
 #
 
 set -e
@@ -206,7 +206,7 @@ configure()
             # Ensure we're _really_ on amd64
             CXXFLAGS="$CXXFLAGS -m64"
             ;;
-        emscripten-*)
+        web-*)
             # Force cross-compilation because AC_TRY_LINK is going to check
             # whether our binaries have the executable bit set.
             HOSTFLAGS=--host=none
@@ -274,8 +274,9 @@ configure()
 
             PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" do_configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS"
             ;;
-        emscripten-*)
-            do_configure $HOSTFLAGS $BUILDFLAGS CC=emcc CXX=em++ AR=emar RANLIB=emranlib PKG_CONFIG=/bin/false SDL_CONFIG=/bin/false ac_cv_exeext=".${platform##emscripten-}"
+        web-*)
+            # We use --enable-release otherwise builds are really too slow
+            do_configure --enable-release $HOSTFLAGS $BUILDFLAGS CC=emcc CXX=em++ AR=emar RANLIB=emranlib PKG_CONFIG=/bin/false SDL_CONFIG=/bin/false ac_cv_exeext=".${platform##web-}"
             ;;
         *)
             PATH="$PATH" do_configure CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS"
diff --git a/build/run-bitten.sh b/build/run-bitten.sh
index df4bf129..fcfe0399 100755
--- a/build/run-bitten.sh
+++ b/build/run-bitten.sh
@@ -192,6 +192,16 @@ if i686-w64-mingw32-g++ --version >/dev/null 2>&1; then
 fi
 append ""
 
+#
+# Emscripten
+#
+
+append "[emscripten]"
+if em++ --version >/dev/null 2>&1; then
+    append "version = $(version | sed -ne 's/.*emcc.* \([0-9.]\{1,\}\).*/\1/p')"
+fi
+append ""
+
 #
 # Android NDK
 #