GN threading refactor

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"
 #include "tools/gn/config.h"
 #include "tools/gn/config_values_extractors.h"
+#include "tools/gn/filesystem_utils.h"
 #include "tools/gn/item.h"
-#include "tools/gn/item_node.h"
 #include "tools/gn/label.h"
 #include "tools/gn/setup.h"
 #include "tools/gn/standard_out.h"
 #include "tools/gn/target.h"
 
 namespace commands {
 
 namespace {
 
+// Prints the given directory in a nice way for the user to view.
+std::string FormatSourceDir(const SourceDir& dir) {
+#if defined(OS_WIN)
+  // On Windows we fix up system absolute paths to look like native ones.
+  // Internally, they'll look like "/C:\foo\bar/"
+  if (dir.is_system_absolute()) {
+    std::string buf = dir.value();
+    if (buf.size() > 3 && buf[2] == ':') {
+      buf.erase(buf.begin());  // Erase beginning slash.
+      ConvertPathToSystem(&buf);  // Convert to backslashes.
+      return buf;
+    }
+  }
+#endif
+  return dir.value();
+}
+
 void RecursiveCollectChildDeps(const Target* target, std::set<Label>* result);
 
 void RecursiveCollectDeps(const Target* target, std::set<Label>* result) {
   if (result->find(target->label()) != result->end())
     return;  // Already did this target.
   result->insert(target->label());
 
   RecursiveCollectChildDeps(target, result);
 }
 
@@ skipping 73 matching lines @@
 // this difficult.
 void PrintLibDirs(const Target* target, bool display_header) {
   const OrderedSet<SourceDir>& lib_dirs = target->all_lib_dirs();
   if (lib_dirs.empty())
     return;
 
   if (display_header)
     OutputString("\nlib_dirs\n");
 
   for (size_t i = 0; i < lib_dirs.size(); i++)
-    OutputString("    " + lib_dirs[i].value() + "\n");
+    OutputString("    " + FormatSourceDir(lib_dirs[i]) + "\n");
 }
 
 void PrintLibs(const Target* target, bool display_header) {
   const OrderedSet<std::string>& libs = target->all_libs();
   if (libs.empty())
     return;
 
   if (display_header)
     OutputString("\nlibs\n");
 
@@ skipping 41 matching lines @@
     out << "    " << str << "\n";
   }
 };
 template<> struct DescValueWriter<SourceFile> {
   void operator()(const SourceFile& file, std::ostream& out) const {
     out << "    " << file.value() << "\n";
   }
 };
 template<> struct DescValueWriter<SourceDir> {
   void operator()(const SourceDir& dir, std::ostream& out) const {
-    out << "    " << dir.value() << "\n";
+    out << "    " << FormatSourceDir(dir) << "\n";
   }
 };
 
 // Writes a given config value type to the string, optionally with attribution.
 // This should match RecursiveTargetConfigToStream in the order it traverses.
 template<typename T> void OutputRecursiveTargetConfig(
     const Target* target,
     const char* header_name,
     const std::vector<T>& (ConfigValues::* getter)() const) {
   bool display_blame = CommandLine::ForCurrentProcess()->HasSwitch("blame");
@@ skipping 173 matching lines @@
   OUTPUT_CONFIG_VALUE(ldflags, std::string)
   PrintLibs(target, true);
   PrintLibDirs(target, true);
 
   PrintDeps(target, true);
 
   return 0;
 }
 
 }  // namespace commands