HTML human writable docs working end to end!... mostly...

sdk/lib/html/scripts/dartdomgenerator.py

Index: sdk/lib/html/scripts/dartdomgenerator.py
diff --git a/sdk/lib/html/scripts/dartdomgenerator.py b/sdk/lib/html/scripts/dartdomgenerator.py
index 18cba86ef8ee8e39900924f9310b20ded303b48d..9bc5c3178194273c6563893b73b14b7cbd9dfc15 100755
--- a/sdk/lib/html/scripts/dartdomgenerator.py
+++ b/sdk/lib/html/scripts/dartdomgenerator.py
@@ -85,6 +85,7 @@ def GenerateFromDatabase(common_database, dart2js_output_dir,
       interface_generator.Generate()
 
     generator.Generate(webkit_database, common_database, generate_interface)
+
     dart_library_emitter.EmitLibraries(auxiliary_dir)
 
   if dart2js_output_dir:
@@ -131,7 +132,7 @@ def GenerateFromDatabase(common_database, dart2js_output_dir,
   _logger.info('Flush...')
   emitters.Flush()
 
-def GenerateSingleFile(library_path, output_dir):
+def GenerateSingleFile(library_path, output_dir, generated_output_dir=None):
   library_dir = os.path.dirname(library_path)
   library_filename = os.path.basename(library_path)
   copy_dart_script = os.path.relpath('../../../../tools/copy_dart.py',
@@ -170,6 +171,17 @@ def main():
   systems = options.systems.split(',')
 
   output_dir = options.output_dir or os.path.join(current_dir, '../generated')
+
+  print 'Extracting documentation from HTML.'

[blois, 2012/11/26 20:07:43]

_logger.info rather than print.

[blois, 2012/11/26 20:07:43]

Use of HTML is misleading (applies to class names as well)- this extracts
documentation from DOM types (dart:html, dart:svg, dart:web_audio, etc).

Tool should probably work on dart2js/dart then recurse into html, svg, audio,
etc.

[Andrei Mouravski, 2012/11/26 23:24:11]

Done.

[Andrei Mouravski, 2012/11/26 23:24:11]

Done.

+  html_to_json_script = os.path.relpath(
+      '../../../../tools/html-json-doc/bin/htmlJsonDoc.dart',
+      current_dir)
+  html_output_dir = os.path.join(output_dir, 'dart2js/dart/html/')

[blois, 2012/11/26 20:07:43]

SVG as well?

[Andrei Mouravski, 2012/11/26 23:24:11]

Done.

+  json_path = os.path.relpath('../docs/html_docs.json')
+  command = ' '.join(['dart', html_to_json_script, '--mode=html-to-json',
+                      html_output_dir, json_path])
+  subprocess.call([command], shell=True)
+
   dart2js_output_dir = None
   if 'htmldart2js' in systems:
     dart2js_output_dir = os.path.join(output_dir, 'dart2js')
@@ -185,6 +197,16 @@ def main():
     database = LoadDatabase(database_dir, options.use_database_cache)
   GenerateFromDatabase(database, dart2js_output_dir, dartium_output_dir)
 
+  print 'Add documentation to generated HTML.'
+  html_to_json_script = os.path.relpath(
+      '../../../../tools/html-json-doc/bin/htmlJsonDoc.dart',
+      current_dir)
+  output_dir = os.path.join(output_dir, 'dart2js/dart/html/')
+  json_path = os.path.relpath('../docs/html_docs.json')
+  command = ' '.join(['dart', html_to_json_script, '--mode=json-to-html',
+                      output_dir, json_path])
+  subprocess.call([command], shell=True)
+
   if 'htmldart2js' in systems:
     _logger.info('Generating dart2js single files.')
     GenerateSingleFile(os.path.join(dart2js_output_dir, 'html_dart2js.dart'),