1st phasing of transition to new API.

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 logging.config
 import os.path
-import tempfile
 import sys
 
 # TODO(antonm): most probably should go away or be autogenerated on IDLs roll.
 DEFAULT_FEATURE_DEFINES = [
     # Enabled Chrome WebKit build.
     'ENABLE_3D_PLUGIN',
     'ENABLE_3D_RENDERING',
     'ENABLE_ACCELERATED_2D_CANVAS',
     'ENABLE_BATTERY_STATUS',
     'ENABLE_BLOB',
@@ skipping 55 matching lines @@
     'ENABLE_WEB_SOCKETS',
     'ENABLE_WEB_TIMING',
     'ENABLE_WORKERS',
     'ENABLE_XHR_RESPONSE_BLOB',
     'ENABLE_XSLT',
 ]
 
 # TODO(antonm): Remove this filter.
 UNSUPPORTED_FEATURES = [ 'ENABLE_WEB_INTENTS' ]
 
-def build_database(idl_list_file_name, database_dir, feature_defines = None):
+def build_database(idl_files, database_dir, feature_defines = None):
   """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(database_dir)
 
   # Delete all existing IDLs in the DB.
   db.Delete()
 
@@ skipping 26 matching lines @@
         'SharedWorkerContext': 'SharedWorkerGlobalScope',
         'WorkerContext': 'WorkerGlobalScope',
       })
 
   optional_argument_whitelist = [
       ('CSSStyleDeclaration', 'setProperty', 'priority'),
       ('IDBDatabase', 'transaction', 'mode'),
       ]
 
   # Import WebKit IDLs.
-  idl_list_file = open(idl_list_file_name, 'r')
-  for file_name in idl_list_file:
-    file_name = file_name.strip()
-    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()
+  if isinstance(idl_files, list):
+    for file_name in idl_files:
+      builder.import_idl_file(idl_file_name, webkit_options)
+  else:
+    idl_list_file = open(idl_files, 'r')

[podivilov, 2012/04/16 09:24:58]

Is it needed for two-side patching only?

[Anton Muhin, 2012/04/16 09:39:38]

Sorry?  I just do not want to make breaking changes if I can

+    for file_name in idl_list_file:
+      file_name = file_name.strip()
+      idl_file_name = os.path.join(os.path.dirname(idl_files), file_name)
+      builder.import_idl_file(idl_file_name, webkit_options)
+    idl_list_file.close()
 
   # Import Dart idl:
   dart_options = databasebuilder.DatabaseBuilderOptions(
     idl_syntax=idlparser.FREMONTCUT_SYNTAX,
     source='Dart',
     rename_operation_arguments_on_merge=True)
 
   builder.import_idl_file(
       os.path.join(current_dir, '..', 'idl', 'dart', 'dart.idl'),
       dart_options)
@@ skipping 35 matching lines @@
     'plugins',
     'storage',
     'Modules/webdatabase',
     'svg',
     'Modules/webaudio',
     'Modules/websockets',
     'workers',
     'xml',
     ]
 
-  (idl_list_file, idl_list_file_name) = tempfile.mkstemp()
+  idl_files = []
 
   webcore_dir = os.path.join(current_dir, '..', '..', '..',
                              '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)
+        idl_files.add(file_name)
 
   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)
-
   database_dir = os.path.join(current_dir, '..', 'database')
-  return build_database(idl_list_file_name, database_dir)
+  return build_database(idl_files, database_dir)
 
 if __name__ == '__main__':
   sys.exit(main())