Build both dart:html and dart:dom bindings by default

client/dom/scripts/dartdomgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2011, 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.
 
 """This is the entry point to create Dart APIs from the IDL database."""
 
 import dartgenerator
 import database
 import logging.config
@@ skipping 137 matching lines @@
 
   if 'htmldartium' in systems:
     _logger.info('Copy html_dartium to ../html/dartium/')
     subprocess.call(['cd ../../html ; ../tools/copy_dart.py dartium html_dartium.dart'],
                     shell=True);
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('--systems', dest='systems',
                     action='store', type='string',
-                    default='frog,dummy,wrapping',
+                    default='frog,dummy,wrapping,htmlfrog,htmldartium',
                     help='Systems to generate (frog, native, dummy, '
                          'htmlfrog, htmldartium)')
   parser.add_option('--output-dir', dest='output_dir',
                     action='store', type='string',
                     default=None,
                     help='Directory to put the generated files')
   parser.add_option('--use-database-cache', dest='use_database_cache',
                     action='store_true',
                     default=False,
                     help='''Use the cached database from the previous run to
                     improve startup performance''')
   (options, args) = parser.parse_args()
 
   current_dir = os.path.dirname(__file__)
   systems = options.systems.split(',')
-  num_html_systems = ('htmlfrog' in systems) + ('htmldartium' in systems)
-  if num_html_systems > 0 and num_html_systems < len(systems):
-    print 'Cannot generate html and dom bindings at the same time'
-    sys.exit(-1)
+  html_systems = []
+  dom_systems = []
+  for system in systems:
+    if system == 'htmlfrog' or system == 'htmldartium':
+      html_systems.append(system)
+    else:
+      dom_systems.append(system)

[sra1, 2012/03/08 00:51:33]

OK, but could be:

html_system_names = ['htmldartium', 'htmlfrog']
html_systems = [s for s in systems if s in html_system_names]
dom_systems = [s for s in systems if s not in html_system_names]

 
   use_database_cache = options.use_database_cache
-  generate_html_systems = ('htmlfrog' in systems) or ('htmldartium' in systems)
-  output_dir = options.output_dir or (
-      os.path.join(current_dir, '../../html') if generate_html_systems else
-      os.path.join(current_dir, '..'))
-
   logging.config.fileConfig(os.path.join(current_dir, 'logging.conf'))
 
-  GenerateDOM(systems, generate_html_systems, output_dir, use_database_cache)
+  if dom_systems:
+    output_dir = options.output_dir or os.path.join(current_dir, '..')
+    GenerateDOM(dom_systems, False, output_dir, use_database_cache)
 
-  # Copy dummy DOM where dartc build expects it.
-  if 'dummy' in systems:
-    # TODO(sra): Make other tools pick this up directly, or do a copy_dart into
-    # a specific directory.
-    source = os.path.join(output_dir, 'dom_dummy.dart')
-    target = os.path.join(output_dir, 'dom.dart')
-    shutil.copyfile(source, target)
+    # Copy dummy DOM where dartc build expects it.
+    if 'dummy' in systems:
+      # TODO(sra): Make other tools pick this up directly, or do a copy_dart into
+      # a specific directory.
+      source = os.path.join(output_dir, 'dom_dummy.dart')
+      target = os.path.join(output_dir, 'dom.dart')
+      shutil.copyfile(source, target)
+
+  if html_systems:
+    output_dir = options.output_dir or os.path.join(current_dir, '../../html')
+    GenerateDOM(html_systems, True, output_dir, use_database_cache or dom_systems)
 
 if __name__ == '__main__':
   sys.exit(main())