Split bindings output between core and modules!

Source/bindings/scripts/aggregate_generated_bindings.py

 #!/usr/bin/python
 #
 # Copyright (C) 2009 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:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 20 matching lines @@
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generate aggregate .cpp files that include multiple V8 binding .cpp files.
 
 This can be a single output file, to preserve symbol space; or multiple output
 files, to reduce maximum compilation unit size and allow parallel compilation.
 
 Usage:
-aggregate_generated_bindings.py IDL_FILES_LIST -- OUTPUT_FILE1 OUTPUT_FILE2 ...
+aggregate_generated_bindings.py COMPONENT_DIR IDL_FILES_LIST -- OUTPUT_FILE1 OUTPUT_FILE2 ...
 
+COMPONENT_DIR is the relative directory of a component, e.g., 'core', 'modules'.
 IDL_FILES_LIST is a text file containing the IDL file paths, so the command
 line doesn't exceed OS length limits.
 OUTPUT_FILE1 etc. are filenames of output files.
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-build
 """
 
 import errno
 import os
 import re
@@ skipping 85 matching lines @@
 
         meta_data = {
             'conditional': extract_conditional(file_path),
             'name': interface_name,
         }
         meta_data_list.append(meta_data)
 
     return meta_data_list
 
 
-def generate_content(files_meta_data_this_partition):
+def generate_content(component_dir, files_meta_data_this_partition):
     # Add fixed content.
     output = [COPYRIGHT_TEMPLATE,
               '#define NO_IMPLICIT_ATOMICSTRING\n\n']
 
     # List all includes segmented by if and endif.
     prev_conditional = None
     files_meta_data_this_partition.sort(key=lambda e: e['conditional'])
     for meta_data in files_meta_data_this_partition:
         # FIXME: linking fails (in SVG) if conditionals occur
         # conditional = meta_data['conditional']
         conditional = None
         if prev_conditional != conditional:
             if prev_conditional:
                 output.append('#endif\n')
             if conditional:
                 output.append('\n#if %s\n' % format_conditional(conditional))
         prev_conditional = conditional
 
-        output.append('#include "bindings/V8%s.cpp"\n' % meta_data['name'])
+        output.append('#include "bindings/%s/v8/V8%s.cpp"\n' %
+                      (component_dir, meta_data['name']))
 
     if prev_conditional:
         output.append('#endif\n')
 
     return ''.join(output)
 
 
 def write_content(content, output_file_name):
     parent_path, file_name = os.path.split(output_file_name)
     if not os.path.exists(parent_path):
@@ skipping 12 matching lines @@
     for file_name in cygdrive_names:
         process.stdin.write('%s\n' % file_name)
         process.stdin.flush()
         idl_file_names.append(process.stdout.readline().rstrip())
     process.stdin.close()
     process.wait()
     return idl_file_names
 
 
 def main(args):
-    if len(args) <= 3:
-        raise Exception('Expected at least 4 arguments.')
-    input_file_name = args[1]
+    if len(args) <= 4:
+        raise Exception('Expected at least 5 arguments.')
+    component_dir = args[1]
+    input_file_name = args[2]
     in_out_break_index = args.index('--')
     output_file_names = args[in_out_break_index + 1:]
 
     with open(input_file_name) as input_file:
         file_names = sorted([os.path.realpath(line.rstrip('\n'))
                              for line in input_file])
         idl_file_names = [file_name for file_name in file_names
                           if not file_name.startswith('/cygdrive')]
         cygdrive_names = [file_name for file_name in file_names
                           if file_name.startswith('/cygdrive')]
         idl_file_names.extend(resolve_cygpath(cygdrive_names))
 
     files_meta_data = extract_meta_data(idl_file_names)
     total_partitions = len(output_file_names)
     for partition, file_name in enumerate(output_file_names):
         files_meta_data_this_partition = [
                 meta_data for meta_data in files_meta_data
                 if hash(meta_data['name']) % total_partitions == partition]
-        file_contents = generate_content(files_meta_data_this_partition)
+        file_contents = generate_content(component_dir,
+                                         files_meta_data_this_partition)
         write_content(file_contents, file_name)
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))