webruby 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa9f4f3e59012a040e4f07a5bc66d2d6cb095ec
-  data.tar.gz: c0b1bc4d899990bf072b9c73732dc53b0bd0279f
+  metadata.gz: d6513c6c3002e5e95c2c5a19b60dec1243224216
+  data.tar.gz: f682702ae1a94714e2b6a35a62efa8f9f07803d3
 SHA512:
-  metadata.gz: 963102b0355a11a2412d344525217fdc4cbf34d0e8495b714d7c4922dc96e18ccdeca1748cd6a84a123d17b45ccaf0c2a1ffcafcf0d7652094d5319986785d7d
-  data.tar.gz: 9699973d8194cc3ccfadc5ba513ce10cccec9565193236f16dc7558a8ef1c24d9ee6816f957c9d5d8f3ee621b1f719e29d01424963714d1d2d1c4c5a47805e2b
+  metadata.gz: 76d40913b69ff80303589bf22895a590723d8c245ee47f9afa4578f084ea58cee89bb09dcfc6c83b2aa7238e7b7e2078f8900d69446319fae80c8fc812b95a90
+  data.tar.gz: f0c76941cd3b514e667cb86e352bc225e762a01604f78e515ab4ef34b80c5149acc4cd616a43a2727e4ed2437eb8b6909b73dfdd7a0933c1d2d3c287579ffb03

data/lib/webruby.rb

@@ -4,7 +4,3 @@ require 'webruby/app'
 require 'webruby/config'
 require 'webruby/environment'
 require 'webruby/utility'
-
-# load rake tasks
-require 'rake'
-Dir.glob("#{CURRENT_DIR}/webruby/rake/*.rake") { |f| load f; }

data/lib/webruby/app.rb

@@ -7,6 +7,10 @@ module Webruby
 
       def setup(&block)
         block.call(config)
+
+        # load rake tasks
+        require 'rake'
+        Dir.glob("#{CURRENT_DIR}/webruby/rake/*.rake") { |f| load f; }
       end
     end
   end

data/lib/webruby/rake/files.rake

@@ -11,7 +11,7 @@ end
 file "#{Webruby.build_dir}/rbcode.c" => [Webruby.entrypoint_file,
                                          :libmruby,
                                          Webruby.build_dir] +
-  Webruby.rb_files do |t|
+                                        Webruby.rb_files do |t|
   if Webruby::App.config.source_processor == :gen_require
     ENV["MRBC"] = "#{Webruby.full_build_dir}/#{MRBC}"
     sh "ruby #{SCRIPT_GEN_REQUIRE} #{File.expand_path(Webruby.entrypoint_file)} #{Webruby.full_build_dir}/rbcode.c"
@@ -49,6 +49,7 @@ file "#{Webruby.build_dir}/#{Webruby::App.config.output_name}" =>
   ["#{Webruby.build_dir}/link.js"] + append_file_deps do |t|
   sh "cat #{Webruby.build_dir}/link.js > #{Webruby.build_dir}/#{Webruby::App.config.output_name}"
   if Webruby::App.config.append_file
+    sh "echo '' >> #{Webruby.build_dir}/#{Webruby::App.config.output_name}"
     sh "cat #{Webruby::App.config.append_file} >> #{Webruby.build_dir}/#{Webruby::App.config.output_name}"
   end
 end

data/lib/webruby/rake/mruby.rake

@@ -43,5 +43,5 @@ end
 desc "mruby test library"
 task :libmruby_test => Webruby.build_config do |t|
   ENV["MRUBY_CONFIG"] = Webruby.full_build_config
-  sh "cd #{MRUBY_DIR} && ruby ./minirake #{Webruby.full_build_dir}/#{MRBTEST}"
+  sh "cd #{MRUBY_DIR} && ruby ./minirake #{Webruby.full_build_dir}/#{LIBMRUBY} #{Webruby.full_build_dir}/#{MRBTEST}"
 end

