X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=5a1d624390fa45250bab4451b3196693d5d46dc9;hb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;hp=1de726bcb2b3393f267e363741525da20d6c72e6;hpb=cbb3c4c6aab7b04f7bd2178fb8f12846d532a472;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 1de726b..5a1d624 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -17,6 +18,8 @@ #include "misc.h" #include "objectfile.h" #include "package.h" +#include "sharedlibrary.h" +#include "staticlibrary.h" #include "systemlibrary.h" #include "virtualtarget.h" @@ -24,26 +27,29 @@ using namespace std; using namespace Msp; Builder::Builder(int argc, char **argv): - verbose(1), - cwd(Path::getcwd()), analyzer(0), - jobs(1), - chrome(false) + do_build(true), + verbose(1), + chrome(false), + build_file("Build"), + jobs(1) { GetOpt getopt; - getopt.add_option(GetOpt::Option('v', "verbose", GetOpt::NONE)); getopt.add_option(GetOpt::Option('a', "analyze", GetOpt::REQUIRED)); getopt.add_option(GetOpt::Option('b', "build", GetOpt::NONE)); - getopt.add_option(GetOpt::Option("max-depth", GetOpt::REQUIRED)); + getopt.add_option(GetOpt::Option('c', "clean", GetOpt::NONE)); + getopt.add_option(GetOpt::Option('f', "file", GetOpt::REQUIRED, "Build")); + getopt.add_option(GetOpt::Option('h', "help", GetOpt::NONE)); + getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED, "1")); getopt.add_option(GetOpt::Option('n', "dry-run", GetOpt::NONE)); - getopt.add_option(GetOpt::Option('W', "what-if", GetOpt::REQUIRED)); + getopt.add_option(GetOpt::Option('v', "verbose", GetOpt::NONE)); + getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE)); 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('h', "help", GetOpt::NONE)); - getopt.add_option(GetOpt::Option('c', "clean", GetOpt::NONE)); + getopt.add_option(GetOpt::Option('W', "what-if", GetOpt::REQUIRED)); getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE)); getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE)); + getopt.add_option(GetOpt::Option("max-depth", GetOpt::REQUIRED)); int index=getopt(argc, argv); verbose+=getopt['v'].count(); @@ -67,13 +73,18 @@ 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']; + help=getopt['h']; if(getopt['C']) chdir(getopt['C'].arg().c_str()); @@ -90,6 +101,11 @@ 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()); + + cwd=Path::getcwd(); } /** @@ -105,6 +121,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 +132,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 +148,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 +169,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,10 +191,11 @@ 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) - if((tgt=check_header(Path::Path(*j)/fn))) + if((tgt=check_header(cwd/ *j/fn))) return tgt; return 0; @@ -172,13 +205,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=(cwd/ *j/basename).str(); Target *tgt=get_target(full); if(tgt) return tgt; @@ -194,7 +231,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,25 +242,28 @@ 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(); } - std::list missing; - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + if(help) { - 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()); + usage("builder", false); + cout<<'\n'; + package_help(); + return 0; } + StringList missing; + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + 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'; @@ -245,17 +285,30 @@ 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; } @@ -269,6 +322,34 @@ Builder::~Builder() delete analyzer; } +void Builder::usage(const char *argv0, bool brief) +{ + if(brief) + cerr<<"Usage: "< ...]"; + else + { + cerr<< + "Usage: "< ...]\n" + "\n" + "Options:\n" + " -a, --analyze MODE Perform analysis. MODE can be deps, alldeps or rebuild.\n" + " -b, --build Perform build even if doing analysis.\n" + " -c, --clean Clean buildable targets.\n" + " -f, --file FILE Read info from FILE instead of Build.\n" + " -h, --help Print this message.\n" + " -j, --jobs NUM Run NUM commands at once, whenever possible.\n" + " -n, --dry-run Don't actually do anything, only show what would be done.\n" + " -v, --verbose Print more information about what's going on.\n" + " -A, --conf-all Apply configuration to all packages.\n" + " -B, --build-all Build all targets unconditionally.\n" + " -C, --chdir DIR Change to DIR before doing anything else.\n" + " -W, --what-if FILE Pretend that FILE has changed.\n" + " --chrome Use extra chrome to print status.\n" + " --full-paths Output full paths in analysis.\n" + " --max-depth NUM Maximum depth to show in analysis.\n"; + } +} + int Builder::load_build_file(const Path::Path &fn) { ifstream in(fn.str().c_str()); @@ -302,6 +383,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) { @@ -309,13 +394,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; @@ -355,12 +445,28 @@ int Builder::create_targets() if(build_exe) { - Executable *exe=new Executable(*this, *j, objs); + Executable *exe=0; + StaticLibrary *slib=0; + if(j->get_type()==Component::LIBRARY) + { + exe=new SharedLibrary(*this, *j, objs); + slib=new StaticLibrary(*this, *j, objs); + add_target(slib); + } + else + exe=new Executable(*this, *j, objs); + add_target(exe); if(i->second==default_pkg) + { def_tgt->add_depend(exe); + if(slib) def_tgt->add_depend(slib); + } else + { world->add_depend(exe); + if(slib) world->add_depend(slib); + } if(j->get_install()) { @@ -374,6 +480,13 @@ int Builder::create_targets() Install *inst=new Install(*this, *i->second, *exe, (inst_base/inst_dir/Path::basename(exe->get_name())).str()); add_target(inst); install->add_depend(inst); + + if(slib) + { + inst=new Install(*this, *i->second, *slib, (inst_base/inst_dir/Path::basename(slib->get_name())).str()); + add_target(inst); + install->add_depend(inst); + } } } } @@ -385,6 +498,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"); @@ -427,6 +553,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; @@ -459,12 +591,6 @@ int Builder::build() Target *tgt=cmdline->get_buildable_target(); if(tgt) { - /*if(chrome) - { - cout<<"\e["<set(count); - cout<<"\e["<build(); if(action) actions.push_back(action); @@ -504,11 +630,31 @@ int Builder::build() } } - //delete progress; - return fail?-1:0; } +void Builder::package_help() +{ + const Config &config=default_pkg->get_config(); + const Config::OptionMap &options=config.get_options(); + + cout<<"Required packages:\n "; + const PkgRefList &requires=default_pkg->get_requires(); + for(PkgRefList::const_iterator i=requires.begin(); i!=requires.end(); ++i) + { + if(i!=requires.begin()) + cout<<", "; + cout<get_name(); + } + cout<<"\n\n"; + cout<<"Package configuration:\n"; + for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i) + { + const Config::Option &opt=i->second; + cout<<" "< Builder::reg; Builder::Loader::Loader(Builder &b, const Path::Path &s):