Move IDLs to 39 roll

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 33 matching lines @@
 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
-import subprocess
 import sys
 
-from utilities import idl_filename_to_interface_name
+from utilities import idl_filename_to_interface_name, read_idl_files_list_from_file
 
 # A regexp for finding Conditional attributes in interface definitions.
 CONDITIONAL_PATTERN = re.compile(
     r'\['
     r'[^\]]*'
-    r'Conditional=([\_0-9a-zA-Z&|]*)'
+    r'Conditional=([\_0-9a-zA-Z]*)'
     r'[^\]]*'
     r'\]\s*'
     r'((callback|partial)\s+)?'
     r'interface\s+'
     r'\w+\s*'
     r'(:\s*\w+\s*)?'
     r'{',
     re.MULTILINE)
 
 COPYRIGHT_TEMPLATE = """/*
@@ skipping 20 matching lines @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 """
 
 
-def format_conditional(conditional):
-    """Wraps conditional with ENABLE() and replace '&','|' with '&&','||' if
-    more than one conditional is specified."""
-    def wrap_with_enable(s):
-        if s in ['|', '&']:
-            return s * 2
-        return 'ENABLE(' + s + ')'
-    return ' '.join(map(wrap_with_enable, conditional))
-
-
 def extract_conditional(idl_file_path):
     """Find [Conditional] interface extended attribute."""
     with open(idl_file_path) as idl_file:
         idl_contents = idl_file.read()
 
     match = CONDITIONAL_PATTERN.search(idl_contents)
     if not match:
         return None
-    conditional = match.group(1)
-    return re.split('([|,])', conditional)
+    return match.group(1)
 
 
 def extract_meta_data(file_paths):
     """Extracts conditional and interface name from each IDL file."""
     meta_data_list = []
 
     for file_path in file_paths:
         if not file_path.endswith('.idl'):
             print 'WARNING: non-IDL file passed: "%s"' % file_path
             continue
@@ skipping 20 matching lines @@
 
     # 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:
         conditional = meta_data['conditional']
         if prev_conditional != conditional:
             if prev_conditional:
                 output.append('#endif\n')
             if conditional:
-                output.append('\n#if %s\n' % format_conditional(conditional))
+                output.append('\n#if ENABLE(%s)\n' % conditional)
         prev_conditional = conditional
 
         output.append('#include "bindings/%s/%s/%s%s.cpp"\n' %
                       (component_dir, prefix.lower(), prefix, 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):
         print 'Creating directory: %s' % parent_path
         os.makedirs(parent_path)
     with open(output_file_name, 'w') as f:
         f.write(content)
 
 
-def resolve_cygpath(cygdrive_names):
-    if not cygdrive_names:
-        return []
-    cmd = ['cygpath', '-f', '-', '-wa']
-    process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    idl_file_names = []
-    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) <= 4:
         raise Exception('Expected at least 5 arguments.')
     if (args[1] == '--dart'):
         component_dir = args[2]
         input_file_name = args[3]
         prefix = 'Dart'
     else:
         component_dir = args[1]
         input_file_name = args[2]
         prefix = 'V8'
     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))
-
+    idl_file_names = read_idl_files_list_from_file(input_file_name)
     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(component_dir,
                                          files_meta_data_this_partition,
                                          prefix)
         write_content(file_contents, file_name)
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))