data/modules/emscripten/AUTHORS

@@ -114,3 +114,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Vasilis Kalintiris <ehostunreach@gmail.com>
 * Adam C. Clifton <adam@hulkamaniac.com>
 * Volo Zyko <volo.zyko@gmail.com>
+* Andre Weissflog <floooh@gmail.com>

data/modules/emscripten/ChangeLog

@@ -10,7 +10,40 @@ Not all changes are documented here. In particular, new features, user-oriented
 Current trunk code
 ------------------
  - To see a list of commits in the active development branch 'incoming', which have not yet been packaged in a release, see
-    https://github.com/kripken/emscripten/compare/1.7.8...incoming
+    https://github.com/kripken/emscripten/compare/1.8.2...incoming
+
+v1.8.2: 1/4/2013
+------------------
+ - Fixed glGetFramebufferAttachmentParameteriv and an issue with glGetXXX when the returned value was null.
+ - Full list of changes: https://github.com/kripken/emscripten/compare/1.8.1...1.8.2
+
+v1.8.1: 1/3/2013
+------------------
+ - Added support for WebGL hardware instancing extension.
+ - Improved fastcomp native LLVM backend support.
+ - Added support for #include filename.js to JS libraries.
+ - Deprecated --compression emcc command line parameter that manually compressed output JS files, due to performance issues. Instead, it is best to rely on the web server to serve compressed JS files.
+ - Full list of changes: https://github.com/kripken/emscripten/compare/1.8.0...1.8.1
+
+v1.8.0: 12/28/2013
+------------------
+ - Fix two issues with function outliner and relooper.
+ - Full list of changes: https://github.com/kripken/emscripten/compare/1.7.9...1.8.0
+
+v1.7.9: 12/27/2013
+------------------
+ - Added new command line parameter --em-config that allows specifying a custom location for the .emscripten configuration file.
+ - Reintroduced relaxed asm.js heap sizes, which no longer need to be power of 2, but a multiple of 16MB is sufficient.
+ - Added emrun command line tool that allows launching .html pages from command line on desktop and Android as if they were native applications. See https://groups.google.com/forum/#!topic/emscripten-discuss/t2juu3q1H8E . Adds --emrun compiler link flag.
+ - Began initial work on the "fastcomp" compiler toolchain, a rewrite of the previous JS LLVM AST parsing and codegen via a native LLVM backend.
+ - Added --exclude-file command line flag to emcc and a matching --exclude command line flag to file packager, which allows specifying files and directories that should be excluded while packaging a VFS data blob.
+ - Improved GLES2 and EGL support libraries to be more spec-conformant.
+ - Optimized legacy GL emulation code path. Added new GL_FFP_ONLY optimization path to fixed function pipeline emulation.
+ - Added new core functions emscripten_log() and emscripten_get_callstack() that allow printing out log messages with demangled and source-mapped callstack information.
+ - Improved BSD Sockets support. Implemented getprotobyname() for BSD Sockets library.
+ - Fixed issues with simd support.
+ - Various bugfixes: #1573, #1846, #1886, #1908, #1918, #1930, #1931, #1942, #1948, ..
+ - Full list of changes: https://github.com/kripken/emscripten/compare/1.7.8...1.7.9
 
 v1.7.8: 11/19/2013
 ------------------

data/modules/emscripten/cmake/Platform/Emscripten.cmake

@@ -124,22 +124,22 @@ SET(APPLE)
 set(CMAKE_C_SIZEOF_DATA_PTR 4)
 set(CMAKE_CXX_SIZEOF_DATA_PTR 4)
 
-set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_RELEASE")
-set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_MINSIZEREL")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_RELWITHDEBINFO")
-set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_RELEASE")
-set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_MINSIZEREL")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_RELWITHDEBINFO")
+set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_RELEASE")
+set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_MINSIZEREL")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_RELWITHDEBINFO")
+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_RELEASE")
+set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_MINSIZEREL")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_RELWITHDEBINFO")
 
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-O2" CACHE STRING "Emscripten-overridden CMAKE_EXE_LINKER_FLAGS_RELEASE")
 set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-O2" CACHE STRING "Emscripten-overridden CMAKE_EXE_LINKER_FLAGS_MINSIZEREL")
