X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=7135a8d97b1a42a4e6aa24860ade31c32fa4f9b4;hb=83d2a8a39e0a09733ffc666d7f885fc328b831f2;hp=d9444ce8a2c878d1eed9e4f9a80456460d43ccbc;hpb=76be6f9f3d6ed0b39044938fa7e424284627eac5;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index d9444ce..7135a8d 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,17 +1,23 @@ /* $Id$ This file is part of builder -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ -#include -#include #include -#include +#include +#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,13 +35,23 @@ Distributed under the LGPL #include "sharedlibrary.h" #include "sourcepackage.h" #include "systemlibrary.h" -#include "tarball.h" #include "unlink.h" #include "virtualtarget.h" using namespace std; using namespace Msp; +namespace { + +void update_hash(string &hash, const string &value) +{ + for(unsigned i=0; i ...]"; + helpmsg=getopt.generate_help(); getopt(argc, argv); if(!analyze_mode.empty()) @@ -112,97 +135,240 @@ Builder::Builder(int argc, char **argv): cmdline_targets.push_back("default"); if(!work_dir.empty()) - chdir(work_dir.c_str()); + FS::chdir(work_dir); - cwd=getcwd(); + cwd=FS::getcwd(); - Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second; - native_arch.set_tool("CC", "gcc"); - native_arch.set_tool("CXX", "g++"); - native_arch.set_tool("LD", "gcc"); - native_arch.set_tool("LXX", "g++"); - native_arch.set_tool("AR", "ar"); + utsname un; + string sysname="native"; + if(uname(&un)==0) + sysname=tolower(un.sysname); - const char *home=getenv("HOME"); - if(home) - load_build_file((Path(home)/".builderrc").str()); -} + native_arch=&archs.insert(ArchMap::value_type(sysname, Architecture(*this, sysname, true))).first->second; + native_arch->set_tool("CC", "gcc"); + native_arch->set_tool("CXX", "g++"); + native_arch->set_tool("LD", "gcc"); + native_arch->set_tool("LXX", "g++"); + native_arch->set_tool("AR", "ar"); -/** -Gets a package with the specified name, possibly creating it. + load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str()); + load_build_file((FS::get_home_dir()/".builderrc").str()); -@param n Package name + if(arch.empty()) + current_arch=native_arch; + else + current_arch=&get_architecture(arch); -@return Pointer to the package, or 0 if the package could not be located -*/ -Package *Builder::get_package(const string &n) + if(prfx.empty()) + { + if(current_arch->is_native()) + prefix=(FS::get_home_dir()/"local").str(); + else + prefix=(FS::get_home_dir()/"local"/current_arch->get_name()).str(); + } + else + prefix=FS::getcwd()/prfx; + + warnings.push_back("all"); + warnings.push_back("extra"); + warnings.push_back("shadow"); + warnings.push_back("pointer-arith"); + warnings.push_back("error"); + for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i) + { + vector warns=split(*i, ','); + warnings.insert(warnings.end(), warns.begin(), warns.end()); + } + + pkg_path.push_back(cwd/"."); + pkg_path.push_back(cwd/".."); +} + +Builder::~Builder() { - PackageMap::iterator i=packages.find(n); - if(i!=packages.end()) - return i->second; + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + delete i->second; + for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) + delete i->second; + delete analyzer; +} - // Try to get source directory with pkgconfig +int Builder::main() +{ + if(prefix.str()!="/usr") + { + FS::Path pcdir=prefix/"lib"/"pkgconfig"; + if(const char *pcp=getenv("PKG_CONFIG_PATH")) + { + vector path=split(pcp, ':'); + bool found=false; + for(vector::const_iterator i=path.begin(); (!found && i!=path.end()); ++i) + found=(*i==pcdir.str()); + if(!found) + { + path.push_back(pcdir.str()); + setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true); + } + } + else + setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true); + } + + if(load_build_file(cwd/build_file)) + { + if(help) + { + usage(0, "builder", false); + return 0; + } + else + { + IO::print(IO::cerr, "No build info here.\n"); + return 1; + } + } + + main_pkg->configure(cmdline_options, conf_all?2:1); + + if(help) + { + usage(0, "builder", false); + IO::print("\n"); + package_help(); + return 0; + } + + if(!conf_only && create_targets()) + return 1; + + PackageList all_reqs=main_pkg->collect_requires(); + + if(conf_only) + return 0; + + if(verbose>=2) + IO::print("Building on %s, for %s\n", native_arch->get_name(), current_arch->get_name()); + if(verbose>=1) + IO::print("%d active packages, %d targets\n", all_reqs.size(), targets.size()); + if(verbose>=2) + { + for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + { + IO::print(" %s", (*i)->get_name()); + if(dynamic_cast(*i)) + IO::print("*"); + unsigned count=0; + unsigned ood_count=0; + for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j) + if(j->second->get_package()==*i) + { + ++count; + if(j->second->get_rebuild()) + ++ood_count; + } + if(count) + { + IO::print(" (%d targets", count); + if(ood_count) + IO::print(", %d out-of-date", ood_count); + IO::print(")"); + } + IO::print("\n"); + } + } + + if(analyzer) + analyzer->analyze(); + + if(!problems.empty()) + { + IO::print(IO::cerr, "The following problems were detected:\n"); + for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i) + IO::print(IO::cerr, " %s: %s\n", i->package, i->descr); + IO::print(IO::cerr, "Please fix them and try again.\n"); + return 1; + } + + if(clean) + exit_code=do_clean(); + else if(build) + exit_code=do_build(); + + return exit_code; +} + +string Builder::run_pkgconfig(const string &pkg, const string &what) +{ list argv; argv.push_back("pkg-config"); - argv.push_back("--variable=source"); - argv.push_back(n); + if(what=="cflags" || what=="libs") + argv.push_back("--"+what); + else if(what=="flags") + { + argv.push_back("--cflags"); + argv.push_back("--libs"); + } + else + argv.push_back("--variable="+what); + argv.push_back(pkg); + if(verbose>=4) - cout<<"Running "<second; - break; - } + IO::print("Running %s\n", join(argv.begin(), argv.end())); + + int status; + string res=run_command(argv, &status); + if(status) + throw Exception(format("pkg-config for package %s failed", pkg)); + + return res; +} + +Package *Builder::get_package(const string &name) +{ + PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch->get_name())); + if(i==packages.end()) + i=packages.find(name); + if(i!=packages.end()) + return i->second; - // Package source not found - create a binary package - Package *pkg=BinaryPackage::from_pkgconfig(*this, n); + FS::Path path=get_package_location(name); + if(!path.empty() && !load_build_file(path/"Build")) + { + i=packages.find(name); + if(i!=packages.end()) + return i->second; + } - packages.insert(PackageMap::value_type(n, pkg)); + Package *pkg=0; + try + { + // Package source not found - create a binary package + pkg=BinaryPackage::from_pkgconfig(*this, name); + } + catch(...) + { + problem(name, "not found"); + } - if(!pkg) - problem(n, "not found"); + packages.insert(PackageMap::value_type(name, pkg)); return pkg; } -/** -Returns the target with the given name, or 0 if no such target exists. -*/ Target *Builder::get_target(const string &n) const { + // XXX Used for getting targets by path. get_target(const FS::Path &)? TargetMap::const_iterator i=targets.find(n); if(i!=targets.end()) return i->second; 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 &arch, const string &from, const list &path) +Target *Builder::get_header(const string &include, const FS::Path &from, const list &path) { string hash(8, 0); - update_hash(hash, from); + if(include[0]=='\"') + update_hash(hash, from.str()); for(list::const_iterator i=path.begin(); i!=path.end(); ++i) update_hash(hash, *i); @@ -215,10 +381,10 @@ Target *Builder::get_header(const string &include, const string &arch, const str if(cxx_ver.empty()) { StringList argv; - argv.push_back(get_architecture(arch).get_tool("CXX")); + argv.push_back(current_arch->get_tool("CXX")); argv.push_back("--version"); - cxx_ver=Regex(" ([0-9.]+) ").match(run_command(argv))[1].str; - while(!cxx_ver.empty() && !exists(Path("/usr/include/c++")/cxx_ver)) + cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str; + while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver)) { unsigned dot=cxx_ver.rfind('.'); if(dot==string::npos) @@ -226,73 +392,61 @@ Target *Builder::get_header(const string &include, const string &arch, const str cxx_ver.erase(dot); } if(verbose>=5) - cout<<"C++ version is "<=5) - cout<<"Looking for include "<is_native()) syspath.push_back("/usr/include"); else - syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib"); - syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str()); + syspath.push_back("/usr/"+current_arch->get_prefix()+"/include"); + syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str()); Target *tgt=0; - for(list::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) - tgt=get_header(Path(*j)/fn); + if(include[0]=='\"') + tgt=get_header(FS::Path(from)/fn); for(list::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) tgt=get_header(cwd/ *j/fn); + for(list::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) + tgt=get_header(FS::Path(*j)/fn); includes.insert(TargetMap::value_type(id, tgt)); return tgt; } -/** -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 / static mode - -@return Some kind of library target, if a match was found -*/ -Target *Builder::get_library(const string &lib, const string &arch, const list &path, LibMode mode) +Target *Builder::get_library(const string &lib, const list &path, LibMode mode) { string hash(8, 0); for(list::const_iterator i=path.begin(); i!=path.end(); ++i) update_hash(hash, *i); - //XXX Incorporate mode into id - string id=hash+lib; + string id=hash+string(1, mode)+lib; TargetMap::iterator i=libraries.find(id); if(i!=libraries.end()) return i->second; StringList syspath; - if(arch=="native") + if(current_arch->is_native()) { syspath.push_back("/lib"); syspath.push_back("/usr/lib"); } else - syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib"); + syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib"); if(verbose>=5) - cout<<"Looking for library "<second; } @@ -327,171 +481,94 @@ void Builder::problem(const string &p, const string &d) problems.push_back(Problem(p, d)); } -/** -Adds a target to both the target map and the new target queue. Called from -Target constructor. -*/ void Builder::add_target(Target *t) { targets.insert(TargetMap::value_type(t->get_name(), t)); new_tgts.push_back(t); } -int Builder::main() +void Builder::usage(const char *reason, const char *argv0, bool brief) { - if(load_build_file(cwd/build_file)) - { - cerr<<"No build info here.\n"; - return 1; - } - - main_pkg->configure(cmdline_options, conf_all?2:1); + if(reason) + IO::print(IO::cerr, "%s\n", reason); - if(help) + if(brief) + IO::print(IO::cerr, "Usage: %s\n", usagemsg); + else { - usage(0, "builder", false); - cout<<'\n'; - package_help(); - return 0; + IO::print(IO::cerr, "Usage: %s [options] [ ...]\n\n", argv0); + IO::print(IO::cerr, "Options:\n"); + IO::print(IO::cerr, helpmsg); } +} - if(!conf_only && create_targets()) - return 1; - - PackageList all_reqs=main_pkg->collect_requires(); +FS::Path Builder::get_package_location(const string &name) +{ + if(verbose>=3) + IO::print("Looking for package %s\n", name); - for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + try { - SourcePackage *spkg=dynamic_cast(*i); - string prob; - if(spkg && spkg->get_arch()!=main_pkg->get_arch()) - problem(spkg->get_name(), format("wrong architecture (%s)", spkg->get_arch())); + // Try to get source directory with pkgconfig + string srcdir=strip(run_pkgconfig(name, "source")); + if(!srcdir.empty()) + return srcdir; } + catch(...) + { } - if(conf_only) - return 0; - - cout<=2) + if(pkg_dirs.empty()) { - for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + for(list::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) { - cout<<' '<<(*i)->get_name(); - if(dynamic_cast(*i)) - cout<<'*'; - unsigned count=0; - unsigned ood_count=0; - for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j) - if(j->second->get_package()==*i) - { - ++count; - if(j->second->get_rebuild()) - ++ood_count; - } - if(count) + list files=list_files(*i); + for(list::const_iterator j=files.begin(); j!=files.end(); ++j) { - cout<<" ("<=3) + IO::print("%d packages found in path\n", pkg_dirs.size()); } - if(analyzer) - analyzer->analyze(); - - if(!problems.empty()) + bool msp=!name.compare(0, 3, "msp"); + for(list::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i) { - cerr<<"The following problems were detected:\n"; - for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i) - cerr<<" "<package<<": "<descr<<'\n'; - cerr<<"Please fix them and try again.\n"; - return 1; - } + string base=basename(*i); + unsigned dash=base.rfind('-'); - //if(create_makefile - - if(clean) - exit_code=do_clean(); - else if(build) - exit_code=do_build(); - - return exit_code; -} + if(!base.compare(0, dash, name)) + return *i; + else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) + return *i; + } -Builder::~Builder() -{ - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - delete i->second; - for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) - delete i->second; - delete analyzer; + return FS::Path(); } -void Builder::usage(const char *reason, const char *argv0, bool brief) +int Builder::load_build_file(const FS::Path &fn) { - if(reason) - cerr< ...]"; - else + try { - 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" - " -P, --progress Display progress while building.\n" - " -W, --what-if FILE Pretend that FILE has changed.\n" - " --conf-only Stop after configuring packages.\n" - " --full-paths Output full paths in analysis.\n" - //" --makefile Create a makefile for this package.\n" - " --max-depth NUM Maximum depth to show in analysis.\n"; - } -} - -/** -Loads the given build file. + IO::BufferedFile in(fn.str()); -@param fn Path to the file + if(verbose>=3) + IO::print("Reading %s\n", fn); -@return 0 on success, -1 if the file could not be opened -*/ -int Builder::load_build_file(const Path &fn) -{ - ifstream in(fn.str().c_str()); - if(!in) + DataFile::Parser parser(in, fn.str()); + Loader loader(*this, fn.subpath(0, fn.size()-1)); + loader.load(parser); + } + catch(const IO::FileNotFound &) + { return -1; - - if(verbose>=3) - cout<<"Reading "<add_depend(new Install(*this, *spkg, *pc)); } - - tarballs->add_depend(new TarBall(*this, *spkg)); } // Find dependencies until no new targets are created @@ -541,7 +616,7 @@ int Builder::create_targets() Target *tgt=get_target((cwd/ *i).str()); if(!tgt) { - cerr<<"Unknown what-if target "<<*i<<'\n'; + IO::print(IO::cerr, "Unknown what-if target %s\n", *i); return -1; } tgt->touch(); @@ -557,7 +632,7 @@ int Builder::create_targets() tgt=get_target((cwd/ *i).str()); if(!tgt) { - cerr<<"I don't know anything about "<<*i<<'\n'; + IO::print("I don't know anything about %s\n", *i); return -1; } if(tgt==world) @@ -566,8 +641,10 @@ int Builder::create_targets() } /* If world is to be built, prepare cmdline. If not, add cmdline to world - and prepare world. I don't really like this, but it keeps the graph - acyclic. */ + and prepare world. I don't really like this, but it keeps the graph + acyclic. + + XXX Could we skip preparing targets we are not interested in? */ if(build_world) cmdline->prepare(); else @@ -583,16 +660,12 @@ int Builder::create_targets() return 0; } -/** -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 &fn) +Target *Builder::get_header(const FS::Path &fn) { Target *tgt=get_target(fn.str()); if(tgt) return tgt; - if(exists(fn)) + if(FS::is_reg(fn)) { tgt=new SystemHeader(*this, fn.str()); return tgt; @@ -600,15 +673,18 @@ Target *Builder::get_header(const Msp::Path &fn) return 0; } -Target *Builder::get_library(const string &lib, const string &arch, const Path &path, LibMode mode) +Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode) { // Populate a list of candidate filenames StringList candidates; if(mode!=ALL_STATIC) { - if(arch=="win32") + if(current_arch->get_name()=="win32") + { candidates.push_back("lib"+lib+".dll"); + candidates.push_back(lib+".dll"); + } else candidates.push_back("lib"+lib+".so"); } @@ -616,7 +692,7 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path & /* Static libraries are always considered, since sometimes shared versions may not be available */ candidates.push_back("lib"+lib+".a"); - if(arch=="win32") + if(current_arch->get_name()=="win32") candidates.push_back("lib"+lib+".dll.a"); for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i) @@ -627,8 +703,8 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path & if(tgt) { Target *real_tgt=tgt; - if(dynamic_cast(tgt)) - real_tgt=real_tgt->get_depends().front(); + if(Install *inst=dynamic_cast(tgt)) + real_tgt=&inst->get_source(); /* Ignore dynamic libraries from local packages unless library mode is DYNAMIC */ @@ -637,7 +713,7 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path & else if(tgt) return tgt; } - else if(exists(full)) + else if(FS::is_reg(full)) { tgt=new SystemLibrary(*this, full); return tgt; @@ -647,19 +723,6 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path & return 0; } -/** -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; icount_rebuild(); if(!total) { - cout<<"Already up to date\n"; + IO::print("Already up to date\n"); return 0; } - cout<<"Will build "<=1) + IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : "")); vector actions; @@ -691,10 +755,7 @@ int Builder::do_build() actions.push_back(action); if(show_progress) - { - cout<get_buildable() && (tgt->get_package()==main_pkg || clean>=2)) + if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2)) clean_tgts.insert(tgt); const TargetList &deps=tgt->get_depends(); @@ -758,44 +815,46 @@ int Builder::do_clean() } for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) - { - Action *action=new Unlink(*this, **i); - while(action->check()<0); - delete action; - } + if(FileTarget *ft=dynamic_cast(*i)) + { + Action *action=new Unlink(*this, *ft); + while(action->check()<0) ; + delete action; + } return 0; } -/** -Prints out information about the default package. -*/ void Builder::package_help() { const Config &config=main_pkg->get_config(); const Config::OptionMap &options=config.get_options(); - cout<<"Required packages:\n "; + IO::print("Required packages:\n "); const PackageList &requires=main_pkg->get_requires(); for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { if(i!=requires.begin()) - cout<<", "; - cout<<(*i)->get_name(); + IO::print(", "); + IO::print((*i)->get_name()); } - cout<<"\n\n"; - cout<<"Package configuration:\n"; + IO::print("\n\nPackage configuration:\n"); for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i) { const Config::Option &opt=i->second; - cout<<" "< Builder::reg; +string Builder::usagemsg; +string Builder::helpmsg; -Builder::Loader::Loader(Builder &b, const Path &s): +Builder::Loader::Loader(Builder &b, const FS::Path &s): bld(b), src(s) { @@ -822,7 +881,8 @@ void Builder::Loader::binpkg(const string &n) void Builder::Loader::profile(const string &n) { StringMap prf; - load_sub(prf); + ProfileLoader ldr(prf); + load_sub_with(ldr); bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf)); }