diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/js_optimizer.py | 4 | ||||
| -rw-r--r-- | tools/settings_template_readonly.py | 14 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py index 053f0dcd..1f1c1354 100644 --- a/tools/js_optimizer.py +++ b/tools/js_optimizer.py @@ -34,7 +34,7 @@ class Minifier: # Create list of valid short names - MAX_NAMES = 6000#0 + MAX_NAMES = 60000 INVALID_2 = set(['do', 'if', 'in']) INVALID_3 = set(['for', 'new', 'try', 'var', 'env']) @@ -154,7 +154,7 @@ def run_on_js(filename, passes, js_engine, jcache): class Finals: buf = [] def process(line): - if len(line) > 0 and (line.startswith('Module[') or line.endswith('["X"]=1;')): + if len(line) > 0 and (line.startswith(('Module[', 'if (globalScope)')) or line.endswith('["X"]=1;')): Finals.buf.append(line) return False return True diff --git a/tools/settings_template_readonly.py b/tools/settings_template_readonly.py index 970a8f8c..f689e205 100644 --- a/tools/settings_template_readonly.py +++ b/tools/settings_template_readonly.py @@ -5,17 +5,17 @@ import os # this helps projects using emscripten find it -EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN') or '{{{ EMSCRIPTEN_ROOT }}}') -LLVM_ROOT = os.path.expanduser(os.getenv('LLVM') or '{{{ LLVM_ROOT }}}') -PYTHON = os.path.expanduser(os.getenv('PYTHON') or '{{{ PYTHON }}}') +EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN') or '{{{ EMSCRIPTEN_ROOT }}}') # directory +LLVM_ROOT = os.path.expanduser(os.getenv('LLVM') or '{{{ LLVM_ROOT }}}') # directory +PYTHON = os.path.expanduser(os.getenv('PYTHON') or '{{{ PYTHON }}}') # executable # See below for notes on which JS engine(s) you need -NODE_JS = os.path.expanduser(os.getenv('NODE') or '{{{ NODE }}}') +NODE_JS = os.path.expanduser(os.getenv('NODE') or '{{{ NODE }}}') # executable SPIDERMONKEY_ENGINE = [ - os.path.expanduser(os.getenv('SPIDERMONKEY') or 'js'), '-m', '-n'] -V8_ENGINE = os.path.expanduser(os.getenv('V8') or 'd8') + os.path.expanduser(os.getenv('SPIDERMONKEY') or 'js'), '-m', '-n'] # executable +V8_ENGINE = os.path.expanduser(os.getenv('V8') or 'd8') # executable -JAVA = 'java' +JAVA = 'java' # executable TEMP_DIR = '/tmp' # You will need to modify this on Windows diff --git a/tools/shared.py b/tools/shared.py index e60800a5..34ed9b3d 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -181,7 +181,7 @@ def check_node_version(): # we re-check sanity when the settings are changed) # We also re-check sanity and clear the cache when the version changes -EMSCRIPTEN_VERSION = '1.2.9' +EMSCRIPTEN_VERSION = '1.3.0' def check_sanity(force=False): try: |