Fix build output directories in GN.

tools/gn/command_gyp.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 <iostream>
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "tools/gn/build_settings.h"
 #include "tools/gn/commands.h"
 #include "tools/gn/err.h"
+#include "tools/gn/filesystem_utils.h"
 #include "tools/gn/gyp_helper.h"
 #include "tools/gn/gyp_target_writer.h"
 #include "tools/gn/location.h"
 #include "tools/gn/parser.h"
 #include "tools/gn/setup.h"
 #include "tools/gn/source_file.h"
 #include "tools/gn/standard_out.h"
 #include "tools/gn/target.h"
 #include "tools/gn/tokenizer.h"
 
 namespace commands {
 
 namespace {
 
 typedef GypTargetWriter::TargetGroup TargetGroup;
 typedef std::map<Label, TargetGroup> CorrelatedTargetsMap;
 typedef std::map<SourceFile, std::vector<TargetGroup> > GroupedTargetsMap;
 typedef std::map<std::string, std::string> StringStringMap;
 typedef std::vector<const BuilderRecord*> RecordVector;
 
+// This function appends a suffix to the given source directory name. We append
+// a suffix to the last directory component rather than adding a new level so
+// that the relative location of the files don't change (i.e. a file
+// relative to the build dir might be "../../foo/bar.cc") and we want these to
+// be the same in all builds, and in particular the GYP build directories.
+SourceDir AppendDirSuffix(const SourceDir& base, const std::string& suffix) {
+  return SourceDir(DirectoryWithNoLastSlash(base) + suffix + "/");
+}
+
 std::vector<const BuilderRecord*> GetAllResolvedTargetRecords(
     const Builder* builder) {
   std::vector<const BuilderRecord*> all = builder->GetAllRecords();
   std::vector<const BuilderRecord*> result;
   result.reserve(all.size());
   for (size_t i = 0; i < all.size(); i++) {
     if (all[i]->type() == BuilderRecord::ITEM_TARGET &&
         all[i]->should_generate() &&
         all[i]->item())
       result.push_back(all[i]);
@@ skipping 272 matching lines @@
   const CommandLine* cmdline = CommandLine::ForCurrentProcess();
 
   base::TimeTicks begin_time = base::TimeTicks::Now();
 
   // Deliberately leaked to avoid expensive process teardown.
   Setup* setup_debug = new Setup;
   if (!setup_debug->DoSetup())
     return 1;
   const char kIsDebug[] = "is_debug";
 
+  SourceDir base_build_dir = setup_debug->build_settings().build_dir();
+  setup_debug->build_settings().SetBuildDir(
+      AppendDirSuffix(base_build_dir, ".Debug"));
+
   // Make a release build based on the debug one. We use a new directory for
   // the build output so that they don't stomp on each other.
   DependentSetup* setup_release = new DependentSetup(setup_debug);
   setup_release->build_settings().build_args().AddArgOverride(
       kIsDebug, Value(NULL, false));
   setup_release->build_settings().SetBuildDir(
-      SourceDir(setup_release->build_settings().build_dir().value() +
-                "gn_release.tmp/"));
+      AppendDirSuffix(base_build_dir, ".Release"));
 
   // Host build.
   DependentSetup* setup_host_debug = NULL;
   DependentSetup* setup_host_release = NULL;
   // TODO(brettw) hook up host build.
 
   // 64-bit build (Windows only).
   DependentSetup* setup_debug64 = NULL;
   DependentSetup* setup_release64 = NULL;
 #if defined(OS_WIN)
   static const char kForceWin64[] = "force_win64";
   setup_debug64 = new DependentSetup(setup_debug);
   setup_debug64->build_settings().build_args().AddArgOverride(
       kForceWin64, Value(NULL, true));
   setup_debug64->build_settings().SetBuildDir(
-      SourceDir(setup_release->build_settings().build_dir().value() +
-                "gn_debug64.tmp/"));
+      AppendDirSuffix(base_build_dir, ".Debug64"));
 
   setup_release64 = new DependentSetup(setup_release);
   setup_release64->build_settings().build_args().AddArgOverride(
       kForceWin64, Value(NULL, true));
   setup_release64->build_settings().SetBuildDir(
-      SourceDir(setup_release->build_settings().build_dir().value() +
-                "gn_release64.tmp/"));
+      AppendDirSuffix(base_build_dir, ".Release64"));
 #endif
 
   // Run all the builds in parellel.
   setup_release->RunPreMessageLoop();
   if (setup_host_debug && setup_host_release) {
     setup_host_debug->RunPreMessageLoop();
     setup_host_release->RunPreMessageLoop();
   }
   if (setup_debug64 && setup_release64) {
     setup_debug64->RunPreMessageLoop();
@@ skipping 38 matching lines @@
         + " GN files in " +
         base::IntToString((end_time - begin_time).InMilliseconds()) + "ms\n";
 
     OutputString(stats);
   }
 
   return 0;
 }
 
 }  // namespace commands