From d50284b0173297aa2378c7a20a7570992c8ffc23 Mon Sep 17 00:00:00 2001
From: Sami Vaarala <sami.vaarala@iki.fi>
Date: Sat, 11 May 2019 03:13:09 +0300
Subject: [PATCH] Miscellaneous build and test fixes

* Use lodash snapshot, fixes lodashtest.

* Fix underscore test shim.

* Emscripten option updates to make dukweb.js and Emscripten tests
  work again.

* Update emscripten-status.rst.
---
 Makefile                     | 12 +++++++-----
 doc/emscripten-status.rst    |  9 ++++++++-
 util/underscore-test-shim.js |  5 +++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 8745724e..8e4a9691 100644
--- a/Makefile
+++ b/Makefile
@@ -204,9 +204,9 @@ endif
 # Reducing the TOTAL_MEMORY and TOTAL_STACK values is useful if you run
 # Duktape cmdline with resource limits (i.e. "duk -r test.js").
 #EMCCOPTS = -s TOTAL_MEMORY=2097152 -s TOTAL_STACK=524288 --memory-init-file 0
-EMCCOPTS = -O2 -std=c99 -Wall --memory-init-file 0
-EMCCOPTS_DUKVM = -O2 -std=c99 -Wall --memory-init-file 0 -DEMSCRIPTEN
-EMCCOPTS_DUKWEB_EXPORT = -s EXPORTED_FUNCTIONS='["_dukweb_is_open", "_dukweb_open","_dukweb_close","_dukweb_eval"]'
+EMCCOPTS = -O2 -std=c99 -Wall --memory-init-file 0 -s WASM=0 -s POLYFILL_OLD_MATH_FUNCTIONS
+EMCCOPTS_DUKVM = -O2 -std=c99 -Wall --memory-init-file 0 -DEMSCRIPTEN -s WASM=0
+EMCCOPTS_DUKWEB_EXPORT = -s EXPORTED_FUNCTIONS='["_dukweb_is_open", "_dukweb_open","_dukweb_close","_dukweb_eval"]' -s 'EXTRA_EXPORTED_RUNTIME_METHODS=["ccall","cwrap"]'
 EMDUKOPTS = -s TOTAL_MEMORY=268435456 -DDUK_CMDLINE_PRINTALERT_SUPPORT
 EMDUKOPTS += -DEMSCRIPTEN  # enable stdin workaround in duk_cmdline.c
 
@@ -848,8 +848,10 @@ underscore:
 lodash:
 	# http://lodash.com/
 	# https://github.com/lodash
-	# Master is OK because not a critical dependency
-	$(GIT) clone --depth 1 https://github.com/lodash/lodash.git
+	# Use pre-built .js file.
+	mkdir lodash
+	cd lodash && wget https://raw.githubusercontent.com/lodash/lodash/4.17.10-npm/lodash.js -O lodash.js
+	#$(GIT) clone --depth 1 https://github.com/lodash/lodash.git
 3883a2e9063b0a5f2705bdac3263577a03913c94.zip:
 	# http://test262.ecmascript.org/
 	# https://github.com/tc39/test262
diff --git a/doc/emscripten-status.rst b/doc/emscripten-status.rst
index 4fb5c7e4..f1e9f294 100644
--- a/doc/emscripten-status.rst
+++ b/doc/emscripten-status.rst
@@ -7,13 +7,20 @@ Hello world test
 
 Quick hello world test::
 
-  $ ./emcc --memory-init-file 0 tests/hello_world.cpp -o /tmp/test.js
+  $ ./emcc --memory-init-file 0 \
+          -s WASM=0 -s POLYFILL_OLD_MATH_FUNCTIONS=1 \
+          tests/hello_world.cpp -o /tmp/test.js
   $ duk /tmp/test.js
 
 Tweaks needed:
 
 * ``--memory-init-file 0``: don't use an external memory file.
 
+* ``-s WASM=0``: disable WebAssembly support, as Duktape doesn't support it.
+
+* ``-s POLYFILL_OLD_MATH_FUNCTIONS``: don't assume post-ES5.1 Math functions
+  like Math.fround().
+
 Normally this suffices.  If you're running Duktape with a small amount of
 memory (e.g. when running the Duktape command line tool with the ``-r``
 option) you may need to reduce Emscription "virtual memory" size with the
diff --git a/util/underscore-test-shim.js b/util/underscore-test-shim.js
index b5f575e3..cb6fea64 100644
--- a/util/underscore-test-shim.js
+++ b/util/underscore-test-shim.js
@@ -198,3 +198,8 @@ delete require;
 
 // ... and the 'window' binding is expected
 var window = new Function('return this;')();
+window.location = {};
+window.location.protocol = 'file:';
+window.location.search = '?';
+window.addEventListener = function nop() {};
+window.removeEventListener = function nop() {};