diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/file_packager.py | 6 | ||||
| -rw-r--r-- | tools/find_bigis.py | 2 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/file_packager.py b/tools/file_packager.py index 9699730f..874ad942 100644 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -107,7 +107,11 @@ for arg in sys.argv[2:]: jsoutput = arg.split('=')[1] if '=' in arg else None leading = '' elif arg.startswith('--crunch'): - from shared import CRUNCH + try: + from shared import CRUNCH + except Exception, e: + print >> sys.stderr, 'count not import CRUNCH (make sure it is defined properly in ~/.emscripten)' + raise e crunch = arg.split('=')[1] if '=' in arg else '128' leading = '' elif arg.startswith('--plugin'): diff --git a/tools/find_bigis.py b/tools/find_bigis.py index d11c1a81..1261e7ff 100644 --- a/tools/find_bigis.py +++ b/tools/find_bigis.py @@ -6,7 +6,7 @@ import os, sys, re filename = sys.argv[1] data = open(filename).read() -iss = re.findall('[^%]i\d+ [^=]', data) +iss = re.findall(' i\d+ [^=]', data) set_iss = set(iss) bigs = [] for iss in set_iss: diff --git a/tools/shared.py b/tools/shared.py index f88eace0..bd1d1bee 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -345,7 +345,7 @@ def find_temp_directory(): # 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.9.5' +EMSCRIPTEN_VERSION = '1.10.0' def generate_sanity(): return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT + '|' + get_clang_version() |