webruby 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90c4009581e36a53cf797ad2685ffaf6499097f9
-  data.tar.gz: 6cf5854d209e72baf672e4ec43c691a54710ef49
+  metadata.gz: 8db4715b363fbfb76c0443e048f891961f4522d8
+  data.tar.gz: 93babadac10f7e24a1529a38f37438c6adb0073c
 SHA512:
-  metadata.gz: 810169db5643ffcc255636cb72d21a2fb09ca2e198c729735fa07746b743ceb2b2a07d480bd102a5ae122b09686422737774df5d11c293c580b16d890fe9d622
-  data.tar.gz: 92249c4531db15431fc64e73832c337af1caca5d8fbe570dc5fed67caa77728ac7fafeaf5e78aa8c843a3aea25728ee22be76d6315338795f56cf0ee2733e86e
+  metadata.gz: 840d18408d4b1c20d7a3f2ba9ff7f34d79ebac03c31a130fb7ee52973d15e7dd32812945910212e8c22531d849f9463cc5a4334ce8b0a81322c8dd55c89caa57
+  data.tar.gz: 9527854eee57e89652f6db80c47ce6a2200b623dfe3b31f40cc9be937845d9dcbf5f3885645f59a7145513dedfa9915b8b9702b0fb54a1d7bb3749d920dab1de

data/driver/driver.c

@@ -12,6 +12,10 @@
 /* The generated mruby bytecodes are stored in this array */
 extern const uint8_t app_irep[];
 
