rename "special" to "deps"

diff --git a/configure.py b/configure.py
index eddf248..eaf67c7 100755 (executable)
--- a/configure.py
+++ b/configure.py
@@ -191,7 +191,7 @@ if platform == 'windows':
         command='$cxx /showIncludes $cflags -c $in /Fo$out',
         depfile='$out.d',
         description='CXX $out',
-        special='msvc')
+        deps='msvc')
 else:
     n.rule('cxx',
         command='$cxx -MMD -MT $out -MF $out.d $cflags -c $in -o $out',

diff --git a/misc/ninja_syntax.py b/misc/ninja_syntax.py
index 519330e..d69e3e4 100644 (file)
--- a/misc/ninja_syntax.py
+++ b/misc/ninja_syntax.py
@@ -38,7 +38,7 @@ class Writer(object):
 
     def rule(self, name, command, description=None, depfile=None,
              generator=False, pool=None, restat=False, rspfile=None,
-             rspfile_content=None, special=None):
+             rspfile_content=None, deps=None):
         self._line('rule %s' % name)
         self.variable('command', command, indent=1)
         if description:
@@ -55,8 +55,8 @@ class Writer(object):
             self.variable('rspfile', rspfile, indent=1)
         if rspfile_content:
             self.variable('rspfile_content', rspfile_content, indent=1)
-        if special:
-            self.variable('special', special, indent=1)
+        if deps:
+            self.variable('deps', deps, indent=1)
 
     def build(self, outputs, rule, inputs=None, implicit=None, order_only=None,
               variables=None):

diff --git a/src/graph.cc b/src/graph.cc
index bb99bcb..b11973f 100644 (file)
--- a/src/graph.cc
+++ b/src/graph.cc
@@ -49,12 +49,12 @@ bool Rule::IsReservedBinding(const string& var) {
   return var == "command" ||
       var == "depfile" ||
       var == "description" ||
+      var == "deps" ||
       var == "generator" ||
       var == "pool" ||
       var == "restat" ||
       var == "rspfile" ||
-      var == "rspfile_content" ||
-      var == "special";
+      var == "rspfile_content";
 }
 
 bool DependencyScan::RecomputeDirty(Edge* edge, string* err) {
@@ -323,8 +323,8 @@ void Node::Dump(const char* prefix) const {
 }
 
 bool ImplicitDepLoader::LoadDeps(Edge* edge, string* err) {
-  string special = edge->GetBinding("special");
-  if (!special.empty()) {
+  string deps_type = edge->GetBinding("deps");
+  if (!deps_type.empty()) {
     if (!LoadDepsFromLog(edge, err)) {
       if (!err->empty())
         return false;