X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=38fbc1703f2d3bd7c68e17dc1dc9770a832284a3;hb=4f78d9f016482ce1ac7d726852e33e07c090df1b;hp=2c137ca406841a1159269851f8177261504c91c9;hpb=e36dac301c41799d374b6d537129b2be63f05fb2;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 2c137ca..38fbc17 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,30 @@ 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("conf-only", 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 +74,19 @@ 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']; + conf_only=getopt["conf-only"]; + build_file=getopt['f'].arg(); + build_all=getopt['B']; + help=getopt['h']; if(getopt['C']) chdir(getopt['C'].arg().c_str()); @@ -90,6 +103,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 +123,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 +134,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,7 +150,8 @@ 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)); if(pkg) @@ -149,56 +171,87 @@ 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. If a matching target +is not found but a file exists, a new SystemHeader target will be created and +returned. +*/ 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; string fn=include.substr(1); Target *tgt=0; - if(include[0]=='"' && (tgt=check_header(Path::Path(from)/fn))) - return tgt; - if((tgt=check_header(Path::Path("/usr/include")/fn))) - return tgt; - 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))) - return tgt; + if(include[0]=='"' && (tgt=get_header(Path::Path(from)/fn))) + ; + else if((tgt=get_header(Path::Path("/usr/include")/fn))) + ; + //XXX Determine the C++ header location dynamically + else if((tgt=get_header(Path::Path("/usr/include/c++/4.1.2")/fn))) + ; + else + { + for(list::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j) + tgt=get_header(cwd/ *j/fn); + } + + includes.insert(TargetMap::value_type(id, tgt)); - return 0; + return tgt; } -Target *Builder::get_library(const string &lib, const list &path) +/** +Tries to locate a library with the given library path. Considers known targets +as well as existing files. If a matching target is not found but a file exists, +a new SystemLibrary target will be created and returned. + +@param lib Name of the library to get (without "lib" prefix or extension) +@param path List of paths to search for the library +@param mode Shared / shared mode - 0: always shared, 1: static for buildable + packages, otherwise shared, 2: always static + +@return Some kind of library target, if a match was found +*/ +Target *Builder::get_library(const string &lib, const list &path, unsigned mode) { 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 basename="lib"+lib+".so"; - for(list::const_iterator i=path.begin(); i!=path.end(); ++i) + //XXX Incorporate mode into id + string id=hash+lib; + TargetMap::iterator i=libraries.find(id); + if(i!=libraries.end()) + return i->second; + + Target *tgt=0; + if((tgt=get_library(lib, "/lib", mode))) + ; + else if((tgt=get_library(lib, "/usr/lib", mode))) + ; + else { - string full=(Path::Path(*i)/basename).str(); - Target *tgt=get_target(full); - if(tgt) return tgt; - - if(Path::exists(full)) - { - add_target(tgt=new SystemLibrary(*this, full)); - return tgt; - } + for(list::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j) + tgt=get_library(lib, cwd/ *j, mode); } - return 0; + libraries.insert(TargetMap::value_type(id, tgt)); + + return tgt; } int Builder::main() { - if(load_build_file(cwd/"Build")) + if(load_build_file(cwd/build_file)) { cerr<<"No build info here.\n"; return 1; @@ -209,13 +262,21 @@ 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(); } - std::list missing; + default_pkg->configure(cmdline_options, conf_all?2:1); + + if(help) + { + 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); @@ -230,7 +291,8 @@ int Builder::main() return 1; } - default_pkg->create_build_info(); + if(conf_only) + return 0; if(create_targets()) return 1; @@ -244,17 +306,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; } @@ -268,6 +343,42 @@ 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" + " --conf-only Stop after configuring packages.\n" + " --full-paths Output full paths in analysis.\n" + " --max-depth NUM Maximum depth to show in analysis.\n"; + } +} + +/** +Loads the given build file. + +@param fn Path to the file + +@return 0 on success, -1 if the file could not be opened +*/ int Builder::load_build_file(const Path::Path &fn) { ifstream in(fn.str().c_str()); @@ -281,6 +392,12 @@ int Builder::load_build_file(const Path::Path &fn) return 0; } +/** +Creates targets for all packages and prepares them for building. + +@return 0 if everything went ok, -1 if something bad happened and a build + shouldn't be attempted +*/ int Builder::create_targets() { Target *world=new VirtualTarget(*this, "world"); @@ -308,13 +425,21 @@ int Builder::create_targets() const ComponentList &components=i->second->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) { + // Collect all files belonging to the component PathList files; 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); } bool build_exe=j->get_type()!=Component::HEADERS; @@ -324,17 +449,15 @@ int Builder::create_targets() { string basename=(*k)[-1]; string ext=Path::splitext(basename).ext; - if(ext==".cpp" || ext==".c") + if((ext==".cpp" || ext==".c") && build_exe) { - if(build_exe) - { - SourceFile *src=new SourceFile(*this, &*j, k->str()); - add_target(src); - - ObjectFile *obj=new ObjectFile(*this, *j, *src); - add_target(obj); - objs.push_back(obj); - } + SourceFile *src=new SourceFile(*this, &*j, k->str()); + add_target(src); + + // Compile sources + ObjectFile *obj=new ObjectFile(*this, *j, *src); + add_target(obj); + objs.push_back(obj); } else if(ext==".h") { @@ -344,6 +467,8 @@ int Builder::create_targets() hdr=new Header(*this, &*j, k->str()); add_target(hdr); } + + // Install headers if requested if(!j->get_install_headers().empty()) { Path::Path inst_path=inst_base/"include"/j->get_install_headers()/basename; @@ -356,12 +481,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()) { @@ -375,12 +516,20 @@ 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); + } } } } } } + // Find dependencies until no new targets are created while(!new_tgts.empty()) { Target *tgt=new_tgts.front(); @@ -390,6 +539,19 @@ int Builder::create_targets() new_tgts.push_back(tgt); } + // Apply what-ifs + for(StringList::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(); + } + + // Make the cmdline target depend on all targets mentioned on the command line Target *cmdline=new VirtualTarget(*this, "cmdline"); add_target(cmdline); world->add_depend(cmdline); @@ -411,7 +573,11 @@ int Builder::create_targets() return 0; } -Target *Builder::check_header(const Msp::Path::Path &fn) +/** +Check if a header exists, either as a target or a file. Either an existing +target or a new SystemHeader target will be returned. +*/ +Target *Builder::get_header(const Msp::Path::Path &fn) { Target *tgt=get_target(fn.str()); if(tgt) return tgt; @@ -424,12 +590,55 @@ Target *Builder::check_header(const Msp::Path::Path &fn) return 0; } +Target *Builder::get_library(const string &lib, const Path::Path &path, unsigned mode) +{ + string full; + if(mode>=1) + { + full=(path/("lib"+lib+".a")).str(); + Target *tgt=get_target(full); + // Targets can only be associated with buildable packages (or no package at all) + if(tgt && (tgt->get_package() || mode==2)) return tgt; + } + if(mode<=1) + { + full=(path/("lib"+lib+".so")).str(); + Target *tgt=get_target(full); + if(tgt) return tgt; + } + + if(Path::exists(full)) + { + Target *tgt=new SystemLibrary(*this, full); + add_target(tgt); + return tgt; + } + + return 0; +} + +/** +Adds a target to both the target map and the new target queue. +*/ void Builder::add_target(Target *t) { targets.insert(TargetMap::value_type(t->get_name(), t)); new_tgts.push_back(t); } +/** +Updates a hash with a string. This is used from get_header and get_library. +*/ +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; @@ -462,12 +667,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); @@ -507,11 +706,34 @@ int Builder::build() } } - //delete progress; - return fail?-1:0; } +/** +Prints out information about the default package. +*/ +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):