| Index: lib/dom/scripts/fremontcutbuilder.py
|
| diff --git a/lib/dom/scripts/fremontcutbuilder.py b/lib/dom/scripts/fremontcutbuilder.py
|
| index d7ad39dc6bfc596f31407c1b4ed271b2c0a0e298..ba94f3e4825de5374733531d910297a1681f4fcd 100755
|
| --- a/lib/dom/scripts/fremontcutbuilder.py
|
| +++ b/lib/dom/scripts/fremontcutbuilder.py
|
| @@ -11,13 +11,13 @@ import os.path
|
| import tempfile
|
| import sys
|
|
|
| -def build_database(idl_list_file_name):
|
| +def build_database(idl_list_file_name, database_dir):
|
| """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'))
|
| + db = database.Database(database_dir)
|
|
|
| # Delete all existing IDLs in the DB.
|
| db.Delete()
|
| @@ -126,14 +126,6 @@ def build_database(idl_list_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:
|
| dart_options = databasebuilder.DatabaseBuilderOptions(
|
| idl_syntax=idlparser.FREMONTCUT_SYNTAX,
|
| @@ -160,6 +152,8 @@ def build_database(idl_list_file_name):
|
| db.Save()
|
|
|
| def main():
|
| + current_dir = os.path.dirname(__file__)
|
| +
|
| webkit_dirs = [
|
| 'Modules/speech',
|
| 'Modules/indexeddb',
|
| @@ -188,8 +182,8 @@ def main():
|
|
|
| (idl_list_file, idl_list_file_name) = tempfile.mkstemp()
|
|
|
| - webcore_dir = os.path.join(os.path.dirname(__file__), '..', '..', '..',
|
| - 'third_party', 'WebCore')
|
| + 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)
|
|
|
| @@ -207,7 +201,8 @@ def main():
|
|
|
| os.close(idl_list_file)
|
|
|
| - return build_database(idl_list_file_name)
|
| + database_dir = os.path.join(current_dir, '..', 'database')
|
| + return build_database(idl_list_file_name, database_dir)
|
|
|
| if __name__ == '__main__':
|
| sys.exit(main())
|
|
|