From d01e4caa1ebcc44f1d9a13cdcbf4448d824ec26f Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Wed, 23 Oct 2013 10:14:42 -0700 Subject: [PATCH 1/3] remove old call to Runtime.warn in file packager code --- tools/file_packager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/file_packager.py b/tools/file_packager.py index 8efa85f4124ee..a2349a5722079 100644 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -359,7 +359,7 @@ def was_seen(name): if (that.audio) { Module['removeRunDependency']('fp ' + that.name); // workaround for chromium bug 124926 (still no audio with this, but at least we don't hang) } else { - Runtime.warn('Preloading file ' + that.name + ' failed'); + Module.printErr('Preloading file ' + that.name + ' failed'); } }, false, true); // canOwn this data in the filesystem, it is a slide into the heap that will never change this.requests[this.name] = null; From 565f0517db482bad310655ac347078d54a15cc8b Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Wed, 23 Oct 2013 15:03:20 -0700 Subject: [PATCH 2/3] fix bug with parsing of empty types --- src/intertyper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intertyper.js b/src/intertyper.js index 4c35db34aaa85..96db696683cea 100644 --- a/src/intertyper.js +++ b/src/intertyper.js @@ -471,8 +471,8 @@ function intertyper(lines, sidePass, baseLineNums) { item.tokens[1] = item.tokens[1].tokens[0]; } var subTokens = item.tokens[1].tokens; - if (subTokens) { - subTokens.push({text:','}); + if (subTokens && subTokens.length > 0) { + subTokens.push({text:','}); // XXX we should avoid altering tokens like that while (subTokens[0]) { var stop = 1; while ([','].indexOf(subTokens[stop].text) == -1) stop ++; From 350550a5ccfacd19f512bca2ded186e143ea9579 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Wed, 23 Oct 2013 17:22:32 -0700 Subject: [PATCH 3/3] 1.7.1 --- tools/shared.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/shared.py b/tools/shared.py index 755cd699479ca..108a48a48087e 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -314,7 +314,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.7.0' +EMSCRIPTEN_VERSION = '1.7.1' def generate_sanity(): return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT