Fixes to make scripts generate includes with paths.

Source/core/core.gyp/scripts/action_makenames.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 69 matching lines @@
             # following the final '--'.
             args = []
             sections.append(args)
         else:
             args = args[dashes + 1:]
 
     return sections
 
 
 def main(args):
-    sections = SplitArgsIntoSections(args[1:])
+    if args[1] != "--idlToPathFile" or len(args) < 3:
+        print "FATAL: Missing --idlToPathFile argument: " + str(args)
+        return 1
+    idlToPathFile = args[2]
+    sections = SplitArgsIntoSections(args[3:])
     assert len(sections) == 2 or len(sections) == 3
     (outputs, inputs) = sections[:2]
     if len(sections) == 3:
         options = sections[2]
     else:
         options = []
 
     # Make all output pathnames absolute so that they can be accessed after
     # changing directory.
     for index in xrange(0, len(outputs)):
@@ skipping 23 matching lines @@
             assert tagInput == None
             tagInput = inputAbsPosix
         elif inputBasename.endswith('AttributeNames.in') or inputBasename.endswith('attrs.in'):
             assert attrInput == None
             attrInput = inputAbsPosix
         elif (inputBasename.endswith('EventTargetFactory.in') or inputBasename.endswith('EventNames.in')
             or inputBasename.endswith('DOMExceptions.in') or inputBasename.endswith('Settings.in')):
             eventsInput = inputAbsPosix
         elif inputBasename.endswith('Names.in'):
             options.append(inputAbsPosix)
-        elif inputBasename.endswith('.pm'):
+        elif inputBasename.endswith('.pm') or inputBasename.endswith('.py'):
             continue
         else:
-            assert False
+            assert False, "Unexcepted file type "+ inputeBasename
 
     assert makeNamesInput != None
     assert tagInput != None or attrInput != None or eventsInput != None or ('--fonts' in options)
 
     # scriptsPath is a Perl include directory, located relative to
     # makeNamesInput.
     scriptsPath = os.path.normpath(
         os.path.join(os.path.dirname(makeNamesInput), os.pardir, 'scripts'))
 
+    # bindingsScriptPath is a Perl include directory for some helper libraries make_names.pl uses.
+    bindingsScriptPath = os.path.normpath(
+        os.path.join(os.path.dirname(makeNamesInput), os.pardir, os.pardir, 'bindings', 'scripts'))
+
     # Change to the output directory because make_names.pl puts output in its
     # working directory.
     os.chdir(outputDir)
 
     # Build up the command.
-    command = ['perl', '-I', scriptsPath, makeNamesInput]
+    command = ['perl', '-I', scriptsPath, '-I', bindingsScriptPath, makeNamesInput]
     if tagInput != None:
         command.extend(['--tags', tagInput])
     if attrInput != None:
         command.extend(['--attrs', attrInput])
     if eventsInput != None:
         command.extend(['--input', eventsInput])
+    command.extend(['--idltopathfile', idlToPathFile])
     command.extend(options)
 
     # Do it. check_call is new in 2.5, so simulate its behavior with call and
     # assert.
     returnCode = subprocess.call(command)
     assert returnCode == 0
 
     # Go through the outputs. Any output that belongs in a different directory
     # is moved. Do a copy and delete instead of rename for maximum portability.
     # Note that all paths used in this section are still absolute.
     for output in outputs:
         thisOutputDir = os.path.dirname(output)
         if thisOutputDir != outputDir:
             outputBasename = os.path.basename(output)
             src = os.path.join(outputDir, outputBasename)
             dst = os.path.join(thisOutputDir, outputBasename)
             shutil.copyfile(src, dst)
             os.unlink(src)
 
     return returnCode
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))