aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild.sh4
-rw-r--r--src/cache.h2
-rw-r--r--src/conditionfiletime.cpp2
-rw-r--r--src/target.cpp22
4 files changed, 27 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index dd7e45b..53e9baa 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3BUSRC="stack.cpp fstring.cpp fbasicstring.cpp hash.cpp list.cpp trace.cpp stream.cpp formatter.cpp util.cpp sharedcore.cpp exceptionbase.cpp heap.cpp archivebase.cpp archive.cpp queue.cpp archival.cpp sio.cpp stdstream.cpp process.cpp plugger.cpp optparser.cpp signals.cpp array.cpp membuf.cpp" 3BUSRC="stack.cpp fstring.cpp fbasicstring.cpp hash.cpp list.cpp trace.cpp stream.cpp formatter.cpp util.cpp sharedcore.cpp exceptionbase.cpp heap.cpp archivebase.cpp archive.cpp queue.cpp archival.cpp sio.cpp stdstream.cpp process.cpp plugger.cpp optparser.cpp signals.cpp array.cpp membuf.cpp file.cpp"
4BUHDR="stack.h fstring.h fbasicstring.h hash.h list.h trace.h stream.h formatter.h util.h sharedcore.h exceptionbase.h heap.h archivebase.h archive.h queue.h archival.h sio.h stdstream.h process.h osx_compatibility.h win32_compatibility.h linux_compatibility.h plugger.h singleton.h optparser.h signals.h array.h membuf.h" 4BUHDR="stack.h fstring.h fbasicstring.h hash.h list.h trace.h stream.h formatter.h util.h sharedcore.h exceptionbase.h heap.h archivebase.h archive.h queue.h archival.h sio.h stdstream.h process.h osx_compatibility.h win32_compatibility.h linux_compatibility.h plugger.h singleton.h optparser.h signals.h array.h membuf.h file.h"
5 5
6function bld() 6function bld()
7{ 7{
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:
21 void load(); 21 void load();
22 void save(); 22 void save();
23 23
24
25
24private: 26private:
25 Bu::FString sCacheFile; 27 Bu::FString sCacheFile;
26 bool bIsLoaded; 28 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 )
51 return true; 51 return true;
52 } 52 }
53 } 53 }
54 rTarget.buildRequires( r ); 54 // rTarget.buildRequires( r );
55 for( StrList::const_iterator j = rTarget.getRequiresList().begin(); 55 for( StrList::const_iterator j = rTarget.getRequiresList().begin();
56 j; j++ ) 56 j; j++ )
57 { 57 {
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 )
236 catch( Bu::HashException &e ) 236 catch( Bu::HashException &e )
237 { 237 {
238 } 238 }
239
240 buildRequires( r );
241
242 for( TargetList::iterator i = lDeps.begin(); i; i++ )
243 {
244 if( (*i)->bRun )
245 continue;
246
247 // TODO: This is important, in the future, it may be possible for a
248 // target to be triggered by multiple dependant targets, to cover for
249 // this the below mergeUnder should be *TEMPORARY* and the target
250 // that was marged to be reset post processing.
251 (*i)->mergeUnder( hVars );
252 (*i)->process( r, sProfile );
253 }
254 try
255 {
256 bShouldExec = hProfiles.get( sProfile )->shouldExec( r, *this );
257 }
258 catch( Bu::HashException &e )
259 {
260 }
239 261
240 if( !bShouldExec ) 262 if( !bShouldExec )
241 { 263 {