set up parameter passing for jcache

4 files changed, 31 insertions, 6 deletions

diff --git a/emcc b/emcc
index 1b948341..965897e2 100755
--- a/emcc
+++ b/emcc
@@ -327,6 +327,16 @@ Options that are modified or new in %s include:
                            llvm-link's behavior is not as permissive
                            as ld is.
 
+  --jcache                 Use a JavaScript cache. This is disabled by
+                           default. When enabled, emcc will store the
+                           results of compilation in a cache and check
+                           the cache when compiling later, something
+                           like what ccache does. This allows incremental
+                           builds - where you are compiling a large
+                           program but only modified a small part of it -
+                           to be much faster (at the cost of more disk
+                           IO for cache accesses).
+
   --clear-cache            Manually clears the cache of compiled
                            emscripten system libraries (libc++,
                            libc++abi, dlmalloc). This is normally
@@ -336,7 +346,10 @@ Options that are modified or new in %s include:
                            mechanism can get confused. Clearing the
                            cache can fix weird problems related to
                            cache incompatibilities, like clang failing
-                           to link with library files.
+                           to link with library files. This also clears
+                           other cached data like the jcache and
+                           the bootstrapped relooper. After the cache
+                           is cleared, this process will exit.
 
 The target file, if specified (-o <target>), defines what will
 be generated:
@@ -571,6 +584,7 @@ try:
   remove_duplicates = False
   keep_debug = False
   bind = False
+  jcache = False
 
   def check_bad_eq(arg):
     assert '=' not in arg, 'Invalid parameter (do not use "=" with "--" options)'
@@ -678,10 +692,14 @@ try:
     elif newargs[i] == '--remove-duplicates':
       remove_duplicates = True
       newargs[i] = ''
+    elif newargs[i] == '--jcache':
+      jcache = True
+      newargs[i] = ''
     elif newargs[i] == '--clear-cache':
       newargs[i] = ''
       print >> sys.stderr, 'emcc: clearing cache'
       shared.Cache.erase()
+      sys.exit(0)
     elif newargs[i].startswith(('-I/', '-L/')):
       if not absolute_warning_shown:
         print >> sys.stderr, 'emcc: warning: -I or -L of an absolute path encountered. If this is to a local system header/library, it may cause problems (local system files make sense for compiling natively on your system, but not necessarily to JavaScript)' # Of course an absolute path to a non-system-specific library or header is fine, and you can ignore this warning. The danger are system headers that are e.g. x86 specific and nonportable. The emscripten bundled headers are modified to be portable, local system ones are generally not
@@ -1044,6 +1062,7 @@ try:
   # Emscripten
   if DEBUG: print >> sys.stderr, 'emcc: LLVM => JS'
   extra_args = [] if not js_libraries else ['--libraries', ','.join(map(os.path.abspath, js_libraries))]
+  if jcache: extra_args.append('--jcache')
   final = shared.Building.emscripten(final, append_ext=False, extra_args=extra_args)
   if DEBUG: save_intermediate('original')
 
@@ -1100,12 +1119,12 @@ try:
     if len(js_optimizer_queue) > 0:
       if DEBUG < 2:
         if DEBUG: print >> sys.stderr, 'emcc: applying js optimization passes:', js_optimizer_queue
-        final = shared.Building.js_optimizer(final, js_optimizer_queue)
+        final = shared.Building.js_optimizer(final, js_optimizer_queue, jcache)
         if DEBUG: save_intermediate('js_opts')
       else:
         for name in js_optimizer_queue:
           print >> sys.stderr, 'emcc: applying js optimization pass:', name
-          final = shared.Building.js_optimizer(final, [name])
+          final = shared.Building.js_optimizer(final, [name], jcache)
           save_intermediate(name)
       js_optimizer_queue = []
 
diff --git a/emscripten.py b/emscripten.py
index 1f6ae2fc..d33c16e7 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -32,6 +32,7 @@ def path_from_root(*pathelems):
 temp_files = shared.TempFiles()
 
 compiler_engine = None
+jcache = False
 
 def scan(ll, settings):
   # blockaddress(@main, %23)
@@ -335,6 +336,10 @@ if __name__ == '__main__':
                     metavar='FOO=BAR',
                     help=('Overrides for settings defined in settings.js. '
                           'May occur multiple times.'))
+  parser.add_option('-j', '--jcache',
+                    action='store_true',
+                    default=False,
+                    help=('Enable jcache (ccache-like caching of compilation results, for faster incremental builds).'))
 
   # Convert to the same format that argparse would have produced.
   keywords, positional = parser.parse_args()
@@ -344,6 +349,7 @@ if __name__ == '__main__':
   if isinstance(keywords.outfile, basestring):
     keywords.outfile = open(keywords.outfile, 'w')
   compiler_engine = keywords.compiler
+  jcache = keywords.jcache
 
   temp_files.run_and_clean(lambda: main(keywords))
 
diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py
index 8681280a..00612ef1 100644
--- a/tools/js_optimizer.py
+++ b/tools/js_optimizer.py
@@ -23,7 +23,7 @@ def run_on_chunk(command):
   f.close()
   return filename
 
-def run(filename, passes, js_engine):
+def run(filename, passes, js_engine, jcache):
   if type(passes) == str:
     passes = [passes]
 
diff --git a/tools/shared.py b/tools/shared.py
index 4992badc..1f3b5f20 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -1006,8 +1006,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
     return opts
 
   @staticmethod
-  def js_optimizer(filename, passes):
-    return js_optimizer.run(filename, passes, NODE_JS)
+  def js_optimizer(filename, passes, jcache):
+    return js_optimizer.run(filename, passes, NODE_JS, jcache)
 
   @staticmethod
   def closure_compiler(filename):