Enable html_dartium to be built as part of dartium build

lib/dom/scripts/dartdomgenerator.py

Index: lib/dom/scripts/dartdomgenerator.py
diff --git a/lib/dom/scripts/dartdomgenerator.py b/lib/dom/scripts/dartdomgenerator.py
index ff1bfd25b9faf0267f88b1abf9c78f9e503061e2..94053eeb7135b5fe15e6710e06dea3890553b56d 100755
--- a/lib/dom/scripts/dartdomgenerator.py
+++ b/lib/dom/scripts/dartdomgenerator.py
@@ -71,7 +71,7 @@ def _MakeHtmlRenames(common_database):
   return html_renames
 
 def GenerateDOM(systems, generate_html_systems, output_dir,
-                database_dir, use_database_cache):
+                database_dir, use_database_cache, create_single_file):
   current_dir = os.path.dirname(__file__)
 
   generator = dartgenerator.DartGenerator(
@@ -118,31 +118,32 @@ def GenerateDOM(systems, generate_html_systems, output_dir,
 
   generator.Flush()
 
-  if 'frog' in systems:
-    _logger.info('Copy dom_frog to frog/')
-    subprocess.call(['cd ../generated ; '
-                     '../../../tools/copy_dart.py ../frog dom_frog.dart'],
-                    shell=True);
-
-  if 'htmlfrog' in systems:
-    _logger.info('Copy html_frog to ../html/frog/')
-    subprocess.call(['cd ../../html/generated ; '
-                     '../../../tools/copy_dart.py ../frog html_frog.dart'],
-                    shell=True);
-
-  if 'htmldartium' in systems:
-    _logger.info('Copy html_dartium to ../html/dartium/')
-    subprocess.call(['cd ../../html/generated ; '
-                     '../../../tools/copy_dart.py ../dartium html_dartium.dart'],
-                    shell=True);
-
-  # Copy dummy DOM where dartc build expects it.
-  if 'dummy' in systems:
-    _logger.info('Copy dom_dummy to dom.dart')
-    subprocess.call(['cd ../generated ; '
-                     '../../../tools/copy_dart.py dummy dom_dummy.dart ;'
-                     'cp dummy/dom_dummy.dart ../dom.dart'],
-                    shell=True);
+  if create_single_file:

[Anton Muhin, 2012/04/19 10:23:14]

let's use an early return here, it'll make diff ways more readable

+    if 'frog' in systems:

[Anton Muhin, 2012/04/19 10:23:14]

it looks like this part is completely independent of the previous, maybe move
into a separate method, say, GenerateSingleFile() or something, and invoke in
proper places instead of adding an additional argument?

+      _logger.info('Copy dom_frog to frog/')
+      subprocess.call(['cd ../generated ; '
+                       '../../../tools/copy_dart.py ../frog dom_frog.dart'],
+                      shell=True);
+
+    if 'htmlfrog' in systems:
+      _logger.info('Copy html_frog to ../html/frog/')
+      subprocess.call(['cd ../../html/generated ; '
+                       '../../../tools/copy_dart.py ../frog html_frog.dart'],
+                      shell=True);
+
+    if 'htmldartium' in systems:
+      _logger.info('Copy html_dartium to ../html/dartium/')
+      subprocess.call(['cd ../../html/generated ; '
+                       '../../../tools/copy_dart.py ../dartium html_dartium.dart'],
+                      shell=True);
+
+    # Copy dummy DOM where dartc build expects it.
+    if 'dummy' in systems:
+      _logger.info('Copy dom_dummy to dom.dart')
+      subprocess.call(['cd ../generated ; '
+                       '../../../tools/copy_dart.py dummy dom_dummy.dart ;'
+                       'cp dummy/dom_dummy.dart ../dom.dart'],
+                      shell=True);
 
 def main():
   parser = optparse.OptionParser()
@@ -176,13 +177,13 @@ def main():
     output_dir = options.output_dir or os.path.join(current_dir,
         '../generated')
     GenerateDOM(dom_systems, False, output_dir,
-                database_dir, use_database_cache)
+                database_dir, use_database_cache, True)
 
   if html_systems:
     output_dir = options.output_dir or os.path.join(current_dir,
         '../../html/generated')
     GenerateDOM(html_systems, True, output_dir,
-                database_dir, use_database_cache or dom_systems)
+                database_dir, use_database_cache or dom_systems, True)
 
 if __name__ == '__main__':
   sys.exit(main())