X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=274b153e70c566a2fa2dff2147918cc2d2474a37;hb=b98c297b0826c78521e54a0120cf20737a9e2727;hp=11f2b1a0e32a307ab899cd10352e8607a920e7b3;hpb=0f12a599f28748cef9c09dfb7a3b018b29ade6df;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 11f2b1a..274b153 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -78,18 +78,15 @@ Builder::Builder(int argc, char **argv): } dry_run=getopt['n']; - jobs=max(strtol(getopt['j'].arg()), 1L); - chrome=getopt["chrome"]; - conf_all=getopt['A']; + build_file=getopt['f'].arg(); + build_all=getopt['B']; if(getopt['C']) chdir(getopt['C'].arg().c_str()); - build_file=getopt['f'].arg(); - for(int i=index; i::const_iterator j=path.begin(); j!=path.end(); ++j) - if((tgt=check_header(Path::Path(*j)/fn))) + if((tgt=check_header(Path::getcwd()/ *j/fn))) return tgt; return 0; @@ -214,7 +211,7 @@ Target *Builder::get_library(const string &lib, const list &path) string basename="lib"+lib+".so"; for(list::const_iterator j=path.begin(); j!=path.end(); ++j) { - string full=(Path::Path(*j)/basename).str(); + string full=(Path::getcwd()/ *j/basename).str(); Target *tgt=get_target(full); if(tgt) return tgt; @@ -276,10 +273,21 @@ int Builder::main() if(i->second->get_buildable()) cout<<'*'; unsigned count=0; + unsigned ood_count=0; for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j) if(j->second->get_package()==i->second) + { ++count; - cout<<" ("<second->get_rebuild()) + ++ood_count; + } + if(count) + { + cout<<" ("<