X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=3c58f0245ecc773fa4945a9f6c614409b94151c6;hb=409a427f912f9c203b102beed0816b53b250931f;hp=553a3e159afbe01e7487ad35b6cf337ae909974c;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 553a3e1..3c58f02 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,22 +1,30 @@ /* $Id$ This file is part of builder -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2010 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 #include #include #include "action.h" #include "analyzer.h" +#include "binarypackage.h" #include "builder.h" #include "header.h" #include "install.h" @@ -24,6 +32,7 @@ Distributed under the LGPL #include "package.h" #include "pkgconfig.h" #include "sharedlibrary.h" +#include "sourcepackage.h" #include "systemlibrary.h" #include "unlink.h" #include "virtualtarget.h" @@ -31,14 +40,27 @@ Distributed under the LGPL 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()) { - analyzer=new Analyzer(*this); + analyzer = new Analyzer(*this); if(analyze_mode=="deps") analyzer->set_mode(Analyzer::DEPS); @@ -90,12 +120,12 @@ Builder::Builder(int argc, char **argv): analyzer->set_full_paths(full_paths); } else if(!clean && !create_makefile) - build=true; + build = true; - const list &args=getopt.get_args(); - for(list::const_iterator i=args.begin(); i!=args.end(); ++i) + const vector &args = getopt.get_args(); + for(vector::const_iterator i=args.begin(); i!=args.end(); ++i) { - unsigned equal=i->find('='); + string::size_type equal = i->find('='); if(equal!=string::npos) cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1))); else @@ -106,218 +136,358 @@ 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=Path::getcwd(); + cwd = FS::getcwd(); - archs.insert(StringMap::value_type("native", "")); - archs.insert(StringMap::value_type("arm", "arm-linux-gnu")); - archs.insert(StringMap::value_type("win32", "i586-mingw32msvc")); + 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"); - StringMap &native_tools=tools.insert(ToolMap::value_type("native", StringMap())).first->second; - native_tools.insert(StringMap::value_type("CC", "gcc")); - native_tools.insert(StringMap::value_type("CXX", "g++")); - native_tools.insert(StringMap::value_type("LD", "gcc")); - native_tools.insert(StringMap::value_type("LDXX", "g++")); - native_tools.insert(StringMap::value_type("AR", "ar")); + load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str()); + load_build_file((FS::get_user_data_dir("builder")/"rc").str()); - StringMap &release_profile=profile_tmpl.insert(ProfileTemplateMap::value_type("release", StringMap())).first->second; - release_profile.insert(StringMap::value_type("optimize", "3")); - release_profile.insert(StringMap::value_type("outdir", "$profile")); + if(arch.empty()) + current_arch = &native_arch; + else + current_arch = new Architecture(*this, arch); - StringMap &debug_profile=profile_tmpl.insert(ProfileTemplateMap::value_type("debug", StringMap())).first->second; - debug_profile.insert(StringMap::value_type("debug", "1")); - debug_profile.insert(StringMap::value_type("outdir", "$profile")); + if(!current_arch->is_native()) + { + for(StringMap::const_iterator i=cross_prefixes.begin(); i!=cross_prefixes.end(); ++i) + if(current_arch->match_name(i->first)) + { + current_arch->set_cross_prefix(i->second); + break; + } + } - for(StringMap::iterator i=archs.begin(); i!=archs.end(); ++i) + if(prfx.empty()) { - if(i->first=="native") - continue; + 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/".."); +} - StringMap &arch_profile=profile_tmpl.insert(ProfileTemplateMap::value_type(i->first, StringMap())).first->second; - arch_profile.insert(StringMap::value_type("arch", i->first)); - arch_profile.insert(StringMap::value_type("prefix", "$HOME/local/$arch")); - arch_profile.insert(StringMap::value_type("outdir", "$profile")); +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; +} + +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) + return 0; + + if(create_targets()) + return 1; + + if(verbose>=2) + { + IO::print("Building on %s, for %s%s\n", native_arch.get_name(), + current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")); + IO::print("Prefix is %s\n", prefix); + } + + if(verbose>=1) + { + unsigned n_packages = 0; + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + if(i->second && i->second->is_configured()) + ++n_packages; + IO::print("%d active packages, %d targets\n", n_packages, targets.size()); + } + + if(verbose>=2) + { + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + { + if(!i->second->is_configured()) + continue; + + IO::print(" %s", i->second->get_name()); + if(dynamic_cast(i->second)) + IO::print("*"); + unsigned count = 0; + unsigned to_be_built = 0; + for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j) + if(j->second->get_package()==i->second) + { + ++count; + if(j->second->get_rebuild()) + ++to_be_built; + } + if(count) + { + IO::print(" (%d targets", count); + if(to_be_built) + IO::print(", %d to be built", to_be_built); + 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); + if(!analyzer) + 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; } -/** -Gets a package with the specified name, possibly creating it. +string Builder::run_pkgconfig(const string &pkg, const string &what) +{ + list argv; + argv.push_back("pkg-config"); + 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) + IO::print("Running %s\n", join(argv.begin(), argv.end())); -@param n Package name + int status; + string res = run_command(argv, &status); + if(status) + throw Exception(format("pkg-config for package %s failed", pkg)); -@return Pointer to the package, or 0 if the package could not be located -*/ -Package *Builder::get_package(const string &n) + return res; +} + +Package *Builder::get_package(const string &name) { - PackageMap::iterator i=packages.find(n); + PackageMap::iterator i = packages.find(format("%s/%s", name, current_arch->get_system())); + if(i==packages.end()) + i = packages.find(name); 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"); - argv.push_back(n); - string srcdir=strip(run_command(argv)); - - PathList dirs; - 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")) + if(!no_externals) + { + FS::Path path = get_package_location(name); + if(!path.empty() && !load_build_file(path/"Build")) { - i=packages.find(n); + i = packages.find(name); if(i!=packages.end()) 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) - new_pkgs.push_back(pkg); + Package *pkg = 0; + try + { + // Package source not found - create a binary package + pkg = BinaryPackage::from_pkgconfig(*this, name); + } + catch(...) + { + problem(name, "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 { - TargetMap::const_iterator i=targets.find(n); + // 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 &, 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); - string id=hash+include; - TargetMap::iterator i=includes.find(id); + 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=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 + static string cxx_ver; + if(cxx_ver.empty()) { - for(list::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j) - tgt=get_header(cwd/ *j/fn); + StringList argv; + argv.push_back(current_arch->get_tool("CXX")); + argv.push_back("--version"); + if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv))) + { + cxx_ver = m[0].str; + while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver)) + { + string::size_type dot = cxx_ver.rfind('.'); + if(dot==string::npos) + break; + cxx_ver.erase(dot); + } + if(verbose>=5) + IO::print("C++ version is %s\n", cxx_ver); + } + else + cxx_ver = "-"; } + string fn = include.substr(1); + if(verbose>=5) + IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end())); + + StringList syspath; + if(current_arch->is_native()) + syspath.push_back("/usr/include"); + else + syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/include"); + if(cxx_ver!="-") + syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str()); + + Target *tgt = 0; + 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; - TargetMap::iterator i=libraries.find(id); + 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_arch_prefix(arch)+"/lib"); + syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/lib"); - Target *tgt=0; - for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) - tgt=get_library(lib, arch, *j, mode); + if(verbose>=5) + IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end())); + + Target *tgt = 0; for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) - tgt=get_library(lib, arch, cwd/ *j, mode); + tgt = get_library(lib, cwd/ *j, mode); + for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) + tgt = get_library(lib, *j, mode); libraries.insert(TargetMap::value_type(id, tgt)); return tgt; } -const string &Builder::get_arch_prefix(const string &arch) const -{ - StringMap::const_iterator i=archs.find(arch); - if(i==archs.end()) - throw InvalidParameterValue("Unknown architecture"); - - return i->second; -} - -string Builder::get_tool(const std::string &tool, const std::string &arch) -{ - ToolMap::iterator i=tools.find(arch); - if(i!=tools.end()) - { - StringMap::iterator j=i->second.find(tool); - if(j!=i->second.end()) - return j->second; - } - - // Either the arch, or the tool within the arch was not found - i=tools.find("native"); - StringMap::iterator j=i->second.find(tool); - if(j==i->second.end()) - throw InvalidParameterValue("Unknown tool"); - - return get_arch_prefix(arch)+"-"+j->second; -} - void Builder::apply_profile_template(Config &config, const string &pt) const { - vector parts=split(pt, '-'); + vector parts = split(pt, '-'); for(vector::iterator i=parts.begin(); i!=parts.end(); ++i) { - ProfileTemplateMap::const_iterator j=profile_tmpl.find(*i); + ProfileTemplateMap::const_iterator j = profile_tmpl.find(*i); if(j==profile_tmpl.end()) continue; @@ -325,211 +495,143 @@ void Builder::apply_profile_template(Config &config, const string &pt) const } } -/** -Adds a target to both the target map and the new target queue. Called from -Target constructor. -*/ -void Builder::add_target(Target *t) +void Builder::problem(const string &p, const string &d) { - targets.insert(TargetMap::value_type(t->get_name(), t)); - new_tgts.push_back(t); + problems.push_back(Problem(p, d)); } -int Builder::main() +void Builder::add_target(FileTarget *t) { - if(load_build_file(cwd/build_file)) - { - cerr<<"No build info here.\n"; - return 1; - } - - default_pkg=packages.begin()->second; + targets.insert(TargetMap::value_type(t->get_path().str(), t)); + new_tgts.push_back(t); +} - while(!new_pkgs.empty()) - { - Package *pkg=new_pkgs.front(); - new_pkgs.erase(new_pkgs.begin()); - pkg->resolve_refs(); - } +void Builder::add_target(VirtualTarget *t) +{ + targets.insert(TargetMap::value_type(t->get_name(), t)); + new_tgts.push_back(t); +} - default_pkg->configure(cmdline_options, conf_all?2:1); +void Builder::usage(const char *reason, const char *argv0, bool brief) +{ + 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, "Builder 1.0\n\n"); + IO::print(IO::cerr, "Usage: %s [options] [ ...]\n\n", argv0); + IO::print(IO::cerr, "Options:\n"); + IO::print(IO::cerr, helpmsg); } +} - StringMap problems; - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - { - string prob; - if(!i->second) - prob="missing"; - else if(i->second->get_buildable() && i->second->get_arch()!=default_pkg->get_arch()) - prob="wrong architecture ("+i->second->get_arch()+")"; - if(!prob.empty()) - problems.insert(StringMap::value_type(i->first, prob)); - } +FS::Path Builder::get_package_location(const string &name) +{ + if(verbose>=3) + IO::print("Looking for package %s\n", name); - if(!problems.empty()) + try { - cerr<<"The following problems were detected:\n"; - for(StringMap::iterator i=problems.begin(); i!=problems.end(); ++i) - cerr<<" "<first<<": "<second<<'\n'; - cerr<<"Please fix them and try again.\n"; - return 1; + // 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; - - if(create_targets()) - return 1; - - cout<=2) + if(pkg_dirs.empty()) { - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + for(list::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) { - cout<<' '<second->get_name(); - 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; - 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(create_makefile + bool msp = !name.compare(0, 3, "msp"); + for(list::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i) + { + string base = basename(*i); + unsigned dash = base.rfind('-'); - if(clean) - exit_code=do_clean(); - else if(build) - exit_code=do_build(); + if(!base.compare(0, dash, name)) + return *i; + else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) + return *i; + } - return exit_code; + return FS::Path(); } -Builder::~Builder() +int Builder::load_build_file(const FS::Path &fn) { - 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; -} - -void Builder::usage(const char *reason, const char *argv0, bool brief) -{ - 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" - " -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" - //" --makefile Create a makefile for this package.\n" - " --max-depth NUM Maximum depth to show in analysis.\n"; - } -} + IO::BufferedFile in(fn.str()); -/** -Loads the given build file. + if(verbose>=3) + IO::print("Reading %s\n", fn); -@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()); - if(!in) + DataFile::Parser parser(in, fn.str()); + Loader loader(*this, fn.subpath(0, fn.size()-1)); + loader.load(parser); + } + catch(const IO::file_not_found &) + { return -1; - - Parser::Parser parser(in, fn.str()); - Loader loader(*this, fn.subpath(0, fn.size()-1)); - loader.load(parser); + } 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"); + Target *world = new VirtualTarget(*this, "world"); - Target *def_tgt=new VirtualTarget(*this, "default"); + Target *def_tgt = new VirtualTarget(*this, "default"); world->add_depend(def_tgt); - Target *install=new VirtualTarget(*this, "install"); + Target *install = new VirtualTarget(*this, "install"); world->add_depend(install); - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + Target *tarballs = new VirtualTarget(*this, "tarballs"); + world->add_depend(tarballs); + + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { - if(!i->second) + if(!i->second || !i->second->is_configured()) continue; - if(!i->second->get_buildable()) + + SourcePackage *spkg = dynamic_cast(i->second); + if(!spkg) continue; - const ComponentList &components=i->second->get_components(); + const ComponentList &components = spkg->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) j->create_targets(); - if(i->second->get_install_flags()&(Package::LIB|Package::INCLUDE)) + if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE)) { - PkgConfig *pc=new PkgConfig(*this, *i->second); - install->add_depend(new Install(*this, *i->second, *pc)); + PkgConfig *pc = new PkgConfig(*this, *spkg); + install->add_depend(new Install(*this, *spkg, *pc)); } } // Find dependencies until no new targets are created while(!new_tgts.empty()) { - Target *tgt=new_tgts.front(); + Target *tgt = new_tgts.front(); new_tgts.erase(new_tgts.begin()); tgt->find_depends(); if(!tgt->get_depends_ready()) @@ -539,73 +641,66 @@ int Builder::create_targets() // Apply what-ifs for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i) { - Target *tgt=get_target((cwd/ *i).str()); + FileTarget *tgt = dynamic_cast(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(); } // Make the cmdline target depend on all targets mentioned on the command line - Target *cmdline=new VirtualTarget(*this, "cmdline"); - bool build_world=false; + Target *cmdline = new VirtualTarget(*this, "cmdline"); for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) { - Target *tgt=get_target(*i); + Target *tgt = get_target(*i); if(!tgt) - tgt=get_target((cwd/ *i).str()); + 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) - build_world=true; + cmdline->add_depend(tgt); } - /* 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. */ - if(build_world) - cmdline->prepare(); - else - { - world->add_depend(cmdline); - world->prepare(); - } + cmdline->prepare(); + + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + if(SourcePackage *spkg = dynamic_cast(i->second)) + spkg->get_deps_cache().save(); 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::Path &fn) +Target *Builder::get_header(const FS::Path &fn) { - Target *tgt=get_target(fn.str()); + Target *tgt = get_target(fn.str()); if(tgt) return tgt; - if(Path::exists(fn)) + if(FS::is_reg(fn)) { - tgt=new SystemHeader(*this, fn.str()); + tgt = new SystemHeader(*this, fn.str()); return tgt; } return 0; } -Target *Builder::get_library(const string &lib, const string &arch, const Path::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") + // XXX Should probably let the Architecture populate the list + if(current_arch->get_system()=="windows") + { candidates.push_back("lib"+lib+".dll"); + candidates.push_back(lib+".dll"); + } else candidates.push_back("lib"+lib+".so"); } @@ -613,19 +708,17 @@ 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_system()=="windows") candidates.push_back("lib"+lib+".dll.a"); for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i) { - string full=(path/ *i).str(); - Target *tgt=get_target(full); + string full = (path/ *i).str(); + Target *tgt = get_target(full); if(tgt) { - Target *real_tgt=tgt; - if(dynamic_cast(tgt)) - real_tgt=real_tgt->get_depends().front(); + Target *real_tgt = tgt->get_real_target(); /* Ignore dynamic libraries from local packages unless library mode is DYNAMIC */ @@ -634,9 +727,9 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path:: else if(tgt) return tgt; } - else if(Path::exists(full)) + else if(FS::is_reg(full)) { - tgt=new SystemLibrary(*this, full); + tgt = new SystemLibrary(*this, full); return tgt; } } @@ -644,96 +737,79 @@ 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; i::const_iterator i=targets.begin(); i!=targets.end(); ++i) + if(i->second->is_buildable() && i->second->get_rebuild()) + ++total; - unsigned total=cmdline->count_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; - if(chrome) - cout<<"0 targets built\n"; - unsigned count=0; + unsigned count = 0; - bool fail=false; - bool finish=false; + bool fail = false; + bool finish = false; while(!finish) { if(actions.size()get_buildable_target(); + Target *tgt = cmdline->get_buildable_target(); if(tgt) { - Action *action=tgt->build(); + Action *action = tgt->build(); if(action) actions.push_back(action); + + if(show_progress) + IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : "")); } else if(actions.empty()) - finish=true; + finish = true; } else Time::sleep(10*Time::msec); for(unsigned i=0; icheck(); + int status = actions[i]->check(); if(status>=0) { ++count; - if(chrome) - { - cout<<"\e["<0) - fail=true; + fail = true; if(actions.empty() && fail) - finish=true; + finish = true; } else ++i; } } + if(show_progress) + IO::print("\033[K"); if(fail) - cout<<"Build failed\n"; + IO::print("Build failed\n"); + else if(show_progress) + IO::print("Build complete\n"); - return fail?1:0; + return fail; } -/** -Cleans buildable targets. If clean is 1, cleans only this package. If -clean is 2 or greater, cleans all buildable packages. -*/ int Builder::do_clean() { // Cleaning doesn't care about ordering, so a simpler method can be used @@ -744,67 +820,105 @@ int Builder::do_clean() while(!queue.empty()) { - Target *tgt=queue.front(); + Target *tgt = queue.front(); queue.erase(queue.begin()); - if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2)) + if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2)) clean_tgts.insert(tgt); - const TargetList &deps=tgt->get_depends(); + const TargetList &deps = tgt->get_depends(); for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i) if(!clean_tgts.count(*i)) queue.push_back(*i); } 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=default_pkg->get_config(); - const Config::OptionMap &options=config.get_options(); + const Config &config = main_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) + 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<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<<" "<second; + IO::print(" %s: %s (%s)", opt.name, opt.descr, opt.value); + if(opt.value!=opt.defv) + IO::print(" [%s]", opt.defv); + IO::print("\n"); } } -Application::RegApp Builder::reg; +string Builder::usagemsg; +string Builder::helpmsg; -Builder::Loader::Loader(Builder &b, const Path::Path &s): + +Builder::Loader::Loader(Builder &b, const FS::Path &s): bld(b), src(s) { + add("binary_package", &Loader::binpkg); + add("cross_prefix", &Loader::cross_prefix); + add("profile", &Loader::profile); add("package", &Loader::package); } +void Builder::Loader::binpkg(const string &n) +{ + BinaryPackage *pkg = new BinaryPackage(bld, n); + load_sub(*pkg); + bld.packages.insert(PackageMap::value_type(n, pkg)); +} + +void Builder::Loader::cross_prefix(const string &a, const string &p) +{ + bld.cross_prefixes[a] = p; +} + +void Builder::Loader::profile(const string &n) +{ + StringMap prf; + ProfileLoader ldr(prf); + load_sub_with(ldr); + bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf)); +} + void Builder::Loader::package(const string &n) { - Package *pkg=new Package(bld, n, src); + SourcePackage *pkg = new SourcePackage(bld, n, src); + if(!bld.main_pkg) + bld.main_pkg = pkg; + load_sub(*pkg); bld.packages.insert(PackageMap::value_type(n, pkg)); - bld.new_pkgs.push_back(pkg); } + +Builder::ProfileLoader::ProfileLoader(StringMap &p): + profile(p) +{ + add("option", &ProfileLoader::option); +} + +void Builder::ProfileLoader::option(const string &o, const string &v) +{ + profile.insert(StringMap::value_type(o, v)); +}