X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=e9491eb8a9bc417c350b6b2f55a378b69bffa7b0;hb=9976a7bdf0e53966dce4bc828a37eb42de0223e3;hp=cb8ddf610fe7b0237fb5a9f078ebcd122144e3ee;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index cb8ddf6..e9491eb 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -26,6 +27,8 @@ using namespace Msp; Builder::Builder(int argc, char **argv): verbose(1), cwd(Path::getcwd()), + build_file("Build"), + do_build(true), analyzer(0), jobs(1), chrome(false) @@ -39,11 +42,13 @@ Builder::Builder(int argc, char **argv): getopt.add_option(GetOpt::Option('W', "what-if", GetOpt::REQUIRED)); getopt.add_option(GetOpt::Option('B', "build-all", GetOpt::NONE)); getopt.add_option(GetOpt::Option('C', "chdir", GetOpt::REQUIRED)); - getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED)); + getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED, "1")); getopt.add_option(GetOpt::Option('h', "help", GetOpt::NONE)); getopt.add_option(GetOpt::Option('c', "clean", GetOpt::NONE)); + getopt.add_option(GetOpt::Option('f', "file", GetOpt::REQUIRED, "Build")); getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE)); getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE)); + getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE)); int index=getopt(argc, argv); verbose+=getopt['v'].count(); @@ -67,13 +72,17 @@ Builder::Builder(int argc, char **argv): if(getopt["max-depth"]) analyzer->set_max_depth(strtol(getopt["max-depth"].arg())); analyzer->set_full_paths(getopt["full-paths"]); - } - if(getopt['j']) - jobs=max(strtol(getopt['j'].arg()), 1L); + if(!getopt['b']) + do_build=false; + } - if(getopt["chrome"]) - chrome=true; + 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()); @@ -90,6 +99,9 @@ Builder::Builder(int argc, char **argv): if(cmdline_targets.empty()) cmdline_targets.push_back("default"); + + if(getopt['W']) + what_if.push_back(getopt['W'].arg()); } /** @@ -105,6 +117,7 @@ Package *Builder::get_package(const string &n) if(i!=packages.end()) return i->second; + // Try to get source directory with pkgconfig list argv; argv.push_back("pkg-config"); argv.push_back("--variable=source"); @@ -115,12 +128,14 @@ Package *Builder::get_package(const string &n) if(!srcdir.empty()) dirs.push_back(srcdir); + // Make some other guesses about the source directory string dirname=n; if(!dirname.compare(0, 3, "msp")) dirname.erase(0, 3); dirs.push_back(cwd/dirname); dirs.push_back(cwd/".."/dirname); + // Go through the candidate directories and look for a Build file for(PathList::iterator j=dirs.begin(); j!=dirs.end(); ++j) if(!load_build_file(*j/"Build")) { @@ -129,14 +144,19 @@ Package *Builder::get_package(const string &n) return i->second; break; } - + + // Package source not found - create a binary package Package *pkg=Package::create(*this, n); packages.insert(PackageMap::value_type(n, pkg)); - new_pkgs.push_back(pkg); + if(pkg) + new_pkgs.push_back(pkg); return pkg; } +/** +Returns the target with the given name, or 0 if no such target exists. +*/ Target *Builder::get_target(const string &n) { TargetMap::iterator i=targets.find(n); @@ -145,10 +165,18 @@ Target *Builder::get_target(const string &n) return 0; } +/** +Tries to locate a header included from a given location and with a given include +path. Considers known targets as well as existing files. +*/ Target *Builder::get_header(const string &include, const string &from, const list &path) { - //XXX Should really hash the include path here - string id=from+":"+include; + string hash(8, 0); + update_hash(hash, from); + for(list::const_iterator i=path.begin(); i!=path.end(); ++i) + update_hash(hash, *i); + + string id=hash+include; TargetMap::iterator i=includes.find(id); if(i!=includes.end()) return i->second; @@ -159,6 +187,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis return tgt; if((tgt=check_header(Path::Path("/usr/include")/fn))) return tgt; + //XXX Determine the C++ header location dynamically if((tgt=check_header(Path::Path("/usr/include/c++/4.1.2")/fn))) return tgt; for(list::const_iterator j=path.begin(); j!=path.end(); ++j) @@ -172,13 +201,17 @@ Target *Builder::get_library(const string &lib, const list &path) { string hash(8, 0); for(list::const_iterator i=path.begin(); i!=path.end(); ++i) - for(unsigned j=0; jsize(); ++j) - hash[j%8]^=(*i)[j]; + update_hash(hash, *i); + + string id=hash+lib; + TargetMap::iterator i=libraries.find(id); + if(i!=libraries.end()) + return i->second; string basename="lib"+lib+".so"; - for(list::const_iterator i=path.begin(); i!=path.end(); ++i) + for(list::const_iterator j=path.begin(); j!=path.end(); ++j) { - string full=(Path::Path(*i)/basename).str(); + string full=(Path::Path(*j)/basename).str(); Target *tgt=get_target(full); if(tgt) return tgt; @@ -194,7 +227,7 @@ Target *Builder::get_library(const string &lib, const list &path) int Builder::main() { - if(load_build_file(cwd/"Build")) + if(load_build_file(cwd/build_file)) { cerr<<"No build info here.\n"; return 1; @@ -205,7 +238,7 @@ int Builder::main() while(!new_pkgs.empty()) { Package *pkg=new_pkgs.front(); - if(pkg==default_pkg) + if(pkg==default_pkg || conf_all) pkg->process_options(cmdline_options); new_pkgs.erase(new_pkgs.begin()); pkg->resolve_refs(); @@ -213,17 +246,12 @@ int Builder::main() std::list missing; for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - { - const list &requires=i->second->get_requires(); - for(list::const_iterator j=requires.begin(); j!=requires.end(); ++j) - if(!j->get_package()) - missing.push_back(j->get_name()); - } + if(!i->second) + missing.push_back(i->first); if(!missing.empty()) { missing.sort(); - missing.unique(); cerr<<"The following packages were not found on the system:\n"; for(list::iterator i=missing.begin(); i!=missing.end(); ++i) cerr<<" "<<*i<<'\n'; @@ -233,15 +261,6 @@ int Builder::main() default_pkg->create_build_info(); - /*cout<<"Active packages:"; - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - { - cout<<' '<second->get_name(); - if(i->second->get_buildable()) - cout<<'*'; - } - cout<<'\n';*/ - if(create_targets()) return 1; @@ -254,19 +273,29 @@ 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<<" ("<analyze(); - build(); + if(do_build) + build(); return exit_code; } @@ -313,6 +342,10 @@ int Builder::create_targets() if(!i->second->get_buildable()) continue; + Path::Path inst_base; + if(i->second->get_config().is_option("prefix")) + inst_base=i->second->get_config().get_option("prefix").value; + const ComponentList &components=i->second->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) { @@ -320,13 +353,18 @@ int Builder::create_targets() const PathList &sources=j->get_sources(); for(PathList::const_iterator k=sources.begin(); k!=sources.end(); ++k) { - list sfiles=list_files(*k); - for(list::iterator l=sfiles.begin(); l!=sfiles.end(); ++l) - files.push_back(*k / *l); + struct stat st; + stat(*k, st); + if(S_ISDIR(st.st_mode)) + { + list sfiles=list_files(*k); + for(list::iterator l=sfiles.begin(); l!=sfiles.end(); ++l) + files.push_back(*k / *l); + } + else + files.push_back(*k); } - Path::Path inst_base=i->second->get_config().get_option("prefix").value; - bool build_exe=j->get_type()!=Component::HEADERS; list objs; @@ -396,6 +434,19 @@ int Builder::create_targets() Target *tgt=new_tgts.front(); new_tgts.erase(new_tgts.begin()); tgt->find_depends(); + if(!tgt->get_depends_ready()) + new_tgts.push_back(tgt); + } + + for(list::iterator i=what_if.begin(); i!=what_if.end(); ++i) + { + Target *tgt=get_target((cwd/ *i).str()); + if(!tgt) + { + cerr<<"Unknown what-if target "<<*i<<'\n'; + return -1; + } + tgt->touch(); } Target *cmdline=new VirtualTarget(*this, "cmdline"); @@ -438,6 +489,16 @@ void Builder::add_target(Target *t) new_tgts.push_back(t); } +void Builder::update_hash(string &hash, const string &value) +{ + for(unsigned i=0; i actions; - //ProgressBar *progress=0; if(chrome) - { - //progress=new ProgressBar(cout, total); cout<<"0 targets built\n"; - } unsigned count=0; bool fail=false; @@ -465,17 +522,11 @@ int Builder::build() while(!finish) { - if(actions.size()get_buildable_target(); if(tgt) { - /*if(chrome) - { - cout<<"\e["<set(count); - cout<<"\e["<build(); if(action) actions.push_back(action); @@ -506,15 +557,15 @@ int Builder::build() delete actions[i]; actions.erase(actions.begin()+i); if(status>0) - finish=fail=true; + fail=true; + if(actions.empty() && fail) + finish=true; } else ++i; } } - //delete progress; - return fail?-1:0; }