testing/emscripten: fix multiple issues

1 files changed, 19 insertions, 4 deletions

diff --git a/testing/emscripten/settings_template-paths.patch b/testing/emscripten/settings_template-paths.patch
index 2407f23e3a..092535f1ef 100644
--- a/testing/emscripten/settings_template-paths.patch
+++ b/testing/emscripten/settings_template-paths.patch
@@ -1,14 +1,26 @@
 --- a/tools/settings_template_readonly.py
 +++ b/tools/settings_template_readonly.py
-@@ -7,19 +7,18 @@
+@@ -1,35 +1,35 @@
+-# This file will be edited (the {{{ }}} things), and then ~/.emscripten created with the result, if ~/.emscripten doesn't exist.
+-
+ # Note: If you put paths relative to the home directory, do not forget os.path.expanduser
+ 
+-# Note: On Windows, remember to escape backslashes! I.e. EMSCRIPTEN_ROOT='c:\emscripten\' is not valid, but EMSCRIPTEN_ROOT='c:\\emscripten\\' and EMSCRIPTEN_ROOT='c:/emscripten/' are.
+-
  import os
  
  # this helps projects using emscripten find it
 -EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN') or '{{{ EMSCRIPTEN_ROOT }}}') # directory
 -LLVM_ROOT = os.path.expanduser(os.getenv('LLVM') or '{{{ LLVM_ROOT }}}') # directory
+-BINARYEN_ROOT = os.path.expanduser(os.getenv('BINARYEN') or '{{{ BINARYEN_ROOT }}}') # directory
 +EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN') or '/usr/share/emscripten') # directory
 +LLVM_ROOT = os.path.expanduser(os.getenv('LLVM') or '/usr/lib/emscripten-fastcomp/bin') # directory
- BINARYEN_ROOT = os.path.expanduser(os.getenv('BINARYEN') or '{{{ BINARYEN_ROOT }}}') # directory
++
++if os.getenv('BINARYEN'):
++    BINARYEN_ROOT = os.path.expanduser(os.getenv('BINARYEN')) # directory
++else:
++    BINARYEN_ROOT = '/usr'
++    BINARYEN_WASM_JS = '/usr/share/binaryen/wasm.js'
  
  # If not specified, defaults to sys.executable.
 -#PYTHON = 'python'
@@ -25,12 +37,15 @@
  SPIDERMONKEY_ENGINE = [os.path.expanduser(os.getenv('SPIDERMONKEY') or 'js')] # executable
  V8_ENGINE = os.path.expanduser(os.getenv('V8') or 'd8') # executable
  
-@@ -29,7 +28,7 @@
+ JAVA = 'java' # executable
+ 
+-TEMP_DIR = '{{{ TEMP }}}'
++TEMP_DIR = '/tmp'
  
  CRUNCH = os.path.expanduser(os.getenv('CRUNCH') or 'crunch') # executable
  
 -#CLOSURE_COMPILER = '..' # define this to not use the bundled version
-+CLOSURE_COMPILER = '/usr/bin/closure-compiler' # define this to not use the bundled version
++CLOSURE_COMPILER = '/usr/share/java/closure-compiler.jar'
  
  ########################################################################################################