DevTools: Refactor build script to copy module files in debug_devtools mode

Source/devtools/BUILD.gn

Index: Source/devtools/BUILD.gn
diff --git a/Source/devtools/BUILD.gn b/Source/devtools/BUILD.gn
index 8e4673a266606f129d52a68069d69f7308272ead..8198838c9d4a556f5317a2cd49f51ebea00ef160 100644
--- a/Source/devtools/BUILD.gn
+++ b/Source/devtools/BUILD.gn
@@ -12,9 +12,14 @@ gypi_values = exec_script(
 
 # Some of the files in the .gypi use GYP variable expansions, go through and
 # fix them.
+devtools_core_base_non_generated_files =
+  gypi_values.devtools_core_base_non_generated_files - [
+    "<@(devtools_standalone_files)",
+  ] + gypi_values.devtools_standalone_files
+
 devtools_core_base_files = gypi_values.devtools_core_base_files - [
-  "<@(devtools_standalone_files)",
-] + gypi_values.devtools_standalone_files
+  "<@(devtools_core_base_non_generated_files)",
+] + devtools_core_base_non_generated_files
 
 devtools_core_files =
   devtools_core_base_files +
@@ -77,8 +82,6 @@ visibility = [ "//third_party/WebKit/*" ]
 
 group("devtools_frontend_resources") {
   deps = [
-    ":devtools_html",
-    ":toolbox_html",
     ":copy_inspector_images",
     ":copy_standalone_css",
     ":devtools_extension_api",
@@ -167,35 +170,6 @@ action("generate_devtools_grd") {
   ]
 }
 
-template("generate_app_html") {
-  assert(defined(invoker.app_name), target_name)
-  app_name = invoker.app_name
-
-  action(target_name) {
-    script = "scripts/generate_devtools_html.py"
-
-    inputs = [ "front_end/" + app_name + ".html"]
-    outputs = [ resources_out_dir + app_name + ".html" ]
-
-    args = rebase_path(inputs, root_build_dir) +
-      rebase_path(outputs, root_build_dir)
-
-    if (debug_devtools) {
-      args += [ "1" ]
-    } else {
-      args += [ "0" ]
-    }
-  }
-}
-
-generate_app_html("devtools_html") {
-  app_name = "devtools"
-}
-
-generate_app_html("toolbox_html") {
-  app_name = "toolbox"
-}
-
 action("devtools_extension_api") {
   script = "scripts/generate_devtools_extension_api.py"
 
@@ -229,62 +203,62 @@ action("frontend_protocol_sources") {
   ]
 }
 
-group("build_applications") {
-  if (!debug_devtools) {
-    # Release: concatenate application code. This overwrites
-    # application-specific scripts (devtools.js), and thus should be guarded.
-    action("build_applications_release") {
-      script = "scripts/build_applications.py"
-      helper_scripts = [
-        "scripts/modular_build.py",
-        "scripts/concatenate_application_code.py",
-      ]
-
-      inputs = helper_scripts + all_devtools_files + generated_scripts
-
-      outputs = [
-        resources_out_dir + "devtools.js",
-        resources_out_dir + "toolbox.js",
-        resources_out_dir + "audits_module.js",
-        resources_out_dir + "console_module.js",
-        resources_out_dir + "devices_module.js",
-        resources_out_dir + "documentation_module.js",
-        resources_out_dir + "elements_module.js",
-        resources_out_dir + "extensions_module.js",
-        resources_out_dir + "heap_snapshot_worker_module.js",
-        resources_out_dir + "layers_module.js",
-        resources_out_dir + "network_module.js",
-        resources_out_dir + "profiler_module.js",
-        resources_out_dir + "promises_module.js",
-        resources_out_dir + "resources_module.js",
-        resources_out_dir + "script_formatter_worker_module.js",
-        resources_out_dir + "settings_module.js",
-        resources_out_dir + "source_frame_module.js",
-        resources_out_dir + "sources_module.js",
-        resources_out_dir + "temp_storage_shared_worker_module.js",
-        resources_out_dir + "timeline_module.js",
-      ]
-
-      args = [
-        "devtools", "toolbox",
-        "--input_path", rebase_path("front_end", root_build_dir),
-        "--output_path", rebase_path(resources_out_dir, root_build_dir),
-        "--debug", "0"
-      ]
-
-      deps = [
-        ":supported_css_properties",
-        ":frontend_protocol_sources",
-      ]
-    }
-    deps = [
-      ":build_applications_release"
-    ]
+action("build_applications") {
+  script = "scripts/build_applications.py"
+  helper_scripts = [
+    "scripts/modular_build.py",
+    "scripts/concatenate_application_code.py",
+  ]
+
+  inputs = helper_scripts + all_devtools_files + generated_scripts
+
+  outputs = [
+    resources_out_dir + "devtools.js",
+    resources_out_dir + "devtools.html",
+    resources_out_dir + "toolbox.js",
+    resources_out_dir + "toolbox.html",
+  ]
+
+  if (debug_devtools) {
+    deps = [ ":copy_debug_non_modules" ]
+
+    debug_mode = "1"
   } else {
+    outputs += [
+      resources_out_dir + "audits_module.js",
+      resources_out_dir + "console_module.js",
+      resources_out_dir + "devices_module.js",
+      resources_out_dir + "documentation_module.js",
+      resources_out_dir + "elements_module.js",
+      resources_out_dir + "extensions_module.js",
+      resources_out_dir + "heap_snapshot_worker_module.js",
+      resources_out_dir + "layers_module.js",
+      resources_out_dir + "network_module.js",
+      resources_out_dir + "profiler_module.js",
+      resources_out_dir + "promises_module.js",
+      resources_out_dir + "resources_module.js",
+      resources_out_dir + "script_formatter_worker_module.js",
+      resources_out_dir + "settings_module.js",
+      resources_out_dir + "source_frame_module.js",
+      resources_out_dir + "sources_module.js",
+      resources_out_dir + "temp_storage_shared_worker_module.js",
+      resources_out_dir + "timeline_module.js",
+    ]
+
     deps = [
-      ":copy_debug_modules"
+      ":supported_css_properties",
+      ":frontend_protocol_sources",
     ]
+
+    debug_mode = "0"
   }
+
+  args = [
+    "devtools", "toolbox",
+    "--input_path", rebase_path("front_end", root_build_dir),
+    "--output_path", rebase_path(resources_out_dir, root_build_dir),
+    "--debug", debug_mode
+  ]
 }
 
 copy("copy_codemirror_css") {
@@ -300,233 +274,29 @@ copy("copy_standalone_css") {
 }
 
 if (debug_devtools) {
-  # Debug: copy front-end into resources_out_dir as-is.
-  group("copy_debug_modules") {
-    deps = [
-      ":copy_audits_module",
-      ":copy_bindings_module",
-      ":copy_common_module",
-      ":copy_components_module",
-      ":copy_console_module",
-      ":copy_devices_module",
-      ":copy_documentation_module",
-      ":copy_elements_module",
-      ":copy_extensions_module",
-      ":copy_heap_snapshot_worker_module",
-      ":copy_host_module",
-      ":copy_layers_module",
-      ":copy_main_module",
-      ":copy_network_module",
-      ":copy_profiler_module",
-      ":copy_promises_module",
-      ":copy_resources_module",
-      ":copy_screencast_module",
-      ":copy_script_formatter_worker_module",
-      ":copy_sdk_module",
-      ":copy_settings_module",
-      ":copy_source_frame_module",
-      ":copy_sources_module",
-      ":copy_temp_storage_shared_worker_module",
-      ":copy_timeline_module",
-      ":copy_toolbox_module",
-      ":copy_toolbox_bootstrap_module",
-      ":copy_ui_module",
-      ":copy_workspace_module",
-    ]
-
-    copy("copy_runtime_core") {
-      sources = devtools_core_base_files -
-        gypi_values.devtools_standalone_files
-      outputs = [ resources_out_dir + "/{{source_file_part}}" ]
-    }
-    deps += [ ":copy_runtime_core" ]
-  }
-
-  # Copies module contents into resources_out_dir in debug_devtools=1 builds.
-  #  module_name: (String) The JS module name to process.
-  #  imported_files: (List of strings) The list of files the input depends on.
-  template("copy_debug_module") {
-    assert(defined(invoker.module_name), target_name)
-    assert(defined(invoker.imported_files), target_name)
-
-    imported_files = invoker.imported_files
-    module_name = invoker.module_name
-    module_json = "front_end/" + module_name + "/module.json"
-
-    copy(target_name) {
-      sources = [ module_json ] + imported_files
-      outputs = [ resources_out_dir + module_name + "/{{source_file_part}}" ]
-    }
-  }
-
-  copy_debug_module("copy_audits_module") {
-    module_name = "audits"
-    imported_files = gypi_values.devtools_audits_js_files
-  }
-
-  copy_debug_module("copy_bindings_module") {
-    module_name = "bindings"
-    imported_files = gypi_values.devtools_bindings_js_files
-  }
-
-  copy_debug_module("copy_common_module") {
-    module_name = "common"
-    imported_files = gypi_values.devtools_common_js_files
-  }
-
-  copy_debug_module("copy_components_module") {
-    module_name = "components"
-    imported_files = gypi_values.devtools_components_js_files
-  }
-
-  copy_debug_module("copy_console_module") {
-    module_name = "console"
-    imported_files = gypi_values.devtools_console_js_files
-  }
-
-  copy_debug_module("copy_devices_module") {
-    module_name = "devices"
-    imported_files = gypi_values.devtools_devices_js_files
-  }
-
-  copy_debug_module("copy_documentation_module") {
-    module_name = "documentation"
-    imported_files = gypi_values.devtools_documentation_js_files
-  }
-
-  copy_debug_module("copy_elements_module") {
-    module_name = "elements"
-    imported_files = gypi_values.devtools_elements_js_files
-  }
-
-  copy_debug_module("copy_extensions_module") {
-    module_name = "extensions"
-    imported_files = devtools_extensions_js_files
-  }
-
-  copy_debug_module("copy_heap_snapshot_worker_module") {
-    module_name = "heap_snapshot_worker"
-    imported_files = gypi_values.devtools_heap_snapshot_worker_js_files
-  }
-
-  copy_debug_module("copy_host_module") {
-    module_name = "host"
-    imported_files = gypi_values.devtools_host_js_files
-  }
-
-  copy_debug_module("copy_layers_module") {
-    module_name = "layers"
-    imported_files = gypi_values.devtools_layers_js_files
-  }
-
-  copy_debug_module("copy_main_module") {
-    module_name = "main"
-    imported_files = gypi_values.devtools_main_js_files
-  }
-
-  copy_debug_module("copy_network_module") {
-    module_name = "network"
-    imported_files = gypi_values.devtools_network_js_files
-  }
-
-  copy_debug_module("copy_profiler_module") {
-    module_name = "profiler"
-    imported_files = gypi_values.devtools_profiler_js_files
-  }
-
-  copy_debug_module("copy_promises_module") {
-    module_name = "promises"
-    imported_files = gypi_values.devtools_promises_js_files
-  }
-
-  copy_debug_module("copy_resources_module") {
-    module_name = "resources"
-    imported_files = gypi_values.devtools_resources_js_files
-  }
-
-  copy_debug_module("copy_screencast_module") {
-    module_name = "screencast"
-    imported_files = gypi_values.devtools_screencast_js_files
-  }
-
-  group("copy_script_formatter_worker_module") {
-    copy_debug_module("copy_script_formatter_worker_module_base") {
-      module_name = "script_formatter_worker"
-      imported_files = gypi_values.devtools_uglify_files +
-        gypi_values.devtools_script_formatter_worker_js_files
-    }
-
-    copy("copy_uglify_js_files") {
-      sources = gypi_values.devtools_uglify_files
-      outputs = [ resources_out_dir + "UglifyJS/{{source_file_part}}" ]
-    }
-
+  # Debug: copy non-module directories and core into resources_out_dir as-is.
+  group("copy_debug_non_modules") {
     deps = [
-      ":copy_script_formatter_worker_module_base",
-      ":copy_uglify_js_files"
-    ]
-  }
-
-  copy_debug_module("copy_sdk_module") {
-    module_name = "sdk"
-    imported_files = gypi_values.devtools_sdk_js_files
-  }
-
-  copy_debug_module("copy_settings_module") {
-    module_name = "settings"
-    imported_files = gypi_values.devtools_settings_js_files
-  }
-
-  group("copy_source_frame_module") {
-    copy_debug_module("copy_source_frame_module_base") {
-      module_name = "source_frame"
-      imported_files = gypi_values.devtools_source_frame_js_files
-    }
-
-    copy("copy_codemirror_js_files") {
-      sources = gypi_values.devtools_cm_js_files
-      outputs = [ resources_out_dir + "cm/{{source_file_part}}" ]
-    }
-
-    deps = [
-      ":copy_source_frame_module_base",
+      ":copy_runtime_core",
+      ":copy_uglify_js_files",
       ":copy_codemirror_js_files",
     ]
   }
 
-  copy_debug_module("copy_sources_module") {
-    module_name = "sources"
-    imported_files = gypi_values.devtools_sources_js_files
-  }
-
-  copy_debug_module("copy_temp_storage_shared_worker_module") {
-    module_name = "temp_storage_shared_worker"
-    imported_files = gypi_values.devtools_temp_storage_shared_worker_js_files
-  }
-
-  copy_debug_module("copy_timeline_module") {
-    module_name = "timeline"
-    imported_files = gypi_values.devtools_timeline_js_files
-  }
-
-  copy_debug_module("copy_toolbox_module") {
-    module_name = "toolbox"
-    imported_files = gypi_values.devtools_toolbox_js_files
-  }
-
-  copy_debug_module("copy_toolbox_bootstrap_module") {
-    module_name = "toolbox_bootstrap"
-    imported_files = gypi_values.devtools_toolbox_bootstrap_js_files
+  copy("copy_runtime_core") {
+    sources = devtools_core_base_non_generated_files -
+      gypi_values.devtools_standalone_files
+    outputs = [ resources_out_dir + "/{{source_file_part}}" ]
   }
 
-  copy_debug_module("copy_ui_module") {
-    module_name = "ui"
-    imported_files = gypi_values.devtools_ui_js_files
+  copy("copy_uglify_js_files") {
+    sources = gypi_values.devtools_uglify_files
+    outputs = [ resources_out_dir + "UglifyJS/{{source_file_part}}" ]
   }
 
-  copy_debug_module("copy_workspace_module") {
-    module_name = "workspace"
-    imported_files = gypi_values.devtools_workspace_js_files
+  copy("copy_codemirror_js_files") {
+    sources = gypi_values.devtools_cm_js_files
+    outputs = [ resources_out_dir + "cm/{{source_file_part}}" ]
   }
 }
 
@@ -540,7 +310,7 @@ if (!debug_devtools) {
       script = "scripts/concatenate_css_files.py"
 
       input_stylesheet = "front_end/" + app_name + ".css"
-      inputs = [ input_stylesheet ] + devtools_core_base_files
+      inputs = [ input_stylesheet ] + devtools_core_base_non_generated_files
 
       outputs = [ resources_out_dir + app_name + ".css" ]