-set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "-O2" CACHE STRING "Emscripten-overridden CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO")
+set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Emscripten-overridden CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO")
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "-O2" CACHE STRING "Emscripten-overridden CMAKE_SHARED_LINKER_FLAGS_RELEASE")
 set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "-O2" CACHE STRING "Emscripten-overridden CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL")
-set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "-O2" CACHE STRING "Emscripten-overridden CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO")
+set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Emscripten-overridden CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO")
 set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "-O2" CACHE STRING "Emscripten-overridden CMAKE_MODULE_LINKER_FLAGS_RELEASE")
 set(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL "-O2" CACHE STRING "Emscripten-overridden CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL")
-set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "-O2" CACHE STRING "Emscripten-overridden CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO")
+set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Emscripten-overridden CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO")
 
 function(em_validate_asmjs_after_build target)
 	add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E echo Validating build output for asm.js... COMMAND "python" ARGS "${EMSCRIPTEN_ROOT_PATH}/tools/validate_asmjs.py" "$<TARGET_FILE:${target}>")
@@ -205,3 +205,24 @@ endfunction()
 function(em_link_post_js target)
 	em_add_tracked_link_flag(${target} "--post-js" ${ARGN})
 endfunction()
+
+# Experimental support for targeting generation of Visual Studio project files (vs-tool) of Emscripten projects for Windows.
+# To use this, pass the combination -G "Visual Studio 10" -DCMAKE_TOOLCHAIN_FILE=Emscripten.cmake
+if ("${CMAKE_GENERATOR}" MATCHES "^Visual Studio.*")
+	# By default, CMake generates VS project files with a <GenerateManifest>true</GenerateManifest> directive.
+	# This causes VS to attempt to invoke rc.exe during the build, which will fail since app manifests are meaningless for Emscripten.
+	# To disable this, add the following linker flag. This flag will not go to emcc, since the Visual Studio CMake generator will swallow it.
+	set(EMSCRIPTEN_VS_LINKER_FLAGS "/MANIFEST:NO")
+	# CMake is hardcoded to write a ClCompile directive <ObjectFileName>$(IntDir)</ObjectFileName> in all VS project files it generates.
+	# This makes VS pass emcc a -o param that points to a directory instead of a file, which causes emcc autogenerate the output filename.
+	# CMake is hardcoded to assume all object files have the suffix .obj, so adjust the emcc-autogenerated default suffix name to match.
+	set(EMSCRIPTEN_VS_LINKER_FLAGS "${EMSCRIPTEN_VS_LINKER_FLAGS} --default-obj-ext .obj")
+	# Also hint CMake that it should not hardcode <ObjectFileName> generation. Requires a custom CMake build for this to work (ignored on others)
+	# See http://www.cmake.org/Bug/view.php?id=14673 and https://github.com/juj/CMake
+	set(CMAKE_VS_NO_DEFAULT_OBJECTFILENAME 1)
+
+	# Apply and cache Emscripten Visual Studio IDE-specific linker flags.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EMSCRIPTEN_VS_LINKER_FLAGS}" CACHE STRING "")
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${EMSCRIPTEN_VS_LINKER_FLAGS}" CACHE STRING "")
+	set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${EMSCRIPTEN_VS_LINKER_FLAGS}" CACHE STRING "")
+endif()

data/modules/emscripten/emcc

@@ -348,7 +348,9 @@ Options that are modified or new in %s include:
                            --embed-file and --preload-file
                            wildcard is supported
 
-  --compression <codec>    Compress both the compiled code and embedded/
+  --compression <codec>    **THIS OPTION IS DEPRECATED**
+
+                           Compress both the compiled code and embedded/
                            preloaded files. <codec> should be a triple,
 
                               <native_encoder>,<js_decoder>,<js_name>
