argv.push_back("--variable=source");
argv.push_back(n);
string srcdir=strip(run_command(argv));
- cout<<srcdir;
list<Path::Path> dirs;
if(!srcdir.empty())
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)))
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();
}
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';
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)
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);
if(status>0)
fail=true;
}
+ else
+ ++i;
}
}