DevTools: Simplify debug and release mode builds

third_party/WebKit/Source/devtools/BUILD.gn

Index: third_party/WebKit/Source/devtools/BUILD.gn
diff --git a/third_party/WebKit/Source/devtools/BUILD.gn b/third_party/WebKit/Source/devtools/BUILD.gn
index e5fe01a416819c2f172626d8aa7cf1ea6ceca902..3ce640ec133d04b86e90c88bc9f1cdfe652bd00a 100644
--- a/third_party/WebKit/Source/devtools/BUILD.gn
+++ b/third_party/WebKit/Source/devtools/BUILD.gn
@@ -1036,7 +1036,7 @@ action("frontend_protocol_sources") {
 }
 
 action("build_release_devtools") {
-  script = "scripts/build_applications.py"
+  script = "scripts/build_release_applications.py"
 
   deps = [
     ":frontend_protocol_sources",
@@ -1045,7 +1045,6 @@ action("build_release_devtools") {
 
   helper_scripts = [
     "scripts/modular_build.py",
-    "scripts/concatenate_application_code.py",
     "scripts/rjsmin.py",
   ]
 
@@ -1078,10 +1077,10 @@ if (debug_devtools) {
   resources_out_debug_dir = "$root_out_dir/resources/inspector/debug"
 
   action("build_debug_devtools") {
-    script = "scripts/build_applications.py"
+    script = "scripts/build_debug_applications.py"
 
     deps = [
-      ":copy_debug_files",
+      ":copy_generated_scripts",
     ]
 
     inputs = all_devtools_files + [
@@ -1111,38 +1110,6 @@ if (debug_devtools) {
     ]
   }
 
-  group("copy_debug_files") {
-    public_deps = [
-      ":copy_acorn_js_files",
-      ":copy_codemirror_files",
-      ":copy_emulated_devices_images_debug",
-      ":copy_generated_scripts",
-      ":copy_inspector_images_debug",
-      ":copy_runtime_core",
-    ]
-  }
-
-  copy("copy_runtime_core") {

[pfeldman, 2016/09/14 00:22:15]

Where did these go?

[chenwilliam, 2016/09/14 01:07:53]

In the DebugBuilder, rather than parsing through the list of modules in the
application json to copy/symlink them, I iterate through all the files and
folders in front_end and symlink/copy them. This way we don't need to manually
specify these non-module files to copy in gn, but we still get all the files we
need for debug mode.

-    sources = devtools_core_base_files
-    outputs = [
-      "$resources_out_debug_dir/{{source_file_part}}",
-    ]
-  }
-
-  copy("copy_acorn_js_files") {
-    sources = devtools_acorn_files
-    outputs = [
-      "$resources_out_debug_dir/acorn/{{source_file_part}}",
-    ]
-  }
-
-  copy("copy_codemirror_files") {
-    sources = devtools_cm_js_files + devtools_cm_css_files
-    outputs = [
-      "$resources_out_debug_dir/cm/{{source_file_part}}",
-    ]
-  }
-
   copy("copy_generated_scripts") {
     deps = [
       ":frontend_protocol_sources",
@@ -1153,17 +1120,4 @@ if (debug_devtools) {
       "$resources_out_debug_dir/{{source_file_part}}",
     ]
   }
-  copy("copy_inspector_images_debug") {
-    sources = devtools_image_files
-    outputs = [
-      "$resources_out_debug_dir/Images/{{source_file_part}}",
-    ]
-  }
-
-  copy("copy_emulated_devices_images_debug") {
-    sources = devtools_emulated_devices_images
-    outputs = [
-      "$resources_out_debug_dir/emulated_devices/{{source_file_part}}",
-    ]
-  }
 }