Minor changes to the way requires are computed, getting ready for caching.

3 files changed, 25 insertions, 1 deletions

diff --git a/src/cache.h b/src/cache.h
index b255e94..31da981 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -21,6 +21,8 @@ public:
         void load();
         void save();
 
+
+
 private:
         Bu::FString sCacheFile;
         bool bIsLoaded;
diff --git a/src/conditionfiletime.cpp b/src/conditionfiletime.cpp
index 224caf1..f34946f 100644
--- a/src/conditionfiletime.cpp
+++ b/src/conditionfiletime.cpp
@@ -51,7 +51,7 @@ bool ConditionFileTime::shouldExec( class Runner &r, Target &rTarget )
                         return true;
                 }
         }
-        rTarget.buildRequires( r );
+        // rTarget.buildRequires( r );
         for( StrList::const_iterator j = rTarget.getRequiresList().begin();
                  j; j++ )
         {
diff --git a/src/target.cpp b/src/target.cpp
index 8eec07a..ea043f9 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -236,6 +236,28 @@ void Target::process( class Runner &r, const Bu::FString &sProfile )
         catch( Bu::HashException &e )
         {
         }
+        
+        buildRequires( r );
+        
+        for( TargetList::iterator i = lDeps.begin(); i; i++ )
+        {
+                if( (*i)->bRun )
+                        continue;
+
+                // TODO:  This is important, in the future, it may be possible for a
+                // target to be triggered by multiple dependant targets, to cover for
+                // this the below mergeUnder should be *TEMPORARY* and the target
+                // that was marged to be reset post processing.
+                (*i)->mergeUnder( hVars );
+                (*i)->process( r, sProfile );
+        }
+        try
+        {
+                bShouldExec = hProfiles.get( sProfile )->shouldExec( r, *this );
+        }
+        catch( Bu::HashException &e )
+        {
+        }
 
         if( !bShouldExec )
         {