Revert of DevTools: Avoid build errors when dynamic module and application names clash

Source/devtools/devtools.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 113 matching lines @@
                             '<(PRODUCT_DIR)/resources/inspector',
                             'front_end'
                         ],
                         'input_pages': [
                             '<(PRODUCT_DIR)/resources/inspector/devtools.css',
                             '<(PRODUCT_DIR)/resources/inspector/devtools.html',
                             '<(PRODUCT_DIR)/resources/inspector/devtools.js',
                             '<(PRODUCT_DIR)/resources/inspector/toolbox.css',
                             '<(PRODUCT_DIR)/resources/inspector/toolbox.html',
                             '<(PRODUCT_DIR)/resources/inspector/toolbox.js',
-                            '<(PRODUCT_DIR)/resources/inspector/audits_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/console_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/devices_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/documentation_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/elements_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/extensions_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/layers_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/network_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/profiler_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/promises_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/resources_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/script_formatter_worker_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/settings_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/source_frame_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/sources_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker_module.js',
-                            '<(PRODUCT_DIR)/resources/inspector/timeline_module.js',
+                            '<(PRODUCT_DIR)/resources/inspector/audits.js',
+                            '<(PRODUCT_DIR)/resources/inspector/console.js',
+                            '<(PRODUCT_DIR)/resources/inspector/devices.js',
+                            '<(PRODUCT_DIR)/resources/inspector/documentation.js',
+                            '<(PRODUCT_DIR)/resources/inspector/elements.js',
+                            '<(PRODUCT_DIR)/resources/inspector/extensions.js',
+                            '<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker.js',
+                            '<(PRODUCT_DIR)/resources/inspector/layers.js',
+                            '<(PRODUCT_DIR)/resources/inspector/network.js',
+                            '<(PRODUCT_DIR)/resources/inspector/profiler.js',
+                            '<(PRODUCT_DIR)/resources/inspector/promises.js',
+                            '<(PRODUCT_DIR)/resources/inspector/resources.js',
+                            '<(PRODUCT_DIR)/resources/inspector/script_formatter_worker.js',
+                            '<(PRODUCT_DIR)/resources/inspector/settings.js',
+                            '<(PRODUCT_DIR)/resources/inspector/source_frame.js',
+                            '<(PRODUCT_DIR)/resources/inspector/sources.js',
+                            '<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker.js',
+                            '<(PRODUCT_DIR)/resources/inspector/timeline.js',
                             '<(PRODUCT_DIR)/resources/inspector/devtools_extension_api.js',
                             '<@(devtools_standalone_files)',
                             '<@(devtools_cm_css_files)',
                         ],
                         'images': [
                             '<@(devtools_image_files)',
                         ],
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_pages)',
@@ skipping 263 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_audits_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/audits/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_audits_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/audits_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/audits.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/audits',
                             'files': [
                                 '<@(devtools_audits_js_files)',
                                 'front_end/audits/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_console_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/console/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_console_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/console_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/console.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/console',
                             'files': [
                                 '<@(devtools_console_js_files)',
                                 'front_end/console/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_devices_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/devices/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_devices_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/devices_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/devices.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/devices',
                             'files': [
                                 '<@(devtools_devices_js_files)',
                                 'front_end/devices/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_documentation_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/documentation/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_documentation_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/documentation_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/documentation.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/documentation',
                             'files': [
                                 '<@(devtools_documentation_js_files)',
                                 'front_end/documentation/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_elements_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/elements/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_elements_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/elements_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/elements.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/elements',
                             'files': [
                                 '<@(devtools_elements_js_files)',
                                 'front_end/elements/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_extensions_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/extensions/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_extensions_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/extensions_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/extensions.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/extensions',
                             'files': [
                                 '<@(devtools_extensions_js_files)',
                                 'front_end/extensions/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_heap_snapshot_worker_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/heap_snapshot_worker/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_heap_snapshot_worker_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker',
                             'files': [
                                 '<@(devtools_heap_snapshot_worker_js_files)',
                                 'front_end/heap_snapshot_worker/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_layers_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/layers/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_layers_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/layers_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/layers.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/layers',
                             'files': [
                                 '<@(devtools_layers_js_files)',
                                 'front_end/layers/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_network_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/network/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_network_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/network_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/network.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/network',
                             'files': [
                                 '<@(devtools_network_js_files)',
                                 'front_end/network/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_profiler_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/profiler/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_profiler_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/profiler_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/profiler.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/profiler',
                             'files': [
                                 '<@(devtools_profiler_js_files)',
                                 'front_end/profiler/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_promises_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/promises/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_promises_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/promises_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/promises.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/promises',
                             'files': [
                                 '<@(devtools_promises_js_files)',
                                 'front_end/promises/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_resources_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/resources/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_resources_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/resources_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/resources.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/resources',
                             'files': [
                                 '<@(devtools_resources_js_files)',
                                 'front_end/resources/module.json',
@@ skipping 11 matching lines @@
                     'actions': [{
                         'action_name': 'build_script_formatter_worker_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/script_formatter_worker/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_script_formatter_worker_js_files)',
                             '<@(devtools_uglify_files)'
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/script_formatter_worker_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/script_formatter_worker.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/script_formatter_worker',
                             'files': [
                                 # FIXME: This will excessively copy files from common/ and cm/ folders into worker folder, which is fine for the debug mode.
                                 '<@(devtools_script_formatter_worker_js_files)',
@@ skipping 17 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_settings_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/settings/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_settings_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/settings_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/settings.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/settings',
                             'files': [
                                 '<@(devtools_settings_js_files)',
                                 'front_end/settings/module.json',
@@ skipping 11 matching lines @@
                     'actions': [{
                         'action_name': 'build_source_frame_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/source_frame/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_source_frame_js_files)',
                             '<@(devtools_cm_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/source_frame_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/source_frame.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/cm',
                             'files': [
                                 '<@(devtools_cm_css_files)',
                             ],
                         }
                     ],
@@ skipping 25 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_sources_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/sources/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_sources_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/sources_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/sources.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/sources',
                             'files': [
                                 '<@(devtools_sources_js_files)',
                                 'front_end/sources/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_temp_storage_shared_worker_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/temp_storage_shared_worker/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_temp_storage_shared_worker_js_files)'
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker',
                             'files': [
                                 '<@(devtools_temp_storage_shared_worker_js_files)',
                                 'front_end/temp_storage_shared_worker/module.json',
@@ skipping 10 matching lines @@
                 ['debug_devtools==0', { # Release
                     'actions': [{
                         'action_name': 'build_timeline_module',
                         'script_name': 'scripts/concatenate_module_scripts.py',
                         'input_file': 'front_end/timeline/module.json',
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
                             '<@(devtools_timeline_js_files)',
                         ],
-                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/timeline_module.js'],
+                        'outputs': ['<(PRODUCT_DIR)/resources/inspector/timeline.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
                 },
                 { # Debug
                     'copies': [
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/timeline',
                             'files': [
                                 '<@(devtools_timeline_js_files)',
                                 'front_end/timeline/module.json',
@@ skipping 60 matching lines @@
                             '<@(devtools_module_json_files)',
                         ],
                         'outputs': ['<(PRODUCT_DIR)/resources/inspector/Runtime.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)', '<@(devtools_module_json_files)'],
                     }],
                 },
             ],
         }],
     ], # conditions
 }