Add emscripten CI

Author: CryZe

.travis.yml

@@ -12,6 +12,12 @@ env:
 
 matrix:
   include:
+    # emscripten
+    - env: TARGET=asmjs-unknown-emscripten DISABLE_TESTS=1
+      rust: nightly
+    - env: TARGET=wasm32-unknown-emscripten DISABLE_TESTS=1
+      rust: nightly
+
     # Linux
     - env: TARGET=i686-unknown-linux-gnu
     - env: TARGET=i686-unknown-linux-musl
@@ -98,7 +104,7 @@ deploy:
   file_glob: true
   file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
   on:
-    condition: $TRAVIS_RUST_VERSION = stable
+    condition: $TRAVIS_RUST_VERSION == 'stable' || $TARGET = 'asmjs-unknown-emscripten' || $TARGET == 'wasm32-unknown-emscripten'
     tags: true
   provider: releases
   skip_cleanup: true

ci/before_deploy.sh

@@ -25,12 +25,14 @@ main() {
     case $TRAVIS_OS_NAME in
         linux)
             cp target/$TARGET/release/liblivesplit_core_capi.so $stage/liblivesplit_core.so 2>/dev/null || :
+            cp target/$TARGET/release/livesplit*.js* $stage/. 2>/dev/null || :
+            cp target/$TARGET/release/deps/*.wasm $stage/livesplit.wasm 2>/dev/null || :
             ;;
         osx)
             cp target/$TARGET/release/liblivesplit_core_capi.dylib $stage/liblivesplit_core.dylib 2>/dev/null || :
             ;;
     esac
-    cp target/$TARGET/release/liblivesplit_core_capi.a $stage/liblivesplit_core.a
+    cp target/$TARGET/release/liblivesplit_core_capi.a $stage/liblivesplit_core.a 2>/dev/null || :
 
     cd $stage
     tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *

ci/script.sh

@@ -3,6 +3,19 @@
 set -ex
 
 main() {
+    case $TARGET in
+        asmjs-unknown-emscripten)
+            cross build -p livesplit --target $TARGET --release
+            return
+            ;;
+        wasm32-unknown-emscripten)
+            rm target/wasm32-unknown-emscripten/release/deps/*.wasm 2>/dev/null || :
+	        rm target/wasm32-unknown-emscripten/release/deps/*.js 2>/dev/null || :
+            cross build -p livesplit --target $TARGET --release
+            return
+            ;;
+    esac
+
     cross build -p livesplit-core-capi --target $TARGET
     cross build -p livesplit-core-capi --target $TARGET --release
 

js/Makefile

@@ -1,32 +1,16 @@
-standard_flags = -s MODULARIZE=1 -s EXPORT_NAME='LiveSplitCore' -s TOTAL_MEMORY=33554432 -s ALLOW_MEMORY_GROWTH=1
-debug_flags = $(standard_flags) -s ASSERTIONS=1
-release_flags = $(standard_flags)
-
 asmjs:
-	@cargo rustc --release --target asmjs-unknown-emscripten -- -C link-args="$(release_flags)"
-	@cp ../target/asmjs-unknown-emscripten/release/livesplit*.js* .
-
-optimized:
-	@cargo rustc --release --target asmjs-unknown-emscripten -- -C link-args="$(release_flags)"
-	@cp ../target/asmjs-unknown-emscripten/release/livesplit*.js* .
-
-small:
-	@cargo rustc --release --target asmjs-unknown-emscripten -- -C debuginfo=0 -C panic=abort -C opt-level=s -C lto -C link-args="-Os $(release_flags)"
-	@cp ../target/asmjs-unknown-emscripten/release/livesplit*.js* .
-
-supersmall:
-	@cargo rustc --release --target asmjs-unknown-emscripten -- -C debuginfo=0 -C panic=abort -C opt-level=z -C lto -C link-args="-Oz $(release_flags)"
+	@cargo build --release --target asmjs-unknown-emscripten
 	@cp ../target/asmjs-unknown-emscripten/release/livesplit*.js* .
 
 wasm:
 	@-rm ../target/wasm32-unknown-emscripten/release/deps/*.wasm
 	@-rm ../target/wasm32-unknown-emscripten/release/deps/*.js
-	@cargo rustc --release --target wasm32-unknown-emscripten -- -C link-args="$(release_flags) -s BINARYEN_METHOD='native-wasm'"
+	@cargo build --release --target wasm32-unknown-emscripten
 	@cp ../target/wasm32-unknown-emscripten/release/livesplit*.js* .
 	@cp ../target/wasm32-unknown-emscripten/release/deps/*.wasm livesplit.wasm
 
 debug:
-	@cargo rustc --target asmjs-unknown-emscripten -- -C link-args="$(debug_flags)"
+	@cargo build --target asmjs-unknown-emscripten
 	@cp ../target/asmjs-unknown-emscripten/debug/livesplit*.js* .
 
 bindings:

js/src/main.rs

@@ -1,3 +1,7 @@
+#![feature(link_args)]
 #![no_main]
 
+#[link_args = "-Oz -s MODULARIZE=1 -s EXPORT_NAME='LiveSplitCore' -s TOTAL_MEMORY=33554432 -s ALLOW_MEMORY_GROWTH=1 -s BINARYEN_METHOD='native-wasm'"]
+extern "C" {}
+
 extern crate livesplit_core_capi;