summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetrWolf <petr.wolf@gmail.com>2012-02-14 17:33:04 (GMT)
committerPetrWolf <petr.wolf@gmail.com>2012-02-14 17:33:04 (GMT)
commit2372bdd9121662b6aea73f78fd0a4cf1bbc5d135 (patch)
tree07bd97ca711630bbf21a7214a08e204f8cb5f02a
parentc4fc06b0768bd30c5d93e7c1829395cc714cbfc1 (diff)
parent4ff948f66d3e9b49e0f51e4980f48a628f61a165 (diff)
downloadNinja-2372bdd9121662b6aea73f78fd0a4cf1bbc5d135.zip
Ninja-2372bdd9121662b6aea73f78fd0a4cf1bbc5d135.tar.gz
Ninja-2372bdd9121662b6aea73f78fd0a4cf1bbc5d135.tar.bz2
Merge branch 'master' of github.com:PetrWolf/ninja
-rw-r--r--src/clean.cc2
-rw-r--r--src/graph.h10
2 files changed, 11 insertions, 1 deletions
diff --git a/src/clean.cc b/src/clean.cc
index 6524ce0..e09ab4e 100644
--- a/src/clean.cc
+++ b/src/clean.cc
@@ -106,7 +106,7 @@ int Cleaner::CleanAll(bool generator) {
continue;
// Do not remove generator's files unless generator specified.
if (!generator && (*e)->rule().generator())
- continue;
+ continue;
for (vector<Node*>::iterator out_node = (*e)->outputs_.begin();
out_node != (*e)->outputs_.end(); ++out_node) {
Remove((*out_node)->path());
diff --git a/src/graph.h b/src/graph.h
index 45a6cf8..b290d24 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -149,12 +149,22 @@ struct Edge {
/// Return true if all inputs' in-edges are ready.
bool AllInputsReady() const;
+ /// Expand all variables in a command and return it as a string.
+ /// If incl_rsp_file is enabled, the string will also contain the
+ /// full contents of a response file (if applicable)
string EvaluateCommand(bool incl_rsp_file = false); // XXX move to env, take env ptr
string EvaluateDepFile();
string GetDescription();
+
+ /// Does the edge use a response file?
bool HasRspFile();
+
+ /// Get the path to the response file
string GetRspFile();
+
+ /// Get the contents of the response file
string GetRspFileContent();
+
bool LoadDepFile(State* state, DiskInterface* disk_interface, string* err);
void Dump();