Requires no longer effect build order, so do not count officially as "deps",

they are still influencing things such as filetime build decisions, but this
change to the policy simplifies everything and makes building faster.

2 files changed, 5 insertions, 27 deletions

diff --git a/src/conditionfiletime.cpp b/src/conditionfiletime.cpp
index f34946f..224caf1 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 ea043f9..1846044 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -89,22 +89,22 @@ void Target::buildRequires( Runner &r )
                         {
                                 Bu::FString sReq = (*j).toString();
                                 addRequires( sReq );
-                                try
+                        /*      try
                                 {
                                         addDep( r.getContext().getTarget( sReq ) );
                                 }
-                                catch(...) { }
+                                catch(...) { }*/
                         }
                 }
                 else
                 {
                         Bu::FString sReq = v.toString();
                         addRequires( sReq );
-                        try
+                /*      try
                         {
                                 addDep( r.getContext().getTarget( sReq ) );
                         }
-                        catch(...) { }
+                        catch(...) { }*/
                 }
         }
         r.getContext().popScope();
@@ -237,28 +237,6 @@ void Target::process( class Runner &r, const Bu::FString &sProfile )
         {
         }
         
-        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 )
         {
                 r.getContext().getView()->skipTarget( sProfile, *this );