DevTools: Fix content_shell devtools built in debug_devtools=1 mode

Source/devtools/scripts/generate_devtools_grd.py

 #!/usr/bin/env python
 #
 # Copyright (C) 2011 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 40 matching lines @@
     <output filename="devtools_resources.pak" type="data_package" />
   </outputs>
   <release seq="1">
     <includes></includes>
   </release>
 </grit>
 '''
 
 
 class ParsedArgs:
-    def __init__(self, source_files, relative_path_dir, image_dirs, output_filename):
+    def __init__(self, source_files, relative_path_dirs, image_dirs, output_filename):
         self.source_files = source_files
-        self.relative_path_dir = relative_path_dir
+        self.relative_path_dirs = relative_path_dirs
         self.image_dirs = image_dirs
         self.output_filename = output_filename
 
 
 def parse_args(argv):
-    relative_path_dir_position = argv.index('--relative_path_dir')
+    relative_path_dirs_position = argv.index('--relative_path_dirs')
     images_position = argv.index('--images')
     output_position = argv.index('--output')
-    source_files = argv[:relative_path_dir_position]
-    relative_path_dir = argv[relative_path_dir_position + 1]
+    source_files = argv[:relative_path_dirs_position]
+    relative_path_dirs = argv[relative_path_dirs_position + 1:images_position]
     image_dirs = argv[images_position + 1:output_position]
-    return ParsedArgs(source_files, relative_path_dir, image_dirs, argv[output_position + 1])
+    return ParsedArgs(source_files, relative_path_dirs, image_dirs, argv[output_position + 1])
 
 
 def make_name_from_filename(filename):
     return (filename.replace('/', '_')
                     .replace('\\', '_')
+                    .replace('-', '_')
                     .replace('.', '_')).upper()
 
 
 def add_file_to_grd(grd_doc, relative_filename):
     includes_node = grd_doc.getElementsByTagName('includes')[0]
     includes_node.appendChild(grd_doc.createTextNode('\n      '))
 
     new_include_node = grd_doc.createElement('include')
     new_include_node.setAttribute('name', make_name_from_filename(relative_filename))
     new_include_node.setAttribute('file', relative_filename)
     new_include_node.setAttribute('type', 'BINDATA')
     includes_node.appendChild(new_include_node)
 
 
-def build_relative_filename(relative_path_dir, filename):
-    if relative_path_dir:
+def build_relative_filename(relative_path_dirs, filename):
+    for relative_path_dir in relative_path_dirs:
         index = filename.find(relative_path_dir)
         if index == 0:
             return filename[len(relative_path_dir) + 1:]
-        return os.path.basename(filename)
-    return filename
+    return os.path.basename(filename)
 
 
 def main(argv):
     parsed_args = parse_args(argv[1:])
 
     doc = minidom.parseString(kGrdTemplate)
     output_directory = os.path.dirname(parsed_args.output_filename)
 
     try:
         os.makedirs(os.path.join(output_directory, 'Images'))
     except OSError, e:
         if e.errno != errno.EEXIST:
             raise e
 
     for filename in parsed_args.source_files:
-        relative_filename = build_relative_filename(parsed_args.relative_path_dir, filename)
+        relative_filename = build_relative_filename(parsed_args.relative_path_dirs, filename)
         target_dir = os.path.join(output_directory, os.path.dirname(relative_filename))
         if not os.path.exists(target_dir):
             os.makedirs(target_dir)
         shutil.copy(filename, target_dir)
         add_file_to_grd(doc, relative_filename)
 
     for dirname in parsed_args.image_dirs:
         for filename in os.listdir(dirname):
             if not filename.endswith('.png') and not filename.endswith('.gif'):
                 continue
             shutil.copy(os.path.join(dirname, filename),
                         os.path.join(output_directory, 'Images'))
             add_file_to_grd(doc, os.path.join('Images', filename))
 
     with open(parsed_args.output_filename, 'w') as output_file:
         output_file.write(doc.toxml(encoding='UTF-8'))
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))