@@ -517,6 +519,13 @@ Options that are modified or new in %s include:
                            file, and if that is not set, the default location
                            ~/.emscripten is assumed.
 
+  --default-obj-ext .ext   Specifies the file suffix to generate if the location
+                           of a directory name is passed to -o directive, e.g.
+                             emcc -c a.c -o dir/
+                           will by default generate an output name 'dir/a.o', 
+                           but this cmdline param can be passed to generate a
+                           file with a custom suffix 'dir/a.ext'. 
+
 The target file, if specified (-o <target>), defines what will
 be generated:
 
@@ -678,7 +687,7 @@ if os.environ.get('EMMAKEN_CXX'):
 CC_ADDITIONAL_ARGS = shared.COMPILER_OPTS
 
 EMMAKEN_CFLAGS = os.environ.get('EMMAKEN_CFLAGS')
-if EMMAKEN_CFLAGS: CC_ADDITIONAL_ARGS += shlex.split(EMMAKEN_CFLAGS)
+if EMMAKEN_CFLAGS: sys.argv += shlex.split(EMMAKEN_CFLAGS)
 
 # ---------------- Utilities ---------------
 
@@ -804,6 +813,7 @@ try:
   use_preload_cache = False
   no_heap_copy = False
   proxy_to_worker = False
+  default_object_extension = '.o'
 
   if use_cxx:
     default_cxx_std = '-std=c++03' # Enforce a consistent C++ standard when compiling .cpp files, if user does not specify one on the cmdline.
@@ -914,6 +924,7 @@ try:
       newargs[i] = ''
       newargs[i+1] = ''
     elif newargs[i].startswith('--compression'):
+      logging.warning('--compression is deprecated. Instead, it is recommended you use native gzip compression in your webserver')
       check_bad_eq(newargs[i])
       parts = newargs[i+1].split(',')
       assert len(parts) == 3, '--compression requires specifying    native_encoder,js_decoder,js_name  - see emcc --help. got: %s' % newargs[i+1]
@@ -999,6 +1010,12 @@ try:
       # This option is parsed in tools/shared.py, here only clean it up from being passed to clang.
       newargs[i] = ''
       newargs[i+1] = ''
+    elif newargs[i] == '--default-obj-ext':
+      newargs[i] = ''
+      default_object_extension = newargs[i+1]
+      if not default_object_extension.startswith('.'):
+        default_object_extension = '.' + default_object_extension
+      newargs[i+1] = ''
 
   newargs = [ arg for arg in newargs if arg is not '' ]
 
@@ -1173,11 +1190,10 @@ try:
     logging.warning('disabling asm.js since embind is not ready for it yet')
     shared.Settings.ASM_JS = 0
 
-  if os.environ.get('EMCC_FAST_COMPILER'):
+  fastcomp = os.environ.get('EMCC_FAST_COMPILER') == '1'
+
+  if fastcomp:
     shared.Settings.ASM_JS = 1
-    if shared.Settings.DISABLE_EXCEPTION_CATCHING == 0:
-      logging.warning('disabling exception catching since not supported in fastcomp yet')
-      shared.Settings.DISABLE_EXCEPTION_CATCHING = 1
     assert shared.Settings.ALLOW_MEMORY_GROWTH == 0, 'memory growth not supported in fastcomp yet'
     assert shared.Settings.UNALIGNED_MEMORY == 0, 'forced unaligned memory not supported in fastcomp'
     assert shared.Settings.SAFE_HEAP == 0, 'safe heap not supported in fastcomp yet'
@@ -1191,10 +1207,18 @@ try:
     assert shared.Settings.NAMED_GLOBALS == 0, 'named globals not supported in fastcomp'
     assert shared.Settings.PGO == 0, 'pgo not supported in fastcomp'
     assert shared.Settings.TARGET_LE32 == 1, 'fastcomp requires le32'
