Split generate_event_interfaces.py from compute_interfaces_info.py

Tools/Scripts/webkitpy/bindings/main.py

 # Copyright (C) 2011 Google Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
@@ skipping 128 matching lines @@
                                  for filename in fnmatch.filter(files, '*.idl'))
             return idl_paths
 
         def write_list_file(idl_paths):
             list_file, list_filename = self.provider.new_temp_file()
             list_contents = ''.join(idl_path + '\n'
                                     for idl_path in idl_paths)
             os.write(list_file, list_contents)
             return list_filename
 
-        def compute_interfaces_info(idl_files_list_filename,
-                                    event_names_filename):
+        def generate_event_interfaces(event_names_filename):
             cmd = ['python',
-                   'bindings/scripts/compute_interfaces_info.py',
-                   '--idl-files-list', idl_files_list_filename,
+                   'bindings/scripts/generate_event_interfaces.py',
                    '--interfaces-info-file', self.interfaces_info_filename,
                    '--event-names-file', event_names_filename,
                    '--write-file-only-if-changed', '0']
             self.run_command(cmd)
 
+        def compute_interfaces_info(idl_files_list_filename):
+            cmd = ['python',
+                   'bindings/scripts/compute_interfaces_info.py',
+                   '--idl-files-list', idl_files_list_filename,
+                   '--interfaces-info-file', self.interfaces_info_filename,
+                   '--write-file-only-if-changed', '0']
+            self.run_command(cmd)
+
         test_idl_files_list_filename = write_list_file(idl_paths(test_input_directory))
         all_idl_files_list_filename = write_list_file(idl_paths_recursive(all_input_directory))
 
         if self.reset_results and self.verbose:
             print 'Reset results: EventInterfaces.in'
         try:
             # We first compute interfaces info for testing files only,
             # so we can compare EventInterfaces.in.
-            compute_interfaces_info(test_idl_files_list_filename,
-                                    self.event_names_filename)
+            compute_interfaces_info(test_idl_files_list_filename)
+            generate_event_interfaces(self.event_names_filename)
 
             # We then compute interfaces info for all IDL files, as code
             # generator output depends on inheritance (both ancestor chain and
             # inherited extended attributes), and some real interfaces are
             # special-cased, such as Node.
             # For example, when testing the behavior of interfaces that inherit
             # from Node, we also need to know that these inherit from
             # EventTarget, since this is also special-cased and Node inherits
             # from EventTarget, but this inheritance information requires
             # computing dependencies for the real Node.idl file.
             #
             # Don't overwrite the event names file generated for testing IDLs
-            _, dummy_event_names_filename = self.provider.new_temp_file()
-            compute_interfaces_info(all_idl_files_list_filename,
-                                    dummy_event_names_filename)
+            compute_interfaces_info(all_idl_files_list_filename)
         except ScriptError, e:
             print 'ERROR: compute_interfaces_info.py'
             print e.output
             return e.exit_code
         return 0
 
     def identical_file(self, reference_filename, output_filename):
         reference_basename = os.path.basename(reference_filename)
         cmd = ['diff',
                '-u',
@@ skipping 74 matching lines @@
                 print PASS_MESSAGE
             return 0
         print
         print FAIL_MESSAGE
         return -1
 
 
 def run_bindings_tests(reset_results, verbose):
     with ScopedTempFileProvider() as provider:
         return BindingsTests(reset_results, verbose, provider).main()