Really close...functions are doing their stuff, we have inputs, almost have rules.

1 files changed, 37 insertions, 1 deletions

diff --git a/src/builder.cpp b/src/builder.cpp
index 4d377a8..1e916ab 100644
--- a/src/builder.cpp
+++ b/src/builder.cpp
@@ -134,7 +134,14 @@ void Builder::addListFunc()
 
 void Builder::filterList()
 {
-        printf("Filters aren't done yet.\n");
+        StringList lTmp2;
+        StringList lIn = buildToStringList( lTmp, StringList() );
+        pTmpFunc->execute( lIn, lTmp2 );
+        lTmp.clear();
+        for( StringList::iterator i = lTmp2.begin(); i != lTmp2.end(); i++ )
+        {
+                lTmp.push_back( BuildListItem( *i, NULL ) );
+        }
 }
 
 StringList Builder::buildToStringList( const BuildList &lSrc, const StringList &lIn )
@@ -353,6 +360,21 @@ Build *Builder::genBuild()
 {
         Build *bld = new Build;
 
+        for( SetVarList::iterator i = lGlobalVars.begin();
+                 i != lGlobalVars.end(); i++ )
+        {
+                switch( (*i).third )
+                {
+                        case setSet:
+                                bld->set( "", (*i).first, (*i).second );
+                                break;
+
+                        case setAdd:
+                                bld->setAdd( "", (*i).first, (*i).second );
+                                break;
+                }
+        }
+
         for( TargetTmpList::iterator i = lTargetTmp.begin();
                  i != lTargetTmp.end(); i++ )
         {
@@ -388,6 +410,20 @@ Build *Builder::genBuild()
                         {
                                 bld->addRequires( (*j), (*k) );
                         }
+                        for( SetVarList::iterator k = (*i).second.lVar.begin();
+                                 k != (*i).second.lVar.end(); k++ )
+                        {
+                                switch( (*k).third )
+                                {
+                                        case setSet:
+                                                bld->set( *j, (*k).first, (*k).second );
+                                                break;
+        
+                                        case setAdd:
+                                                bld->setAdd( *j, (*k).first, (*k).second );
+                                                break;
+                                }
+                        }
                 }
         }