Allow extra library files to be snapshotted

tools/js2c.py

 #!/usr/bin/env python
 #
 # Copyright 2012 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 optparse
+import argparse
 import jsmin
 import bz2
 import textwrap
 
 
 class Error(Exception):
   def __init__(self, msg):
     Exception.__init__(self, msg)
 
 
@@ skipping 478 matching lines @@
     PutStr(output, sources.modules[i]);
 
   PutInt(output, len(sources.names) - debug_sources)
   for i in xrange(debug_sources, len(sources.names)):
     PutStr(output, sources.names[i]);
     PutStr(output, sources.modules[i]);
 
   output.close()
 
 
-def JS2C(source, target, native_type, raw_file, startup_blob):
-  sources = PrepareSources(source)
+def JS2C(source, extraSource, target, native_type, raw_file, startup_blob):
+  # For now we treat source and extraSource the same, but we keep them separate
+  # in the input so that we can start treating them differently in the future.
+  sources = PrepareSources(source + extraSource)
   sources_bytes = "".join(sources.modules)
   metadata = BuildMetadata(sources, sources_bytes, native_type)
 
   # Optionally emit raw file.
   if raw_file:
     output = open(raw_file, "w")
     output.write(sources_bytes)
     output.close()
 
   if startup_blob:
     WriteStartupBlob(sources, startup_blob);
 
   # Emit resulting source file.
   output = open(target, "w")
   output.write(HEADER_TEMPLATE % metadata)
   output.close()
 
 
 def main():
-  parser = optparse.OptionParser()
-  parser.add_option("--raw", action="store",
-                    help="file to write the processed sources array to.")
-  parser.add_option("--startup_blob", action="store",
-                    help="file to write the startup blob to.")
-  parser.set_usage("""js2c out.cc type sources.js ...
-      out.cc: C code to be generated.
-      type: type parameter for NativesCollection template.
-      sources.js: JS internal sources or macros.py.""")
-  (options, args) = parser.parse_args()
+  parser = argparse.ArgumentParser()
+  parser.add_argument("out.cc",
+                      help="C code to be generated")
+  parser.add_argument("type",
+                      help="type parameter for NativesCollection template")
+  parser.add_argument("sources.js",
+                      help="JS internal sources or macros.py.",
+                      nargs="+")
+  parser.add_argument("--raw",
+                      help="file to write the processed sources array to.")
+  parser.add_argument("--startup_blob",
+                      help="file to write the startup blob to.")
+  parser.add_argument("--extra",
+                      help="extra JS sources.",
+                      nargs="*")
 
-  JS2C(args[2:], args[0], args[1], options.raw, options.startup_blob)
+  args = vars(parser.parse_args())
+  JS2C(args["sources.js"], args["extra"] or [], args["out.cc"], args["type"], args["raw"], args["startup_blob"])
 
 
 if __name__ == "__main__":
   main()