1. preprocessor doesn't touch unchanged files anymore

2. doublechedk on whether file is up to date when making
3. changed the way preprocessor targets depend on the timestamp file
4. a bugfix in strip_suffix/strip_prefix

1 files changed, 13 insertions, 6 deletions

diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index f8666dc..b8f5a16 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -10,25 +10,25 @@
  #include <fstream>
  #include <stdexcept>
  #include <vector>
  using namespace std;
  #include "sitecing/component_factory.h"
  #include "sitecing/sitecing_util.h"
  #include "sitecing/sitecing_parser.h"
  #include "sitecing/sitecing_exception.h"
 #endif
  
 namespace sitecing {
 
-    static const char *pp_targets[] = { ".cc", ".h", ".imports", ".classname", ".baseclassname", ".ancestors" };
+    static const char *pp_targets[] = { ".cc", ".h", ".imports", ".classname", ".baseclassname", ".ancestors", ".pp_stamp" };
     static const char *cc_targets[] = { ".o", ".d" };
 
     component_factory::component_factory(configuration& c)
 	: config(c),
     root_source(normalize_path(c.root_source,strip_trailing_slash)+'/'),
     root_intermediate(normalize_path(c.root_intermediate,strip_trailing_slash)+'/'),
     root_so(normalize_path(c.root_so,strip_trailing_slash)+'/') {
     }
 
     void component_factory::get_dependencies(const string& dst,file_list_t& deps) {
 	deps.clear();
 	string dp = normalize_path(dst,strip_trailing_slash);
@@ -107,33 +107,38 @@ namespace sitecing {
 		}
 		// XXX: extra deps like IntermediateDeps?
 	    }catch(utility_no_affix& una) {
 		// do nothing.
 	    }
 	}
     }
 
     bool component_factory::is_uptodate(const string& dst,file_list_t *deps) {
 	string dp = normalize_path(dst,strip_trailing_slash);
 	// XXX: or just compare it off, instead of throwing things around.
 	try {
-	    strip_prefix(dp,root_intermediate);
-	    return file_factory::is_uptodate(dst,deps);
-	}catch(utility_no_prefix& unp) {
+	    string noro = strip_prefix(dp,root_intermediate);
+	    for(int ppt=0;(ppt+1)<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
+		try {
+		    string nos = strip_suffix(noro,pp_targets[ppt]);
+		    return file_factory::is_uptodate(root_intermediate+nos+".pp_stamp",deps);
+		}catch(utility_no_suffix& uns) { }
 	}
+	    bool rv =  file_factory::is_uptodate(dst,deps);
+	    return rv;
+	}catch(utility_no_prefix& unp) { }
 	try {
 	    strip_prefix(dp,root_so);
 	    return file_factory::is_uptodate(dst,deps);
-	}catch(utility_no_prefix& unp) {
-	}
+	}catch(utility_no_prefix& unp) { }
 	return true;
     }
 
     void component_factory::build(const string& dst) {
 	string dp = normalize_path(dst,strip_trailing_slash);
 	// sources
 	try {
 	    string noro = strip_prefix(dp,root_source);
 	    // building the sources is left up to developer
 	    return;
 	}catch(utility_no_prefix& unp) {
 	}
@@ -240,24 +245,26 @@ namespace sitecing {
 		static const char *id_chars = "abcdefghijklmnopqrstuvwxyz0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 		parser.class_name = normalize_path(noro,strip_leading_slash|strip_trailing_slash);
 		for(string::size_type illc = parser.class_name.find_first_not_of(id_chars);illc!=string::npos;illc=parser.class_name.find_first_not_of(id_chars,illc)) {
 		    string::size_type lc = parser.class_name.find_first_of(id_chars,illc);
 		    int n = ((lc==string::npos)?parser.class_name.length():lc)-illc;
 		    parser.class_name.replace(illc,n,n,'_');
 		}
 		parser.class_name = "_SCC_"+parser.class_name;
 		parser.output_basename = nos;
 		parser.component_basename = noro;
 		try {
 		    parser.preprocess(src);
+		    string sf = root_intermediate+noro+".pp_stamp";
+		    ofstream sfs(sf.c_str(),ios::trunc|ios::out); // touch .pp_stamp
 		}catch(preprocessor_error& pe) {
 		    pe.component_name = noro;
 		    pe.see(CODEPOINT);
 		    throw;
 		}
 		return;
 	    }catch(utility_no_affix& una) {
 		// must be a crap from .d file
 	    }
 	}
 	cerr << "ignoring build request for " << dp << endl;
     }