Support passing the list of idl files to fremontcutbuilder.

lib/dom/scripts/fremontcutbuilder.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.
 
 import database
 import databasebuilder
 import idlparser
 import os.path
+import tempfile
 import logging.config
 import sys
 
-
-def main():
+def build_database(idl_list_file_name):
   """This code reconstructs the FremontCut IDL database from W3C,
   WebKit and Dart IDL files."""
   current_dir = os.path.dirname(__file__)
   logging.config.fileConfig(os.path.join(current_dir, "logging.conf"))
 
   db = database.Database(os.path.join(current_dir, '..', 'database'))
 
   # Delete all existing IDLs in the DB.
   db.Delete()
 
   builder = databasebuilder.DatabaseBuilder(db)
 
-  # Import WebKit IDL files:
-  webkit_dirs = [
-      'Modules/speech',
-      'Modules/indexeddb',
-      'css',
-      'dom',
-      'fileapi',
-      'Modules/filesystem',
-      'html',
-      'html/canvas',
-      'inspector',
-      'loader',
-      'loader/appcache',
-      'Modules/mediastream',
-      'Modules/geolocation',
-      'notifications',
-      'page',
-      'plugins',
-      'storage',
-      'Modules/webdatabase',
-      'svg',
-      'Modules/webaudio',
-      'Modules/websockets',
-      'workers',
-      'xml',
-      ]
-
   # TODO(vsm): Move this to a README.
   # This is the Dart SVN revision.
   webkit_revision = '1060'
 
   # TODO(vsm): Reconcile what is exposed here and inside WebKit code
   # generation.  We need to recheck this periodically for now.
   webkit_defines = [
       'LANGUAGE_DART',
       'LANGUAGE_JAVASCRIPT',
 
@@ skipping 79 matching lines @@
         'Exception': 'DOMException',     # NotificationCenter.createNotification
         'SharedWorkerContext': 'SharedWorkerGlobalScope',
         'WorkerContext': 'WorkerGlobalScope',
       })
 
   optional_argument_whitelist = [
       ('CSSStyleDeclaration', 'setProperty', 'priority'),
       ('IDBDatabase', 'transaction', 'mode'),
       ]
 
-  # Assume Dartium checkout.
-  webcore_path = os.path.join(current_dir, '..', '..', '..', '..',
-                              'third_party', 'WebKit', 'Source', 'WebCore')
-
-  if not os.path.exists(webcore_path):
-    # Fall back to standard Dart checkout.
-    webcore_path = os.path.join(current_dir, '..', '..', '..',
-                                'third_party', 'WebCore')
-
-  for dir_name in webkit_dirs:
-    dir_path = os.path.join(webcore_path, dir_name)
-    builder.import_idl_directory(dir_path, webkit_options)
+  # Import WebKit IDLs.
+  idl_list_file = open(idl_list_file_name, 'r')
+  for file_name in idl_list_file:
+    file_name = file_name.rstrip()

[Anton Muhin, 2012/04/09 13:26:29]

nit: just strip to be slightly safer?

+    idl_file_name = os.path.join(os.path.dirname(idl_list_file_name), file_name)
+    builder.import_idl_file(idl_file_name, webkit_options)
+  idl_list_file.close()
 
   webkit_supplemental_options = databasebuilder.DatabaseBuilderOptions(
     idl_syntax=idlparser.FREMONTCUT_SYNTAX,
     source='WebKit',
     rename_operation_arguments_on_merge=True)
   builder.import_idl_file(
       os.path.join(current_dir, '..', 'idl', 'dart', 'webkit-supplemental.idl'),
       webkit_supplemental_options)
 
   # Import Dart idl:
@@ skipping 14 matching lines @@
   # Merging:
   builder.merge_imported_interfaces(optional_argument_whitelist)
 
   builder.fix_displacements('WebKit')
 
   # Cleanup:
   builder.normalize_annotations(['WebKit', 'Dart'])
 
   db.Save()
 
+def main():
+  webkit_dirs = [
+    'Modules/speech',
+    'Modules/indexeddb',
+    'css',
+    'dom',
+    'fileapi',
+    'Modules/filesystem',
+    'html',
+    'html/canvas',
+    'inspector',
+    'loader',
+    'loader/appcache',
+    'Modules/mediastream',
+    'Modules/geolocation',
+    'notifications',
+    'page',
+    'plugins',
+    'storage',
+    'Modules/webdatabase',
+    'svg',
+    'Modules/webaudio',
+    'Modules/websockets',
+    'workers',
+    'xml',
+    ]
+
+  (idl_list_file, idl_list_file_name) = tempfile.mkstemp()
+
+  webcore_dir = os.path.join(os.path.dirname(__file__), '..', '..', '..',
+                              'third_party', 'WebCore')
+  if not os.path.exists(webcore_dir):
+    raise RuntimeError('directory not found: %s' % webcore_dir)
+
+  def visitor(arg, dir_name, names):
+    for name in names:
+      file_name = os.path.join(dir_name, name)
+      (interface, ext) = os.path.splitext(file_name)
+      if ext == '.idl' and not name.startswith('._'):
+        path = os.path.relpath(file_name, os.path.dirname(idl_list_file_name))
+        os.write(idl_list_file, '%s\n' % path)
+
+  for dir_name in webkit_dirs:
+    dir_path = os.path.join(webcore_dir, dir_name)
+    os.path.walk(dir_path, visitor, None)
+
+  os.close(idl_list_file)
+
+  return build_database(idl_list_file_name)
+
 if __name__ == '__main__':
   sys.exit(main())