Merge pull request #1377 from linas/maybe-js-fix

Hacks to try to get javascript build to not spew errors

bindings/js/build_packages.sh

@@ -15,10 +15,10 @@ emmake make clean
 emmake make
 popd
 
+# TODO: Build link-grammar
+# emcc -O3 ../../link-grammar/.libs/liblink-grammar.so -o liblink-grammar.js
+
 # Build link-parser
 ./link-parser/build.sh
 
-# TODO: Build link-grammar
-# emcc -O3 link-grammar/.libs/liblink-grammar.so -o liblink-grammar.js
-
 popd

bindings/js/install_emsdk.sh

@@ -6,8 +6,8 @@ pushd "$(dirname "$0")"
 git clone https://github.com/emscripten-core/emsdk.git || true
 pushd emsdk
 git pull
-./emsdk install 1.38.41
-./emsdk activate 1.38.41
+./emsdk install latest
+./emsdk activate latest
 popd
 
 popd

bindings/js/link-parser/build.sh

@@ -11,11 +11,18 @@ rm -rf dist
 mkdir dist
 
 # Compile link-parser.js & link-parser.wasm
-cp ../../../link-parser/.libs/link-parser link-parser.bc
+# XXX Do we really need to do this?? It seems that a link-parser.wasm
+# file was already created in the ../../../link-parser/.libs directory;
+# can't we just use that? Someone who knows jas & wasm needs to fix this...
+cp ../../../link-parser/link_parser-command-line.o command-line.bc
+cp ../../../link-parser/link_parser-lg_readline.o lg_readline.bc
+cp ../../../link-parser/link_parser-parser-utilities.o parser-utilities.bc
+cp ../../../link-parser/link_parser-link-parser.o link-parser.bc
 # Originally, this had `emcc liblink-grammar.so` but the .so
 # is not available on Apple Mac's (I guess it's called .shlib ??)
 # So change to .a which should work for all OS'es.
-emcc -O3 link-parser.bc ../../../link-grammar/.libs/liblink-grammar.a \
+emcc -O3 link-parser.bc command-line.bc lg_readline.bc parser-utilities.bc \
+	../../../link-grammar/.libs/liblink-grammar.a \
 	--pre-js pre.js \
 	-s WASM=1 \
 	-s ALLOW_MEMORY_GROWTH=1 \