+    assert shared.Settings.USE_TYPED_ARRAYS == 2, 'fastcomp assumes ta2'
     assert not bind, 'embind not supported in fastcomp yet'
+    if jcache:
+      logging.warning('jcache is not supported in fastcomp (you should not need it anyhow), disabling')
+      jcache = False
+
+    fastcomp_opts = ['-pnacl-abi-simplify-preopt', '-pnacl-abi-simplify-postopt']
+    if not shared.Settings.DISABLE_EXCEPTION_CATCHING:
+      fastcomp_opts += ['-enable-emscripten-cxx-exceptions']
 
   if shared.Settings.ASM_JS:
-    assert opt_level >= 1 or os.environ.get('EMCC_FAST_COMPILER'), 'asm.js requires -O1 or above'
+    assert opt_level >= 1 or fastcomp, 'asm.js requires -O1 or above'
 
     if bind:
       shared.Settings.RESERVED_FUNCTION_POINTERS = max(shared.Settings.RESERVED_FUNCTION_POINTERS, 10)
@@ -1206,16 +1230,6 @@ try:
       shared.Settings.CORRECT_OVERFLOWS = 1
     assert not shared.Settings.PGO, 'cannot run PGO in ASM_JS mode'
 
-    heap = 4096
-    while heap < shared.Settings.TOTAL_MEMORY:
-      if heap < 16*1024*1024:
-        heap *= 2
-      else:
-        heap += 16*1024*1024
-    if heap != shared.Settings.TOTAL_MEMORY:
-      logging.warning('increasing TOTAL_MEMORY to %d to be more reasonable for asm.js' % heap)
-      shared.Settings.TOTAL_MEMORY = heap
-
   if shared.Settings.CORRECT_SIGNS >= 2 or shared.Settings.CORRECT_OVERFLOWS >= 2 or shared.Settings.CORRECT_ROUNDINGS >= 2:
     debug_level = 4 # must keep debug info to do line-by-line operations
 
@@ -1340,7 +1354,16 @@ try:
     else:
       if len(input_files) == 1:
         temp_output_base = in_temp(unsuffixed(uniquename(input_files[0])))
-        shutil.move(temp_output_base + '.o', specified_target)
+        if specified_target.endswith('/') or specified_target.endswith('\\') or os.path.isdir(specified_target): # User passed '-o <directory' as the location to output to.
+          obj_output_name = os.path.join(specified_target, os.path.splitext(os.path.basename(input_file))[0] + default_object_extension)
+          logging.debug('User specified -o <directoryname> as the location of the output. Generating output file ' + obj_output_name)
+          try:
+            shutil.move(temp_output_base + '.o', obj_output_name)
+          except IOError, e:
+            logging.error('Could not write to output file ' + obj_output_name + '. Perhaps the output directory does not exist?')
+            exit(1)
+        else: # User passed '-o <filename>' as the location to output to.
+          shutil.move(temp_output_base + '.o', specified_target)
         if os.path.exists(temp_output_base + '.d'):
           # There was a .d file generated, from -MD or -MMD and friends, save a copy of it to where the output resides,
           # adjusting the target name away from the temporary file name to the specified target.
@@ -1722,22 +1745,24 @@ try:
       # At minimum remove dead functions etc., this potentially saves a lot in the size of the generated code (and the time to compile it)
       link_opts += shared.Building.get_safe_internalize() + ['-globaldce']
 
-    # Simplify LLVM bitcode for fastcomp
-    if os.environ.get('EMCC_FAST_COMPILER') and not AUTODEBUG:
-      link_opts += ['-pnacl-abi-simplify-preopt', '-pnacl-abi-simplify-postopt']
-
-    if (not save_bc and not os.environ.get('EMCC_FAST_COMPILER')) or AUTODEBUG:
+    if (not save_bc and not fastcomp) or AUTODEBUG:
       # let llvm opt directly emit ll, to skip writing and reading all the bitcode
       link_opts += ['-S']
       shared.Building.llvm_opt(final, link_opts, final + '.link.ll')
       final = final + '.link.ll'
       if DEBUG: save_intermediate('linktime', 'll')
     else:
