Output cleanup

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 05ecf877c7f47265131491fa50f0e00189015c1d..c900837a2d6e978079294606ccbf4f182ae520e8 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -44,7 +44,6 @@ Package *Builder::get_package(const string &n)
        argv.push_back("--variable=source");
        argv.push_back(n);
        string srcdir=strip(run_command(argv));
-       cout<<srcdir;
        
        list<Path::Path> dirs;
        if(!srcdir.empty())
@@ -88,7 +87,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
                return i->second;
 
        string fn=include.substr(1);
-       Target *tgt;
+       Target *tgt=0;
        if(include[0]=='"' && (tgt=check_header(Path::Path(from)/fn)))
                return tgt;
        if((tgt=check_header(Path::Path("/usr/include")/fn)))
@@ -115,6 +114,8 @@ int Builder::main()
        while(!new_pkgs.empty())
        {
                Package *pkg=new_pkgs.front();
+               if(pkg==default_pkg)
+                       pkg->process_options(cmdline_options);
                new_pkgs.erase(new_pkgs.begin());
                pkg->resolve_refs();
        }
@@ -152,8 +153,8 @@ int Builder::main()
        if(create_targets())
                return 1;
 
-       for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-               cout<<i->second->get_name()<<' '<<i->second->get_type()<<' '<<i->second->get_rebuild()<<' '<<i->second->get_rebuild_reason()<<'\n';
+       /*for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+               cout<<i->second->get_name()<<' '<<i->second->get_type()<<' '<<i->second->get_rebuild()<<' '<<i->second->get_rebuild_reason()<<'\n';*/
 
        cout<<"Active targets: "<<targets.size()<<'\n';
 
@@ -275,6 +276,9 @@ int Builder::build()
        list<Action *> actions;
        bool fail=false;
 
+       if(!cmdline->get_rebuild())
+               cout<<"Already up to date\n";
+
        while(cmdline->get_rebuild() && !fail)
        {
                if(actions.empty() && !fail)
@@ -282,7 +286,7 @@ int Builder::build()
                        Target *tgt=cmdline->get_buildable_target();
                        if(tgt)
                        {
-                               cout<<"Build "<<tgt->get_name()<<'\n';
+                               //cout<<"Build "<<tgt->get_name()<<'\n';
                                Action *action=tgt->build();
                                if(action)
                                        actions.push_back(action);
@@ -301,6 +305,8 @@ int Builder::build()
                                if(status>0)
                                        fail=true;
                        }
+                       else
+                               ++i;
                }
        }