IDL compiler: Move include path handling to compute_dependencies

Source/bindings/scripts/compute_dependencies.py

 #!/usr/bin/python
 #
 # Copyright (C) 2013 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 17 matching lines @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import optparse
 import os
 import cPickle as pickle
 import posixpath
 import re
 import string
 
+module_path, _ = os.path.split(__file__)
+source_path = os.path.normpath(os.path.join(module_path, os.pardir, os.pardir))
+
 
 class IdlBadFilenameError(Exception):
     """Raised if an IDL filename disagrees with the interface name in the file."""
     pass
 
 
 class IdlInterfaceFileNotFoundError(Exception):
     """Raised if the IDL file implementing an interface cannot be found."""
     pass
 
@@ skipping 181 matching lines @@
               for constructor_attribute in sorted(constructor_attributes_list)] +
              ['};\n'])
     write_file(lines, destination_filename, only_if_changed)
 
 
 def generate_dependencies(idl_file_name, interfaces_info, partial_interface_files):
     interface_name, _ = os.path.splitext(os.path.basename(idl_file_name))
     full_path = os.path.realpath(idl_file_name)
     idl_file_contents = get_file_contents(full_path)
 
+    extended_attributes = get_interface_extended_attributes_from_idl(idl_file_contents)
+    implemented_as = extended_attributes.get('ImplementedAs')
+
+    # Relative path to header file, used in includes
+    relative_path_local = os.path.relpath(idl_file_name, source_path)
+    relative_dir_local = os.path.dirname(relative_path_local)
+    posix_dir = relative_dir_local.replace(os.path.sep, posixpath.sep)
+    cpp_class_name = implemented_as or interface_name
+    include_path = os.path.join(posix_dir, cpp_class_name + '.h')
+
     # Handle partial interfaces
     partial_interface_name = get_partial_interface_name_from_idl(idl_file_contents)
     if partial_interface_name:
         partial_interface_files.setdefault(partial_interface_name, []).append(full_path)
         return partial_interface_name
 
     # Non-partial interfaces default to having bindings generated,
     # but are removed later if they are implemented by another interface
     interfaces_info[interface_name] = {
         'full_path': full_path,
+        'include_path': include_path,
         'implements_interfaces': get_implemented_interfaces_from_idl(idl_file_contents, interface_name),
         'is_callback_interface': is_callback_interface_from_idl(idl_file_contents),
     }
-    extended_attributes = get_interface_extended_attributes_from_idl(idl_file_contents)
-    if 'ImplementedAs' in extended_attributes:
-        interfaces_info[interface_name]['implemented_as'] = extended_attributes['ImplementedAs']
+    if implemented_as:
+        interfaces_info[interface_name]['implemented_as'] = implemented_as
 
     return None
 
 
 def remove_interfaces_implemented_somewhere(interfaces_info):
     # Interfaces that are implemented by another interface do not have
     # their own bindings generated, as this would be redundant with the
     # actual implementation.
     implemented_somewhere = set().union(*[
         interface_info['implements_interfaces']
@@ skipping 162 matching lines @@
     write_pickle_file(options.interfaces_info_file, interfaces_info, only_if_changed)
     write_bindings_derived_sources_file(options.bindings_derived_sources_file, bindings_derived_sources, only_if_changed)
     for interface_name, filename in global_constructors_filenames.iteritems():
         if interface_name in interfaces_info:
             generate_global_constructors_partial_interface(interface_name, filename, global_constructors[interface_name], only_if_changed)
     generate_event_names_file(options.event_names_file, event_names, interfaces_info, interface_extended_attributes, only_if_changed)
 
 
 if __name__ == '__main__':
     main()