+      if fastcomp and not save_bc:
+        # Simplify LLVM bitcode for fastcomp
+        link_opts += fastcomp_opts
       shared.Building.llvm_opt(final, link_opts)
       if DEBUG: save_intermediate('linktime', 'bc')
-
-  if save_bc:
-    shutil.copyfile(final, save_bc)
+      if save_bc:
+        shutil.copyfile(final, save_bc)
+        if fastcomp:
+          shared.Building.llvm_opt(final, fastcomp_opts, final + '.adsimp.bc')
+          final += '.adsimp.bc'
+          if DEBUG: save_intermediate('adsimp', 'bc')
 
   # Prepare .ll for Emscripten
   if not LEAVE_INPUTS_RAW:
@@ -1754,8 +1779,8 @@ try:
     if DEBUG: save_intermediate('autodebug', 'll')
 
   # Simplify bitcode after autodebug
-  if os.environ.get('EMCC_FAST_COMPILER') and (AUTODEBUG or LEAVE_INPUTS_RAW):
-    shared.Building.llvm_opt(final, ['-pnacl-abi-simplify-preopt', '-pnacl-abi-simplify-postopt'], final + '.adsimp.bc')
+  if fastcomp and (AUTODEBUG or LEAVE_INPUTS_RAW):
+    shared.Building.llvm_opt(final, fastcomp_opts, final + '.adsimp.bc')
     final += '.adsimp.bc'
     if DEBUG: save_intermediate('adsimp', 'bc')
 
@@ -1891,6 +1916,9 @@ try:
 
     js_optimizer_queue += [get_eliminate()]
 
+    if shared.Settings.AGGRESSIVE_VARIABLE_ELIMINATION:
+      js_optimizer_queue += ['aggressiveVariableElimination']
+
     if opt_level >= 2:
       js_optimizer_queue += ['simplifyExpressions']
 
@@ -1949,6 +1977,11 @@ try:
       if debug_level >= 4:
         generate_source_map(target)
       shutil.move(final, js_target)
+      # TODO: use an async blob, which would allow code rewriting on the client:
+      #   var blob = new Blob([codeString]);
+      #   var script = document.createElement('script');
+      #   script.src = URL.createObjectURL(blob);
+      #   document.body.appendChild(script);
       script_tag = '''<script async type="text/javascript" src="%s"></script>''' % base_js_target
       html.write(shell.replace('{{{ SCRIPT }}}', script_tag))
     else:

data/modules/emscripten/emrun

@@ -492,15 +492,18 @@ def win_print_gpu_info():
       print "GPU"+str(i)+ ": " + gpus[i] + " with " + gpu_memory[i] + " MBs of VRAM"
 
 def linux_print_gpu_info():
-  glxinfo = subprocess.check_output('glxinfo')
-  for line in glxinfo.split("\n"):
-    if "OpenGL vendor string:" in line:
-      gl_vendor = line[len("OpenGL vendor string:"):].strip()
-    if "OpenGL version string:" in line:
-      gl_version = line[len("OpenGL version string:"):].strip()
-    if "OpenGL renderer string:" in line:
-      gl_renderer = line[len("OpenGL renderer string:"):].strip()
-  logi('GPU: ' + gl_vendor + ' ' + gl_renderer + ', GL version ' + gl_version)
+  try:
+    glxinfo = subprocess.check_output('glxinfo')
+    for line in glxinfo.split("\n"):
+      if "OpenGL vendor string:" in line:
+        gl_vendor = line[len("OpenGL vendor string:"):].strip()
+      if "OpenGL version string:" in line:
+        gl_version = line[len("OpenGL version string:"):].strip()
+      if "OpenGL renderer string:" in line:
+        gl_renderer = line[len("OpenGL renderer string:"):].strip()
+    logi('GPU: ' + gl_vendor + ' ' + gl_renderer + ', GL version ' + gl_version)
+  except:
+    pass
 
 def osx_print_gpu_info():
   try:
