add cleaner for -cmt-rm hooks & move rescript_mode into state

Author: bobzhang

src/clean.cc

@@ -21,6 +21,7 @@
 #include "graph.h"
 #include "state.h"
 #include "util.h"
+#include <stdlib.h>
 
 Cleaner::Cleaner(State* state,
                  const BuildConfig& config,
@@ -133,24 +134,28 @@ void Cleaner::CleanDead(const BuildLog::Entries& entries) {
     Node* n = state_->LookupNode(i->first);
     if (!n || !n->in_edge()) {
       string toDelete = i->first.AsString();
-      if(StringPiece::getJsSuffix().IsSuffix(toDelete) ||
-         StringPiece::getMjsSuffix().IsSuffix(toDelete) || 
-         StringPiece::getCjsSuffix().IsSuffix(toDelete)){
-        int ret = RemoveFile(toDelete);
-          if(ret == 0){
-            staleFiles.insert(toDelete);
-          }
+      int ret = RemoveFile(toDelete);
+      if (ret == 0) {
+        staleFiles.insert(toDelete);
       }
     }
   }
 
-  if(!staleFiles.empty()){
-    if(config_.verbosity != BuildConfig::QUIET){
-      printf("Remove staled output\n");
-      for(set<string>::const_iterator i = staleFiles.begin(); i != staleFiles.end(); ++i){
-        printf("%s ",i->c_str());
+  if (!staleFiles.empty()) {
+    printf("Remove %lu staled output\n", staleFiles.size());
+    if (!state_->cleaner.empty()) {
+      vector<string> staled_cm;
+      for (set<string>::const_iterator i = staleFiles.begin();
+           i != staleFiles.end(); ++i) {
+        if (StringPiece::getCmjSuffix().IsSuffix(*i)) {
+          staled_cm.push_back(*i);
+        }
+      }
+      for (size_t i = 0; i < staled_cm.size(); ++i) {
+        string command = state_->cleaner + " -cmt-rm " + staled_cm[i];
+        printf("%s\n", command.c_str());
+        system(command.c_str());
       }
-      printf("\nRemove staled done\n");
     }
   }
 }

src/debug_flags.cc

@@ -19,5 +19,3 @@ bool g_keep_depfile = false;
 bool g_keep_rsp = false;
 
 bool g_experimental_statcache = true;
-
-bool g_rescript = false;

src/debug_flags.h

@@ -30,5 +30,4 @@ extern bool g_keep_rsp;
 
 extern bool g_experimental_statcache;
 
-extern bool g_rescript; 
 #endif // NINJA_EXPLAIN_H_

src/manifest_parser.cc

@@ -81,7 +81,9 @@ bool ManifestParser::Parse(const string& filename, const string& input,
       } else if(lexer_.PeekToken(Lexer::EQUALS)){
         if(!lexer_.ReadVarValue(&let_value,err)) return false;
         if (name == "rescript") {
-          g_rescript = true;
+          state_ -> rescript_mode_ = true;
+        } else if(name == "cleaner") {
+          state_ -> cleaner =  let_value.Evaluate(env_);
         } else {
           string value = let_value.Evaluate(env_);
           env_->AddBinding(name, value);

src/ninja.cc

@@ -1372,7 +1372,7 @@ NORETURN void real_main(int argc, char** argv) {
     if (options.tool && options.tool->when == Tool::RUN_AFTER_LOGS)
       exit((ninja.*options.tool->func)(&options, argc, argv));
 
-    if (g_rescript) {
+    if (ninja.state_.rescript_mode_) {
       ninja.ToolCleanDead(&options, argc, argv);
     }
 

src/state.cc

@@ -77,6 +77,7 @@ State::State() {
   bindings_.AddRule(&kPhonyRule);
   AddPool(&kDefaultPool);
   AddPool(&kConsolePool);
+  rescript_mode_ = false;
 }
 
 void State::AddPool(Pool* pool) {

src/state.h

@@ -126,6 +126,9 @@ struct State {
 
   BindingEnv bindings_;
   vector<Node*> defaults_;
+  
+  bool rescript_mode_;
+  string cleaner ;
 };
 
 #endif  // NINJA_STATE_H_