diff options
Diffstat (limited to '')
| -rw-r--r-- | src/rule.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/rule.cpp b/src/rule.cpp index 61ea632..2f87d85 100644 --- a/src/rule.cpp +++ b/src/rule.cpp | |||
| @@ -12,7 +12,7 @@ Rule::~Rule() | |||
| 12 | { | 12 | { |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf ) | 15 | StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf, bool bFirstOnly ) |
| 16 | { | 16 | { |
| 17 | StringList lOutput; | 17 | StringList lOutput; |
| 18 | 18 | ||
| @@ -21,7 +21,7 @@ StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf ) | |||
| 21 | for( RuleList::iterator i = rl.begin(); i != rl.end(); i++ ) | 21 | for( RuleList::iterator i = rl.begin(); i != rl.end(); i++ ) |
| 22 | { | 22 | { |
| 23 | (*i)->setTarget( sTarget ); | 23 | (*i)->setTarget( sTarget ); |
| 24 | StringList tmp = (*i)->execute( bld, lInput, lPerf ); | 24 | StringList tmp = (*i)->execute( bld, lInput, lPerf, bFirstOnly ); |
| 25 | lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() ); | 25 | lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() ); |
| 26 | } | 26 | } |
| 27 | 27 | ||
| @@ -84,9 +84,9 @@ StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf ) | |||
| 84 | { | 84 | { |
| 85 | for( StringList::iterator i = lMine.begin(); i != lMine.end(); i++ ) | 85 | for( StringList::iterator i = lMine.begin(); i != lMine.end(); i++ ) |
| 86 | { | 86 | { |
| 87 | //for( StringList::iterator j = lProduces.begin(); | 87 | for( StringList::iterator j = lProduces.begin(); |
| 88 | // j != lProduces.end(); j++ ) | 88 | j != lProduces.end(); j++ ) |
| 89 | StringList::iterator j = lProduces.begin(); | 89 | //StringList::iterator j = lProduces.begin(); |
| 90 | { | 90 | { |
| 91 | VarMap mTmp; | 91 | VarMap mTmp; |
| 92 | StringList cont; | 92 | StringList cont; |
| @@ -121,6 +121,8 @@ StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf ) | |||
| 121 | } | 121 | } |
| 122 | lPerf.push_back( p ); | 122 | lPerf.push_back( p ); |
| 123 | } | 123 | } |
| 124 | if( bFirstOnly ) | ||
| 125 | break; | ||
| 124 | } | 126 | } |
| 125 | } | 127 | } |
| 126 | } | 128 | } |
