Fixes to make scripts generate includes with paths.

Source/core/core.gyp/core_derived_sources.gyp

 #
 # 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.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
   'includes': [
     '../core.gypi',
     '../../bindings/bindings.gypi',
     '../features.gypi',
   ],
 
   'targets': [
     {
       'target_name': 'generate_settings',
       'type': 'none',
+      'dependencies': [
+        '../../bindings/derived_sources.gyp:supplemental_dependencies',
+      ],
       'actions': [
         {
           'action_name': 'Settings',
           'inputs': [
             '../page/make_settings.pl',
             '../page/Settings.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SettingsMacros.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InternalSettingsGenerated.idl',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InternalSettingsGenerated.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InternalSettingsGenerated.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
           ],
           'msvs_cygwin_shell': 1,
         },
       ]
     },
     {
       'target_name': 'make_derived_sources',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'generate_settings',
+        '../../bindings/derived_sources.gyp:supplemental_dependencies',
       ],
       'sources': [
         # bison rule
         '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSGrammar.y',
         '../xml/XPathGrammar.y',
 
         # gperf rule
         '../platform/ColorData.gperf',
       ],
       'actions': [
@@ skipping 140 matching lines @@
               ],
             }],
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'HTMLNames',
           'inputs': [
             '../scripts/Hasher.pm',
             '../scripts/StaticString.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_names.pl',
             '../html/HTMLTagNames.in',
             '../html/HTMLAttributeNames.in',
+            'scripts/action_makenames.py',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/HTMLNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/HTMLNames.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/HTMLElementFactory.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/V8HTMLElementWrapperFactory.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/V8HTMLElementWrapperFactory.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
             '--',
             '--factory',
             '--extraDefines', '<(feature_defines)'
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'WebKitFontFamilyNames',
           'inputs': [
             '../scripts/Hasher.pm',
             '../scripts/StaticString.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_names.pl',
             '../css/WebKitFontFamilyNames.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/WebKitFontFamilyNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/WebKitFontFamilyNames.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
             '--',
             '--fonts',
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'SVGNames',
           'inputs': [
             '../scripts/Hasher.pm',
             '../scripts/StaticString.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_names.pl',
             '../svg/svgtags.in',
             '../svg/svgattrs.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGNames.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGElementFactory.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGElementFactory.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/V8SVGElementWrapperFactory.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/V8SVGElementWrapperFactory.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
             '--',
             '--factory',
             '--extraDefines', '<(feature_defines)'
           ],
           'msvs_cygwin_shell': 1,
         },
         {
@@ skipping 12 matching lines @@
             '../dom/EventNames.in',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/',
           ],
         },
         {
           'action_name': 'EventFactoryHeaders',
           'inputs': [
             '../scripts/InFilesCompiler.pm',
             '../scripts/InFilesParser.pm',
             '../scripts/make_event_factory.pl',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../dom/EventNames.in',
           ],
           'outputs': [
             # FIXME: These files should be generated by make_event_factory.py.
             '<(SHARED_INTERMEDIATE_DIR)/webkit/EventHeaders.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/EventInterfaces.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'EventTargetFactory',
           'inputs': [
             '../scripts/InFilesCompiler.pm',
             '../scripts/InFilesParser.pm',
             '../scripts/make_event_factory.pl',
             '../dom/EventTargetFactory.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/EventTargetHeaders.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/EventTargetInterfaces.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'ExceptionCodeDescription',
           'inputs': [
             '../scripts/InFilesCompiler.pm',
             '../scripts/InFilesParser.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_dom_exceptions.pl',
             '../dom/DOMExceptions.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/ExceptionCodeDescription.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/ExceptionCodeDescription.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/ExceptionHeaders.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/ExceptionInterfaces.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'MathMLNames',
           'inputs': [
             '../scripts/Hasher.pm',
             '../scripts/StaticString.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_names.pl',
             '../mathml/mathtags.in',
             '../mathml/mathattrs.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLNames.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLElementFactory.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLElementFactory.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
             '--',
             '--factory',
             '--extraDefines', '<(feature_defines)'
           ],
           'msvs_cygwin_shell': 1,
         },
         {
@@ skipping 102 matching lines @@
             '--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.h',
             '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.cpp',
             '<@(_inputs)',
           ],
         },
         {
           'action_name': 'XLinkNames',
           'inputs': [
             '../scripts/Hasher.pm',
             '../scripts/StaticString.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_names.pl',
             '../svg/xlinkattrs.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/XLinkNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/XLinkNames.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
             '--',
             '--extraDefines', '<(feature_defines)'
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'XMLNSNames',
           'inputs': [
             '../scripts/Hasher.pm',
             '../scripts/StaticString.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_names.pl',
             '../xml/xmlnsattrs.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLNSNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLNSNames.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
             '--',
             '--extraDefines', '<(feature_defines)'
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'XMLNames',
           'inputs': [
             '../scripts/Hasher.pm',
             '../scripts/StaticString.pm',
+            '../../bindings/scripts/idltopath.pm',
+            '../../bindings/scripts/idltopathgenerator.py',
             '../scripts/make_names.pl',
             '../xml/xmlattrs.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLNames.h',
           ],
           'action': [
             'python',
             'scripts/action_makenames.py',
+            '--idlToPathFile',
+            '<(SHARED_INTERMEDIATE_DIR)/idltopath.tmp',
             '<@(_outputs)',
             '--',
             '<@(_inputs)',
             '--',
             '--extraDefines', '<(feature_defines)'
           ],
           'msvs_cygwin_shell': 1,
         },
         {
           'action_name': 'preprocess_grammar',
@@ skipping 50 matching lines @@
             '../scripts/make-hash-tools.pl',
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
             '<(RULE_INPUT_PATH)',
             '<(gperf_exe)',
           ],
         },
       ],
     },
   ],
 }