@@ -722,11 +725,12 @@ def find_browser(name):
                           ('firefox_beta', os.path.expanduser('~/firefox_beta/firefox')),
                           ('firefox_aurora', os.path.expanduser('~/firefox_aurora/firefox')),
                           ('firefox_nightly', os.path.expanduser('~/firefox_nightly/firefox')),
-                          ('chrome', which('google-chrome-stable'))]
+                          ('chrome', which('google-chrome-stable')),
+                          ('chrome', which('google-chrome'))]
 
   for (alias, browser_exe) in browser_locations:
     if name == alias:
-      if os.path.isfile(browser_exe):
+      if browser_exe is not None and os.path.isfile(browser_exe):
         return [browser_exe]
   
   return None # Could not find the browser

data/modules/emscripten/emscripten.py

@@ -804,6 +804,9 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None,
       map(lambda x: x[1:], metadata['implementedFunctions'])
     )
   ) + map(lambda x: x[1:], metadata['externs'])
+  if metadata['simd']:
+    settings['SIMD'] = 1
+    settings['ASM_JS'] = 2
 
   # Save settings to a file to work around v8 issue 1579
   settings_file = temp_files.get('.txt').name

data/modules/emscripten/src/closure-externs.js

@@ -0,0 +1,110 @@
+/**
+ * This file contains definitions for things that we'd really rather the closure compiler *didn't* minify.
+ * See http://code.google.com/p/closure-compiler/wiki/FAQ#How_do_I_write_an_externs_file
+ * See also the discussion here: https://github.com/kripken/emscripten/issues/1979
+ *
+ * The closure_compiler() method in tools/shared.py refers to this file when calling closure.
+ */
+
+// Closure externs used by library_uuid.js
+
+/**
+ * @param {Array} typedArray
+ */
+crypto.getRandomValues = function(typedArray) {};
+
+/**
+ BEGIN_NODE_INCLUDE
+ var crypto = require('crypto');
+ END_NODE_INCLUDE
+ */
+
+/**
+ * @type {Object.<string,*>}
+ */
+var crypto = {};
+
+/**
+ * @param {number} size
+ * @param {function(Error, buffer.Buffer)} callback
+ */
+crypto.randomBytes = function(size, callback) {};
+
+
+// Closure externs used by library_sockfs.js
+
+/**
+ BEGIN_NODE_INCLUDE
+ var ws = require('ws');
+ END_NODE_INCLUDE
+ */
+
+/**
+ * @type {Object.<string,*>}
+ */
+var ws = {};
+
+/**
+ * @param {string} event
+ * @param {function()} callback
+ */
+ws.on = function(event, callback) {};
+
+/**
+ * @param {Object} data
+ * @param {Object} flags
+ * @param {function()=} callback
+ */
+ws.send = function(data, flags, callback) {};
+
+/**
+* @type {boolean}
+*/
+ws.binaryType;
+
+/**
+ * @type {Object.<string,*>}
+ */
+var wss = ws.Server;
+
+/**
+ * @param {string} event
+ * @param {function()} callback
+ */
+wss.on = function(event, callback) {};
+
+/**
+ * @param {function()} callback
+ */
+wss.broadcast = function(callback) {};
+
+/**
+* @type {Object.<string,*>}
+*/
+wss._socket;
+
+/**
+* @type {string}
+*/
+wss.url;
+
+/**
+* @type {string}
+*/
+wss._socket.remoteAddress;
+
+/**
+* @type {number}
+*/
+wss._socket.remotePort;
+
+/**
+* @type {Object.<string,*>}
+*/
+var flags = {};
+/**
+* @type {boolean}
+*/
+flags.binary;
+
+