+#ifdef HAS_REQUIRE
+void mrb_enable_require(mrb_state *mrb);
+#endif
+
 /*
  * Print levels:
  * 0 - Do not print anything
@@ -48,3 +52,11 @@ int webruby_internal_run_source(mrb_state* mrb, const char *s, int print_level)
 {
   return check_and_print_errors(mrb, mrb_load_string(mrb, s), print_level);
 }
+
+int webruby_internal_setup(mrb_state* mrb)
+{
+#ifdef HAS_REQUIRE
+  mrb_enable_require(mrb);
+#endif
+  return 0;
+}

data/lib/webruby/config.rb

@@ -2,7 +2,7 @@ module Webruby
   class Config
     attr_accessor :entrypoint, :build_dir, :selected_gemboxes, :selected_gems,
                   :compile_mode, :loading_mode, :output_name,
-                  :executable_output_name
+                  :append_file, :source_processor
 
     def initialize
       @entrypoint = 'app/app.rb'
@@ -12,7 +12,7 @@ module Webruby
       @compile_mode = 'debug'   # debug or release
       @loading_mode = 2
       @output_name = 'webruby.js'
-      @executable_output_name = 'webruby_bin.js'
+      @source_processor = :mrubymix
     end
 
     def is_release_mode
@@ -20,7 +20,7 @@ module Webruby
     end
 
     def cflags
-      "-Wall -Werror-implicit-function-declaration #{optimization_flag}"
+      "-Wall -Werror-implicit-function-declaration -Wno-warn-absolute-paths #{optimization_flag}"
     end
 
     def ldflags

data/lib/webruby/environment.rb

@@ -17,6 +17,7 @@ EMAR = File.join(EMSCRIPTEN_DIR, 'emar')
 # TODO: maybe change these two to functions?
 SCRIPT_GEN_POST = File.join(SCRIPTS_DIR, "gen_post.rb")
 SCRIPT_GEN_GEMS_CONFIG = File.join(SCRIPTS_DIR, "gen_gems_config.rb")
+SCRIPT_GEN_REQUIRE = File.join(SCRIPTS_DIR, "gen_require.rb")
 
 EMCC_CFLAGS = "-I#{MRUBY_DIR}/include"
 

data/lib/webruby/rake/files.rake

@@ -8,14 +8,17 @@ task :gen_gems_config do |t|
   sh "ruby #{SCRIPT_GEN_GEMS_CONFIG} #{Webruby.build_config} #{Webruby.build_dir}/js_api.js #{Webruby.build_dir}/gem_library.js #{Webruby.build_dir}/gem_append.js #{Webruby.build_dir}/gem_test_library.js #{Webruby.build_dir}/gem_test_append.js #{Webruby.build_dir}/functions #{Webruby.full_build_dir}/mruby/emscripten"
 end
 
-file "#{Webruby.build_dir}/rbcode.rb" => ["#{Webruby.entrypoint_file}",
-                                          "#{Webruby.build_dir}"] +
+file "#{Webruby.build_dir}/rbcode.c" => [Webruby.entrypoint_file,
+                                         :libmruby,
+                                         Webruby.build_dir] +
   Webruby.rb_files do |t|
-  sh "ruby #{MRUBYMIX} #{Webruby.entrypoint_file} #{Webruby.build_dir}/rbcode.rb"
-end
-
-file "#{Webruby.build_dir}/rbcode.c" => ["#{Webruby.build_dir}/rbcode.rb", :libmruby] do |t|
-  sh "#{Webruby.build_dir}/#{MRBC} -Bapp_irep -o#{Webruby.build_dir}/rbcode.c #{Webruby.build_dir}/rbcode.rb"
+  if Webruby::App.config.source_processor == :gen_require
+    sh "MRBC=#{Webruby.full_build_dir}/#{MRBC} ruby #{SCRIPT_GEN_REQUIRE} #{File.expand_path(Webruby.entrypoint_file)} #{Webruby.full_build_dir}/rbcode.c"
+  else
+    sh "ruby #{MRUBYMIX} #{Webruby.entrypoint_file} #{Webruby.build_dir}/rbcode.rb"
+    sh "#{Webruby.build_dir}/#{MRBC} -Bapp_irep -o#{Webruby.build_dir}/rbcode.c #{Webruby.build_dir}/rbcode.rb"
+    sh "rm #{Webruby.build_dir}/rbcode.rb"
+  end
 end
 
 file "#{Webruby.build_dir}/app.c" => ["#{Webruby.build_dir}/rbcode.c",
@@ -24,32 +27,29 @@ file "#{Webruby.build_dir}/app.c" => ["#{Webruby.build_dir}/rbcode.c",
 end
 
 file "#{Webruby.build_dir}/app.o" => "#{Webruby.build_dir}/app.c" do |t|
-  sh "#{EMCC} #{EMCC_CFLAGS} #{Webruby::App.config.cflags} #{Webruby.build_dir}/app.c -o #{Webruby.build_dir}/app.o"
+  require_flag = (Webruby::App.config.source_processor == :gen_require) ? ("-DHAS_REQUIRE") : ("")
+  sh "#{EMCC} #{EMCC_CFLAGS} #{require_flag} #{Webruby::App.config.cflags} #{Webruby.build_dir}/app.c -o #{Webruby.build_dir}/app.o"
 end
 
-file "#{Webruby.build_dir}/main.o" => "#{DRIVER_DIR}/main.c" do |t|
-  sh "#{EMCC} #{EMCC_CFLAGS} #{Webruby::App.config.cflags} #{DRIVER_DIR}/main.c -o #{Webruby.build_dir}/main.o"
-end
-
-file "#{Webruby.build_dir}/#{Webruby::App.config.output_name}" =>
+file "#{Webruby.build_dir}/link.js" =>
   ["#{Webruby.build_dir}/app.o", :libmruby] +
   Webruby.gem_js_files do |t|
   func_arg = Webruby.get_exported_arg("#{Webruby.build_dir}/functions",
                                       Webruby::App.config.loading_mode,
                                       [])
 
-  sh "#{EMLD} #{Webruby.build_dir}/app.o #{Webruby.build_dir}/#{LIBMRUBY} -o #{Webruby.build_dir}/#{Webruby::App.config.output_name} #{Webruby.gem_js_flags} #{func_arg} #{Webruby::App.config.ldflags}"
+  sh "#{EMLD} #{Webruby.build_dir}/app.o #{Webruby.build_dir}/#{LIBMRUBY} -o #{Webruby.build_dir}/link.js #{Webruby.gem_js_flags} #{func_arg} #{Webruby::App.config.ldflags}"
 end
 
-file "#{Webruby.build_dir}/#{Webruby::App.config.executable_output_name}" =>
-  ["#{Webruby.build_dir}/main.o",
-   "#{Webruby.build_dir}/app.o", :libmruby] +
-  Webruby.gem_js_files do |t|
-  func_arg = Webruby.get_exported_arg("#{Webruby.build_dir}/functions",
-                                      Webruby::App.config.loading_mode,
-                                      ['main'])
+append_file_deps = Webruby::App.config.append_file ?
+    [Webruby::App.config.append_file] : []
 
-  sh "#{EMLD} #{Webruby.build_dir}/main.o #{Webruby.build_dir}/app.o #{Webruby.build_dir}/#{LIBMRUBY} -o #{Webruby.build_dir}/#{Webruby::App.config.executable_output_name} #{Webruby.gem_js_flags} #{func_arg} #{Webruby::App.config.ldflags}"
+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 "cat #{Webruby::App.config.append_file} >> #{Webruby.build_dir}/#{Webruby::App.config.output_name}"
+  end
 end
 
 file "#{Webruby.build_dir}/mrbtest.bc" => :libmruby_test do |t|

data/lib/webruby/rake/general.rake

@@ -15,7 +15,6 @@ end
 
 task :default => :js
 task :js => "#{Webruby.build_dir}/#{Webruby::App.config.output_name}"
-task :js_bin => "#{Webruby.build_dir}/#{Webruby::App.config.executable_output_name}"
 
 task :mrbtest => "#{Webruby.build_dir}/mrbtest.js" do |t|
   sh "node #{Webruby.build_dir}/mrbtest.js"

data/lib/webruby/utility.rb

@@ -108,6 +108,8 @@ module Webruby
       functions = functions.concat(custom_functions)
       functions = functions.concat(COMMON_EXPORTED_FUNCTIONS)
 
+      functions << 'webruby_internal_setup'
+
       # WEBRUBY.run is supported by all loading modes
       functions << 'webruby_internal_run'
 

data/modules/emscripten/AUTHORS

@@ -1,4 +1,4 @@
-The following authors have all licensed their contributions to Emscripten
+The following authors have all licensed their contributions to Emscripten
 under the licensing terms detailed in LICENSE.
 
 (Authors keep copyright of their contributions, of course; they just grant
@@ -93,4 +93,15 @@ a license to everyone to use it as detailed in LICENSE.)
 * Yu Kobayashi <yukoba@accelart.jp>
 * Pin Zhang <zhangpin04@gmail.com>
 * Nick Bray <ncbray@chromium.org> (copyright owned by Google, Inc.)
+* Aidan Hobson Sayers <aidanhs@cantab.net>
+* Charlie Birks <admin@daftgames.net>
+* Ranger Harke <ranger.harke@autodesk.com> (copyright owned by Autodesk, Inc.)
+* Tobias Vrinssen <tobias@vrinssen.de>
+* Patrick R. Martin <patrick.martin.r@gmail.com>
+* Richard Quirk <richard.quirk@gmail.com>
+* Marcos Scriven <marcos@scriven.org>
+* Antoine Lambert <antoine.lambert33@gmail.com>
+* Daniel Aquino <mr.danielaquino@gmail.com>
+* Remi Papillie <remi.papillie@gmail.com>
+* Fraser Adams <fraser.adams@blueyonder.co.uk>
 

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

@@ -1,48 +1,124 @@
 # This file is a 'toolchain description file' for CMake.
-# It teaches CMake about the Emscripten compiler, so that CMake can generate Unix Makefiles
+# It teaches CMake about the Emscripten compiler, so that CMake can generate makefiles
 # from CMakeLists.txt that invoke emcc.
 
 # To use this toolchain file with CMake, invoke CMake with the following command line parameters
-# cmake -DEMSCRIPTEN=1 
-#       -DCMAKE_TOOLCHAIN_FILE=<EmscriptenRoot>/cmake/Platform/Emscripten.cmake
-#       -DCMAKE_MODULE_PATH=<EmscriptenRoot>/cmake
+# cmake -DCMAKE_TOOLCHAIN_FILE=<EmscriptenRoot>/cmake/Platform/Emscripten.cmake
 #       -DCMAKE_BUILD_TYPE=<Debug|RelWithDebInfo|Release|MinSizeRel>
-#       -G "Unix Makefiles"
+#       -G "Unix Makefiles" (Linux and OSX)
+#       -G "MinGW Makefiles" (Windows)
 #       <path/to/CMakeLists.txt> # Note, pass in here ONLY the path to the file, not the filename 'CMakeLists.txt' itself.
 
 # After that, build the generated Makefile with the command 'make'. On Windows, you may download and use 'mingw32-make' instead.
 
-# the name of the target operating system
-set(CMAKE_SYSTEM_NAME Emscripten)
+# The following variable describes the target OS we are building to.
+# Ideally, this could be 'Emscripten', but as Emscripten mimics the Linux platform, setting this to Linux will allow more of existing software to build.
+# Be sure to run Emscripten test_openjpeg if planning to change this.
+set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 
+set(CMAKE_CROSSCOMPILING TRUE)
+
+# Do a no-op access on the CMAKE_TOOLCHAIN_FILE variable so that CMake will not issue a warning on it being unused.
+if (CMAKE_TOOLCHAIN_FILE)
+endif()
+
+# Locate where the Emscripten compiler resides in relative to this toolchain file.
+if ("${EMSCRIPTEN_ROOT_PATH}" STREQUAL "")
+	get_filename_component(GUESS_EMSCRIPTEN_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
+	if (EXISTS "${GUESS_EMSCRIPTEN_ROOT_PATH}/emranlib")
+		set(EMSCRIPTEN_ROOT_PATH "${GUESS_EMSCRIPTEN_ROOT_PATH}")
+	endif()
+endif()
+
+# If not found by above search, locate using the EMSCRIPTEN environment variable.
+if ("${EMSCRIPTEN_ROOT_PATH}" STREQUAL "")
+	set(EMSCRIPTEN_ROOT_PATH "$ENV{EMSCRIPTEN}")
+endif()
+
+# Abort if not found. 
 if ("${EMSCRIPTEN_ROOT_PATH}" STREQUAL "")
-	set(CMAKE_FIND_ROOT_PATH "$ENV{EMSCRIPTEN}")
+	message(FATAL_ERROR "Could not locate the Emscripten compiler toolchain directory! Either set the EMSCRIPTEN environment variable, or pass -DEMSCRIPTEN_ROOT_PATH=xxx to CMake to explicitly specify the location of the compiler!")
+endif()
+
+# Normalize, convert Windows backslashes to forward slashes or CMake will crash.
+get_filename_component(EMSCRIPTEN_ROOT_PATH "${EMSCRIPTEN_ROOT_PATH}" ABSOLUTE)
+
+if ("${CMAKE_MODULE_PATH}" STREQUAL "")
+	set(CMAKE_MODULE_PATH "${EMSCRIPTEN_ROOT_PATH}/cmake")
+endif()
+
+set(CMAKE_FIND_ROOT_PATH "${EMSCRIPTEN_ROOT_PATH}/cmake")
+
+if (CMAKE_HOST_WIN32)
+	set(EMCC_SUFFIX ".bat")
 else()
-	set(CMAKE_FIND_ROOT_PATH "${EMSCRIPTEN_ROOT_PATH}")
+	set(EMCC_SUFFIX "")
 endif()
 
 # Specify the compilers to use for C and C++
 if ("${CMAKE_C_COMPILER}" STREQUAL "")
-	set(CMAKE_C_COMPILER "emcc.bat")
-	set(CMAKE_CXX_COMPILER "em++.bat")
-	set(CMAKE_AR "emar.bat")
-	set(CMAKE_RANLIB "emranlib.bat")
+	set(CMAKE_C_COMPILER "${EMSCRIPTEN_ROOT_PATH}/emcc${EMCC_SUFFIX}")
+endif()
+if ("${CMAKE_CXX_COMPILER}" STREQUAL "")
+	set(CMAKE_CXX_COMPILER "${EMSCRIPTEN_ROOT_PATH}/em++${EMCC_SUFFIX}")
+endif()
+
+if ("${CMAKE_AR}" STREQUAL "")
+	set(CMAKE_AR "${EMSCRIPTEN_ROOT_PATH}/emar${EMCC_SUFFIX}")
+endif()
+
+if ("${CMAKE_RANLIB}" STREQUAL "")
+	set(CMAKE_RANLIB "${EMSCRIPTEN_ROOT_PATH}/emranlib${EMCC_SUFFIX}")
 endif()
 
+# Don't do compiler autodetection, since we are cross-compiling.
+include(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER("${CMAKE_C_COMPILER}" Clang)
+CMAKE_FORCE_CXX_COMPILER("${CMAKE_CXX_COMPILER}" Clang)
+
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
+# We would prefer to specify a standard set of Clang+Emscripten-friendly common convention for suffix files, especially for CMake executable files,
+# but if these are adjusted, ${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake will fail, since it depends on being able to compile output files with predefined names.
+#SET(CMAKE_LINK_LIBRARY_SUFFIX "")
+#SET(CMAKE_STATIC_LIBRARY_PREFIX "")
+#SET(CMAKE_STATIC_LIBRARY_SUFFIX ".bc")
+#SET(CMAKE_SHARED_LIBRARY_PREFIX "")
+#SET(CMAKE_SHARED_LIBRARY_SUFFIX ".bc")
+#IF (NOT CMAKE_EXECUTABLE_SUFFIX)
+#	SET(CMAKE_EXECUTABLE_SUFFIX ".js")
+#endif()
+#SET(CMAKE_FIND_LIBRARY_PREFIXES "")
+#SET(CMAKE_FIND_LIBRARY_SUFFIXES ".bc")
+
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+
+set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "@")
+set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")
+
 # Specify the program to use when building static libraries. Force Emscripten-related command line options to clang.
-set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_CXX_COMPILER} -o <TARGET> -emit-llvm <LINK_FLAGS> <OBJECTS>")
-set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_C_COMPILER} -o <TARGET> -emit-llvm <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} rc <TARGET> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}")
+set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} rc <TARGET> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}")
 
 # Set a global EMSCRIPTEN variable that can be used in client CMakeLists.txt to detect when building using Emscripten.
 # There seems to be some kind of bug with CMake, so you might need to define this manually on the command line with "-DEMSCRIPTEN=1".
 set(EMSCRIPTEN 1)
 
+# We are cross-compiling, so unset the common CMake variables that represent the target platform. Leave UNIX define enabled, since Emscripten
+# mimics a Linux environment.
+SET(WIN32)
+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")
@@ -59,3 +135,64 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "-O2" CACHE STRING "Emscripten-over
 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")
+
+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}>")
+endfunction()
+
+# A global counter to guarantee unique names for js library files.
+set(link_js_counter 1)
+
+# Internal function: Do not call from user CMakeLists.txt files. Use one of em_link_js_library()/em_link_pre_js()/em_link_post_js() instead.
+function(em_add_tracked_link_flag target flagname)
+	get_target_property(props ${target} LINK_FLAGS)
+	# User can input list of JS files either as a single list, or as variable arguments to this function, so iterate over varargs, and treat each
+	# item in varargs as a list itself, to support both syntax forms.
+	foreach(jsFileList ${ARGN})
+		foreach(jsfile ${jsFileList})
+			# Add link command to the given JS file.
+			set(props "${props} ${flagname} \"${jsfile}\"")
+			
+			# If the user edits the JS file, we want to relink the emscripten application, but unfortunately it is not possible to make a link step
+			# depend directly on a source file. Instead, we must make a dummy no-op build target on that source file, and make the project depend on
+			# that target.
+			
+			# Sanitate the source .js filename to a good symbol name to use as a dummy filename.
+			get_filename_component(jsname "${jsfile}" NAME)
+			string(REGEX REPLACE "[/:\\\\.\ ]" "_" dummy_js_target ${jsname})
+			set(dummy_lib_name ${target}_${link_js_counter}_${dummy_js_target})
+			set(dummy_c_name "${CMAKE_BINARY_DIR}/${dummy_js_target}_tracker.c")
+
+			# Create a new static library target that with a single dummy .c file.
+			add_library(${dummy_lib_name} STATIC ${dummy_c_name})
+			# Make the dummy .c file depend on the .js file we are linking, so that if the .js file is edited, the dummy .c file, and hence the static library will be rebuild (no-op). This causes the main application to be relinked, which is what we want.
+			# This approach was recommended by http://www.cmake.org/pipermail/cmake/2010-May/037206.html
+			add_custom_command(OUTPUT ${dummy_c_name} COMMAND ${CMAKE_COMMAND} -E touch ${dummy_c_name} DEPENDS ${jsfile})
+			target_link_libraries(${target} ${dummy_lib_name})
+
+			math(EXPR link_js_counter "${link_js_counter} + 1")
+		endforeach()
+	endforeach()
+	set_target_properties(${target} PROPERTIES LINK_FLAGS "${props}")
+endfunction()
+
+# This function links a (list of ) .js library file(s) to the given CMake project.
+# Example: em_link_js_library(my_executable "lib1.js" "lib2.js")
+#    will result in emcc passing --js-library lib1.js --js-library lib2.js to the emscripten linker, as well as
+#    tracking the modification timestamp between the linked .js files and the main project, so that editing the .js file
+#    will cause the target project to be relinked.
+function(em_link_js_library target)
+	em_add_tracked_link_flag(${target} "--js-library" ${ARGN})
+endfunction()
+
+# This function is identical to em_link_js_library(), except the .js files will be added with '--pre-js file.js' command line flag,
+# which is generally used to add some preamble .js code to a generated output file.
+function(em_link_pre_js target)
+	em_add_tracked_link_flag(${target} "--pre-js" ${ARGN})
+endfunction()
+
+# This function is identical to em_link_js_library(), except the .js files will be added with '--post-js file.js' command line flag,
+# which is generally used to add some postamble .js code to a generated output file.
+function(em_link_post_js target)
+	em_add_tracked_link_flag(${target} "--post-js" ${ARGN})
+endfunction()

data/modules/emscripten/em++

@@ -8,5 +8,7 @@ import os, subprocess, sys
 from tools import shared
 
 os.environ['EMMAKEN_CXX'] = '1'
+if not os.path.exists(shared.PYTHON):
+  print >> sys.stderr, 'warning: PYTHON does not seem to be defined properly in ~/.emscripten (%s)' % shared.PYTHON
 exit(subprocess.call([shared.PYTHON, shared.EMCC] + sys.argv[1:]))
 

data/modules/emscripten/em++.bat

@@ -1,2 +1,2 @@
 @echo off
-python %~dp0\em++ %*
+python "%~dp0\em++" %*

data/modules/emscripten/em-config.bat

@@ -1,2 +1,2 @@
 @echo off
-python %~dp0\em-config %*
+python "%~dp0\em-config" %*

data/modules/emscripten/emar.bat

@@ -1,2 +1,2 @@
 @echo off
-python %~dp0\emar %*
+python "%~dp0\emar" %*