Compact JS resource better by using rjsmin.

Source/web/scripts/make-file-arrays.py

 #!/usr/bin/env python
 # Copyright (C) 2012 Google Inc. 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 16 matching lines @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Usage: make-file-arrays.py [--condition=condition-string] --out-h=<header-file-name> --out-cpp=<cpp-file-name> <input-file>...
 
 import os.path
 import re
 import sys
 from optparse import OptionParser
 
+rjsmin_path = os.path.abspath(os.path.join(
+        os.path.dirname(__file__),
+        "..",
+        "..",
+        "build",
+        "scripts"))
+sys.path.append(rjsmin_path)
+import rjsmin
+
 
 def make_variable_name_and_read(file_name):
     result = re.match(r'([\w\d_]+)\.([\w\d_]+)', os.path.basename(file_name))
     if not result:
         print 'Invalid input file name:', os.path.basename(file_name)
         sys.exit(1)
     variable_name = result.group(1)[0].lower() + result.group(1)[1:] + result.group(2).capitalize()
     with open(file_name, 'rb') as f:
         content = f.read()
     return variable_name, content
 
 
 def strip_whitespace_and_comments(file_name, content):
     result = re.match(r'.*\.([^.]+)', file_name)
     if not result:
         print 'The file name has no extension:', file_name
         sys.exit(1)
     extension = result.group(1).lower()
     multi_line_comment = re.compile(r'/\*.*?\*/', re.MULTILINE | re.DOTALL)
-    single_line_comment = re.compile(r'^//.*$', re.MULTILINE)
     # Don't accidentally match URLs (http://...)
-    trailing_comment = re.compile(r'([^:])//.*$', re.MULTILINE)
     repeating_space = re.compile(r'[ \t]+', re.MULTILINE)
     leading_space = re.compile(r'^[ \t]+', re.MULTILINE)
     trailing_space = re.compile(r'[ \t]+$', re.MULTILINE)
     empty_line = re.compile(r'\n+')
     if extension == 'js':
-        content = multi_line_comment.sub('', content)
-        content = single_line_comment.sub('', content)
-        content = trailing_comment.sub(r'\1', content)
-        content = repeating_space.sub(' ', content)
-        content = leading_space.sub('', content)
-        content = trailing_space.sub('', content)
-        content = empty_line.sub('\n', content)

[abarth-chromium, 2014/04/26 17:08:36]

It replaces this one, but may this one is too simple to properly call a
minifier.  :)

+        content = rjsmin.jsmin(content)
     elif extension == 'css':
         content = multi_line_comment.sub('', content)
         content = repeating_space.sub(' ', content)
         content = leading_space.sub('', content)
         content = trailing_space.sub('', content)
         content = empty_line.sub('\n', content)
     return content
 
 
 def process_file(file_name):
@@ skipping 66 matching lines @@
 
     names_and_contents = [process_file(file_name) for file_name in args]
 
     if options.out_header:
         write_header_file(options.out_header, options.flag, names_and_contents)
     write_cpp_file(options.out_cpp, options.flag, names_and_contents, options.out_header)
 
 
 if __name__ == '__main__':
     sys.exit(main())