Rename GN tool's deps to depsformat.

tools/gn/function_toolchain.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 "tools/gn/err.h"
 #include "tools/gn/functions.h"
 #include "tools/gn/parse_tree.h"
 #include "tools/gn/scheduler.h"
 #include "tools/gn/scope.h"
 #include "tools/gn/settings.h"
@@ skipping 155 matching lines @@
     "  \"cc\", \"cxx\", \"objc\", \"objcxx\", \"asm\", \"alink\", \"solink\",\n"
     "  \"link\", \"stamp\", \"copy\"\n"
     "\n"
     "Command flags:\n"
     "\n"
     "  These variables may be specified in the { } block after the tool call.\n"
     "  They are passed directly to Ninja. See the ninja documentation for how\n"
     "  they work. Don't forget to backslash-escape $ required by Ninja to\n"
     "  prevent GN from doing variable expansion.\n"
     "\n"
-    "    command, depfile, deps, description, pool, restat, rspfile,\n"
+    "    command, depfile, depsformat, description, pool, restat, rspfile,\n"
     "    rspfile_content\n"
     "\n"
+    "  (Note that GN uses \"depsformat\" for Ninja's \"deps\" variable to\n"
+    "  avoid confusion with dependency lists.)\n"
+    "\n"
     "  Additionally, lib_prefix and lib_dir_prefix may be used for the link\n"
     "  tools. These strings will be prepended to the libraries and library\n"
     "  search directories, respectively, because linkers differ on how to\n"
     "  specify them.\n"
     "\n"
     "  Note: On Mac libraries with names ending in \".framework\" will be\n"
     "  added to the link like with a \"-framework\" switch and the lib prefix\n"
     "  will be ignored.\n"
     "\n"
     "Example:\n"
@@ skipping 40 matching lines @@
   // Run the tool block.
   Scope block_scope(scope);
   block->ExecuteBlockInScope(&block_scope, err);
   if (err->has_error())
     return Value();
 
   // Extract the stuff we need.
   Toolchain::Tool t;
   if (!ReadString(block_scope, "command", &t.command, err) ||
       !ReadString(block_scope, "depfile", &t.depfile, err) ||
-      !ReadString(block_scope, "deps", &t.deps, err) ||
+      // TODO(brettw) delete this once we rename "deps" -> "depsformat" in
+      // the toolchain definitions. This will avoid colliding with the
+      // toolchain's "deps" list. For now, accept either.
+      !ReadString(block_scope, "deps", &t.depsformat, err) ||
+      !ReadString(block_scope, "depsformat", &t.depsformat, err) ||
       !ReadString(block_scope, "description", &t.description, err) ||
       !ReadString(block_scope, "lib_dir_prefix", &t.lib_dir_prefix, err) ||
       !ReadString(block_scope, "lib_prefix", &t.lib_prefix, err) ||
       !ReadString(block_scope, "pool", &t.pool, err) ||
       !ReadString(block_scope, "restat", &t.restat, err) ||
       !ReadString(block_scope, "rspfile", &t.rspfile, err) ||
       !ReadString(block_scope, "rspfile_content", &t.rspfile_content, err))
     return Value();
 
   // Make sure there weren't any vars set in this tool that were unused.
@@ skipping 74 matching lines @@
     return Value();
 
   Scope::KeyValueMap values;
   block_scope.GetCurrentScopeValues(&values);
   toolchain->args() = values;
 
   return Value();
 }
 
 }  // namespace functions