Further minify non-visible JavaScript.

tools/js2c.py

 #!/usr/bin/env python
 #
 # Copyright 2006-2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # This is a utility for converting JavaScript source code into C-style
 # char arrays. It is used for embedded JavaScript code in the V8
 # library.
 
 import os, re, sys, string
+import jsmin
 
 
 def ToCArray(lines):
   result = []
   for chr in lines:
     value = ord(chr)
     assert value < 128
     result.append(str(value))
   result.append("0")
   return ", ".join(result)
 
 
-def CompressScript(lines):
+def CompressScript(lines, do_jsmin):
+  # If we're not expecting this code to be user visible, we can run it through
+  # a more aggressive minifier.
+  if do_jsmin:
+    return jsmin.jsmin(lines)
+
   # Remove stuff from the source that we don't want to appear when
   # people print the source code using Function.prototype.toString().
   # Note that we could easily compress the scripts mode but don't
   # since we want it to remain readable.
   lines = re.sub('//.*\n', '\n', lines) # end-of-line comments
   lines = re.sub(re.compile(r'/\*.*?\*/', re.DOTALL), '', lines) # comments.
   lines = re.sub('\s+\n+', '\n', lines) # trailing whitespace
   return lines
 
 
@@ skipping 207 matching lines @@
       (consts, macros) = ReadMacros(ReadLines(str(s)))
     else:
       modules.append(s)
 
   # Build source code lines
   source_lines = [ ]
   source_lines_empty = []
   for s in modules:
     delay = str(s).endswith('-delay.js')
     lines = ReadFile(str(s))
+    do_jsmin = lines.find('// jsminify this file, js2c: jsmin') != -1
     lines = ExpandConstants(lines, consts)
     lines = ExpandMacros(lines, macros)
-    lines = CompressScript(lines)
+    lines = CompressScript(lines, do_jsmin)
     data = ToCArray(lines)
     id = (os.path.split(str(s))[1])[:-3]
     if delay: id = id[:-6]
     if delay:
       delay_ids.append((id, len(lines)))
     else:
       ids.append((id, len(lines)))
     source_lines.append(SOURCE_DECLARATION % { 'id': id, 'data': data })
     source_lines_empty.append(SOURCE_DECLARATION % { 'id': id, 'data': 0 })
   
@@ skipping 61 matching lines @@
 
 def main():
   natives = sys.argv[1]
   natives_empty = sys.argv[2]
   type = sys.argv[3]
   source_files = sys.argv[4:]
   JS2C(source_files, [natives, natives_empty], { 'TYPE': type })
 
 if __name__ == "__main__":
   main()