Teach gen_snapshot how to create script snapshots if given a core snapshot to create them against.

runtime/tools/create_snapshot_bin.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """Script to create snapshot bin file."""
 
 import getopt
 import optparse
 import os
 from os.path import basename, join
 import sys
 import utils
 
 
 HOST_OS = utils.GuessOS()
 HOST_CPUS = utils.GuessCpus()
 DEBUG = False
 VERBOSE = False
 
 def BuildOptions():
   result = optparse.OptionParser()
   result.add_option("--executable",
       action="store", type="string",
       help="path to snapshot generator executable")
+  result.add_option("--snapshot_kind",
+      action="store", type="string",
+      help="kind of snapshot to generate",
+      default="core")
   result.add_option("--vm_output_bin",
       action="store", type="string",
       help="output file name into which vm isolate snapshot in binary form " +
            "is generated")
-  result.add_option("--output_bin",
+  result.add_option("--isolate_output_bin",
       action="store", type="string",
       help="output file name into which isolate snapshot in binary form " +
            "is generated")
   result.add_option("--embedder_entry_points_manifest",
       action="store", type="string",
       help="input manifest with the vm entry points in a precompiled snapshot")
   result.add_option("--script",
       action="store", type="string",
       help="Dart script for which snapshot is to be generated")
   result.add_option("--package_root",
@@ skipping 20 matching lines @@
       action="store", type="string",
       help="Path to timestamp file that will be written",
       default="")
   return result
 
 
 def ProcessOptions(options):
   if not options.executable:
     sys.stderr.write('--executable not specified\n')
     return False
+  if not options.snapshot_kind:
+    sys.stderr.write('--snapshot_kind not specified\n')
+    return False
   if not options.vm_output_bin:
     sys.stderr.write('--vm_output_bin not specified\n')
     return False
-  if not options.output_bin:
-    sys.stderr.write('--output_bin not specified\n')
+  if not options.isolate_output_bin:
+    sys.stderr.write('--isolate_output_bin not specified\n')
     return False
   if options.abi and not options.target_os == 'android':
     sys.stderr.write('--abi requires --target_os android\n')
     return False
   return True
 
 
 def CreateTimestampFile(options):
   if options.timestamp_file != '':
     dir_name = os.path.dirname(options.timestamp_file)
@@ skipping 22 matching lines @@
 
   # Pass along the package_root if there is one.
   if options.package_root:
     script_args.append(''.join([ "--package_root=", options.package_root]))
 
   # Pass along the packages if there is one.
   if options.packages:
     script_args.append(''.join([ "--packages=", options.packages]))
 
   # First setup the vm isolate and regular isolate snapshot output filename.
+  script_args.append(''.join([ "--snapshot_kind=", options.snapshot_kind ]))
   script_args.append(''.join([ "--vm_snapshot_data=", options.vm_output_bin ]))
-  script_args.append(''.join([ "--isolate_snapshot_data=", options.output_bin ]))
+  script_args.append(''.join([ "--isolate_snapshot_data=", options.isolate_output_bin ]))
 
   # Specify the embedder entry points snapshot
   if options.embedder_entry_points_manifest:
     script_args.append(''.join([ "--embedder_entry_points_manifest=",
                                  options.embedder_entry_points_manifest ]))
 
   # Next setup all url mapping options specified.
   for url_arg in options.url_mapping:
     url_mapping_argument = ''.join(["--url_mapping=", url_arg ])
     script_args.append(url_mapping_argument)
@@ skipping 11 matching lines @@
     return -1
 
   # Success, update timestamp file.
   CreateTimestampFile(options)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())