| Index: Source/WebCore/bindings/dart/gyp/scripts/build_dart_snapshot.py
|
| diff --git a/Source/WebCore/bindings/dart/gyp/scripts/build_dart_snapshot.py b/Source/WebCore/bindings/dart/gyp/scripts/build_dart_snapshot.py
|
| index 74b5e8105408ad659ebdd0798cb00f32bade66cd..393853c73dfd03c09ce2dabeacccac8ed4606da6 100644
|
| --- a/Source/WebCore/bindings/dart/gyp/scripts/build_dart_snapshot.py
|
| +++ b/Source/WebCore/bindings/dart/gyp/scripts/build_dart_snapshot.py
|
| @@ -73,12 +73,18 @@ def main(args):
|
| assert(len(args) == 7)
|
| idlListFileName = args[1]
|
| dartPath = args[2]
|
| - webkitDartResourcesPath = args[3]
|
| + dartSnapshotTemplateFile = args[3]
|
| outputFilePath = args[4]
|
| genSnapshotBinPath = args[5]
|
|
|
| - domCommonPath = os.path.relpath(os.path.join(dartPath, 'client', 'dom', 'common'), outputFilePath)
|
| - webkitDartResourcesPath = os.path.relpath(webkitDartResourcesPath, outputFilePath)
|
| + dartScriptDir = os.path.join(dartPath, 'client', 'dom', 'scripts')
|
| + sys.path.insert(0, dartScriptDir)
|
| +
|
| + import fremontcutbuilder
|
| + fremontcutbuilder.main()
|
| +
|
| + import dartdomgenerator
|
| + dartdomgenerator.GenerateDOM(systems=['native'], output_dir=outputFilePath)
|
|
|
| # FIXME: proper support of enabled features.
|
| EXCLUDED = [
|
| @@ -109,9 +115,6 @@ def main(args):
|
| f.write(template % kwargs)
|
| f.close()
|
|
|
| - def forAllInterfaces(s):
|
| - return ''.join([s % interfaceName for interfaceName in interfaceNames])
|
| -
|
| # Generate snapshot script.
|
| write('snapshot.dart', '''
|
| %(copyrightTemplate)s
|
| @@ -121,43 +124,6 @@ def main(args):
|
| #import("dart:json", prefix: "json");
|
| ''', copyrightTemplate=copyrightTemplate)
|
|
|
| - # Generate dart:dom library.
|
| - write('dom_public.dart', '''
|
| -%(copyrightTemplate)s
|
| -
|
| -#library("DOM Library");
|
| -
|
| -#import("dart:domimpl");
|
| -
|
| -#source("%(domCommonPath)s/public.dart");
|
| -#source("%(webkitDartResourcesPath)s/dom_public.dart");
|
| -
|
| -%(sources)s
|
| -''', copyrightTemplate=copyrightTemplate,
|
| - domCommonPath=domCommonPath,
|
| - webkitDartResourcesPath=webkitDartResourcesPath,
|
| - sources=forAllInterfaces('#source("%s.dart");\n'))
|
| -
|
| - # Generate dart:domimpl
|
| - write('dom_implementation.dart', '''
|
| -%(copyrightTemplate)s
|
| -
|
| -#library("DOM Implementation Library");
|
| -
|
| -#import("dart:coreimpl");
|
| -#import("dart:dom");
|
| -#import("dart:nativewrappers");
|
| -
|
| -#source("%(domCommonPath)s/implementation.dart");
|
| -#source("%(webkitDartResourcesPath)s/dom_implementation.dart");
|
| -
|
| -%(sources)s
|
| -
|
| -class DOMWrapperBase extends NativeFieldWrapperClass2 {}
|
| -''', copyrightTemplate=copyrightTemplate,
|
| - domCommonPath=domCommonPath,
|
| - webkitDartResourcesPath=webkitDartResourcesPath,
|
| - sources=forAllInterfaces('#source("%sImplementation.dart");\n'))
|
|
|
| # Generate resolver.
|
| resolverClasses = ['Dart' + interfaceName for interfaceName in interfaceNames if not interfaceName.endswith('Callback')]
|
| @@ -195,12 +161,12 @@ Dart_NativeFunction snapshotResolver(Dart_Handle name, int argumentCount)
|
| 'python',
|
| path(dartPath, 'runtime', 'tools', 'create_snapshot_file.py'),
|
| '--executable=%s' % path(genSnapshotBinPath),
|
| - '--input_cc=%s' % path(outputFilePath, webkitDartResourcesPath, 'DartSnapshot.bytes.template'),
|
| + '--input_cc=%s' % dartSnapshotTemplateFile,
|
| '--output_bin=%s' % path(outputFilePath, 'DartSnapshot.bin'),
|
| '--output=%s' % path(outputFilePath, 'DartSnapshot.bytes'),
|
| '--script=%s' % path(outputFilePath, 'snapshot.dart'),
|
| - '--url_mapping=dart:dom,%s' % path(outputFilePath, 'dom_public.dart'),
|
| - '--url_mapping=dart:domimpl,%s' % path(outputFilePath, 'dom_implementation.dart'),
|
| + '--url_mapping=dart:dom,%s' % path(outputFilePath, 'generated', 'dom_public.dart'),
|
| + '--url_mapping=dart:domimpl,%s' % path(outputFilePath, 'generated', 'dom_impl.dart'),
|
| '--url_mapping=dart:html,%s' % path(dartPath, 'client', 'html', 'release', 'html.dart'),
|
| '--url_mapping=dart:htmlimpl,%s' % path(dartPath, 'client', 'html', 'release', 'htmlimpl.dart'),
|
| '--url_mapping=dart:json,%s' % path(dartPath, 'client', 'json', 'dart_json.dart'),
|
|
|