Improve GN handling of directory templates.

tools/gn/command_desc.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <set>
 #include <sstream>
 
 #include "base/command_line.h"
 #include "tools/gn/commands.h"
@@ skipping 230 matching lines @@
     OutputString("\n" + header + ":\n");
 
   std::string indent = indent_extra ? "    " : "  ";
 
   Target::FileList sorted = files;
   std::sort(sorted.begin(), sorted.end());
   for (size_t i = 0; i < sorted.size(); i++)
     OutputString(indent + sorted[i].value() + "\n");
 }
 
+// This sorts the list.
+void PrintStringList(const std::vector<std::string>& strings,
+                     const std::string& header,
+                     bool indent_extra,
+                     bool display_header) {
+  if (strings.empty())
+    return;
+
+  if (display_header)
+    OutputString("\n" + header + ":\n");
+
+  std::string indent = indent_extra ? "    " : "  ";
+
+  std::vector<std::string> sorted = strings;
+  std::sort(sorted.begin(), sorted.end());
+  for (size_t i = 0; i < sorted.size(); i++)
+    OutputString(indent + sorted[i] + "\n");
+}
+
 void PrintSources(const Target* target, bool display_header) {
   PrintFileList(target->sources(), "sources", false, display_header);
 }
 
 void PrintInputs(const Target* target, bool display_header) {
   PrintFileList(target->inputs(), "inputs", false, display_header);
 }
 
 void PrintOutputs(const Target* target, bool display_header) {
   if (target->output_type() == Target::ACTION) {
     // Just display the outputs directly.
-    PrintFileList(target->action_values().outputs(), "outputs", false,
-                  display_header);
-  } else if (target->output_type() == Target::ACTION_FOREACH) {
+    PrintStringList(target->action_values().outputs(), "outputs", false,
+                    display_header);
+  } else if (target->output_type() == Target::ACTION_FOREACH ||
+             target->output_type() == Target::COPY_FILES) {
     // Display both the output pattern and resolved list.
     if (display_header)
       OutputString("\noutputs:\n");
 
     // Display the pattern.
     OutputString("  Output pattern:\n");
-    PrintFileList(target->action_values().outputs(), "", true, false);
+    PrintStringList(target->action_values().outputs(), "", true, false);
 
     // Now display what that resolves to given the sources.
     OutputString("\n  Resolved output file list:\n");
 
     std::vector<std::string> output_strings;
     FileTemplate file_template = FileTemplate::GetForTargetOutputs(target);
     for (size_t i = 0; i < target->sources().size(); i++)
       file_template.Apply(target->sources()[i], &output_strings);
-
-    std::sort(output_strings.begin(), output_strings.end());
-    for (size_t i = 0; i < output_strings.size(); i++) {
-      OutputString("    " + output_strings[i] + "\n");
-    }
+    PrintStringList(output_strings, "", true, false);
   }
 }
 
 void PrintScript(const Target* target, bool display_header) {
   if (display_header)
     OutputString("\nscript:\n");
   OutputString("  " + target->action_values().script().value() + "\n");
 }
 
 void PrintArgs(const Target* target, bool display_header) {
@@ skipping 298 matching lines @@
   // so always display them, even for groups and such.
   PrintLibs(target, true);
   PrintLibDirs(target, true);
 
   PrintDeps(target, true);
 
   return 0;
 }
 
 }  // namespace commands