Merge branch 'incoming' into asm_js

Conflicts:
	src/library_browser.js

1 files changed, 7 insertions, 1 deletions

diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py
index 744e068a..b72a2084 100644
--- a/tools/js_optimizer.py
+++ b/tools/js_optimizer.py
@@ -26,7 +26,8 @@ def run_on_chunk(command):
   f.close()
   return filename
 
-def run(filename, passes, js_engine, jcache):
+def run_on_js(filename, passes, js_engine, jcache):
+
   if jcache: shared.JCache.ensure()
 
   if type(passes) == str:
@@ -144,6 +145,8 @@ def run(filename, passes, js_engine, jcache):
   else:
     filenames = []
 
+  for filename in filenames: temp_files.note(filename)
+
   filename += '.jo.js'
   f = open(filename, 'w')
   f.write(pre);
@@ -170,3 +173,6 @@ def run(filename, passes, js_engine, jcache):
 
   return filename
 
+def run(filename, passes, js_engine, jcache):
+  return temp_files.run_and_clean(lambda: run_on_js(filename, passes, js_engine, jcache))
+