X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=b06b8ffb2fd0b1de4c7b288989cd8704ce295919;hb=d914c5f40ca1194e7fd6a2b30664ac4717e38786;hp=ccfb407276ee1a619b1bf85e1869a7acd75eab0a;hpb=55b6c1dba6f02a399d98080c23a75098e8a080f7;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index ccfb407..7ef1ea1 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,908 +1,353 @@ -#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 "androidtools.h" +#include "binarypackage.h" #include "builder.h" -#include "executable.h" -#include "header.h" -#include "install.h" -#include "misc.h" -#include "objectfile.h" +#include "builtintools.h" +#include "clangtools.h" +#include "datatool.h" +#include "gnutools.h" +#include "installedfile.h" #include "package.h" -#include "pkgconfig.h" #include "sharedlibrary.h" -#include "staticlibrary.h" -#include "systemlibrary.h" -#include "unlink.h" +#include "sourcepackage.h" +#include "task.h" #include "virtualtarget.h" using namespace std; using namespace Msp; -Builder::Builder(int argc, char **argv): - analyzer(0), - build(false), - clean(0), - dry_run(false), - help(false), - verbose(1), - chrome(false), - build_file("Build"), - jobs(1), - conf_all(false), - conf_only(false), - build_all(false), - create_makefile(false) +Builder::Builder(): + package_manager(*this), + native_arch(*this, string()), + current_arch(0), + build_type(0), + vfs(*this), + build_graph(*this), + logger(&default_logger), + tempdir("temp"), + top_loader(0) { - string analyze_mode; - string work_dir; - bool full_paths=false; - unsigned max_depth=5; - - GetOpt getopt; - getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG); - getopt.add_option('b', "build", build, GetOpt::NO_ARG); - getopt.add_option('c', "clean", clean, GetOpt::NO_ARG); - getopt.add_option('f', "file", build_file, GetOpt::REQUIRED_ARG); - getopt.add_option('h', "help", help, GetOpt::NO_ARG); - getopt.add_option('j', "jobs", jobs, GetOpt::REQUIRED_ARG); - getopt.add_option('n', "dry-run", dry_run, GetOpt::NO_ARG); - getopt.add_option('v', "verbose", verbose, GetOpt::NO_ARG); - getopt.add_option('A', "conf-all", conf_all, GetOpt::NO_ARG); - getopt.add_option('B', "build-all", build_all, GetOpt::NO_ARG); - getopt.add_option('C', "chdir", work_dir, GetOpt::REQUIRED_ARG); - getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_ARG); - getopt.add_option( "chrome", chrome, GetOpt::NO_ARG); - getopt.add_option( "conf-only", conf_only, GetOpt::NO_ARG); - getopt.add_option( "full-paths", full_paths, GetOpt::NO_ARG); - //getopt.add_option( "makefile", create_makefile, GetOpt::NO_ARG); - getopt.add_option( "max-depth", max_depth, GetOpt::REQUIRED_ARG); - getopt(argc, argv); - - if(!analyze_mode.empty()) - { - analyzer=new Analyzer(*this); - - if(analyze_mode=="deps") - analyzer->set_mode(Analyzer::DEPS); - else if(analyze_mode=="alldeps") - analyzer->set_mode(Analyzer::ALLDEPS); - else if(analyze_mode=="rebuild") - analyzer->set_mode(Analyzer::REBUILD); - else if(analyze_mode=="rdeps") - analyzer->set_mode(Analyzer::RDEPS); - else - throw UsageError("Invalid analyze mode"); - - analyzer->set_max_depth(max_depth); - analyzer->set_full_paths(full_paths); - } - else if(!clean && !create_makefile) - build=true; - - const list &args=getopt.get_args(); - for(list::const_iterator i=args.begin(); i!=args.end(); ++i) - { - unsigned equal=i->find('='); - if(equal!=string::npos) - cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1))); - else - cmdline_targets.push_back(*i); - } - - if(cmdline_targets.empty()) - cmdline_targets.push_back("default"); - - if(!work_dir.empty()) - chdir(work_dir.c_str()); - - cwd=Path::getcwd(); - - archs.insert(StringMap::value_type("native", "")); - archs.insert(StringMap::value_type("arm", "arm-linux-gnu")); - archs.insert(StringMap::value_type("win32", "i586-mingw32msvc")); - - 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")); - - 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")); - - 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")); - - for(StringMap::iterator i=archs.begin(); i!=archs.end(); ++i) - { - if(i->first=="native") - continue; - - 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")); - } -} - -/** -Gets a package with the specified name, possibly creating it. - -@param n Package name - -@return Pointer to the package, or 0 if the package could not be located -*/ -Package *Builder::get_package(const string &n) -{ - PackageMap::iterator i=packages.find(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"); - 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")) - { - i=packages.find(n); - 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); - - return pkg; + set_architecture(string()); } -/** -Returns the target with the given name, or 0 if no such target exists. -*/ -Target *Builder::get_target(const string &n) +Builder::~Builder() { - TargetMap::iterator i=targets.find(n); - if(i!=targets.end()) - return i->second; - return 0; + if(current_arch!=&native_arch) + delete current_arch; } -/** -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) +void Builder::set_architecture(const string &name) { - 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=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 + if(name.empty()) { - for(list::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j) - tgt=get_header(cwd/ *j/fn); + current_arch = &native_arch; + prefix = FS::get_home_dir()/"local"; } - - 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) -{ - 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); - if(i!=libraries.end()) - return i->second; - - StringList syspath; - if(arch=="native") + else { - syspath.push_back("/lib"); - syspath.push_back("/usr/lib"); + current_arch = new Architecture(*this, name); + prefix = FS::get_home_dir()/"local"/current_arch->get_name(); } - else - syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib"); - - Target *tgt=0; - for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) - tgt=get_library(lib, arch, *j, mode); - for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) - tgt=get_library(lib, arch, cwd/ *j, mode); - - libraries.insert(TargetMap::value_type(id, tgt)); - - return tgt; } -const string &Builder::get_arch_prefix(const string &arch) const +vector Builder::get_build_types() const { - StringMap::const_iterator i=archs.find(arch); - if(i==archs.end()) - throw InvalidParameterValue("Unknown architecture"); - - return i->second; + vector keys; + keys.reserve(build_types.size()); + for(BuildTypeMap::const_iterator i=build_types.begin(); i!=build_types.end(); ++i) + keys.push_back(i->first); + return keys; } -string Builder::get_tool(const std::string &tool, const std::string &arch) +void Builder::set_build_type(const string &name) { - 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, '-'); - - for(vector::iterator i=parts.begin(); i!=parts.end(); ++i) - { - ProfileTemplateMap::const_iterator j=profile_tmpl.find(*i); - if(j==profile_tmpl.end()) - continue; - - config.update(j->second); - } + build_type = &get_item(build_types, name); } -int Builder::main() +void Builder::set_prefix(const FS::Path &p) { - if(load_build_file(cwd/build_file)) - { - cerr<<"No build info here.\n"; - return 1; - } - - default_pkg=packages.begin()->second; - - while(!new_pkgs.empty()) - { - Package *pkg=new_pkgs.front(); - new_pkgs.erase(new_pkgs.begin()); - pkg->resolve_refs(); - } - - default_pkg->configure(cmdline_options, conf_all?2:1); - - if(help) - { - usage(0, "builder", false); - cout<<'\n'; - package_help(); - return 0; - } - - 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)); - } - - if(!problems.empty()) - { - 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; - } - - if(conf_only) - return 0; - - if(create_targets()) - return 1; - - cout<=2) - { - for(PackageMap::iterator i=packages.begin(); i!=packages.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) - { - cout<<" ("<analyze(); - - //if(create_makefile - - if(clean) - exit_code=do_clean(); - else if(build) - exit_code=do_build(); - - return exit_code; + prefix = p; } -Builder::~Builder() +void Builder::set_temp_directory(const FS::Path &p) { - 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; + tempdir = p; } -void Builder::usage(const char *reason, const char *argv0, bool brief) +void Builder::add_default_tools() { - if(reason) - cerr< ...]"; - 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" - //" --makefile Create a makefile for this package.\n" - " --max-depth NUM Maximum depth to show in analysis.\n"; - } + const string &arch_tc = current_arch->get_toolchain(); + if(current_arch->get_system()=="android") + toolchain.add_toolchain(new AndroidTools(*this, *current_arch)); + else if(arch_tc=="clang") + toolchain.add_toolchain(new ClangTools(*this, *current_arch)); + else if(arch_tc=="gnu") + toolchain.add_toolchain(new GnuTools(*this, *current_arch)); + toolchain.add_toolchain(new BuiltinTools(*this)); + toolchain.add_tool(new DataTool(*this)); } -/** -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) +void Builder::set_logger(const Logger *l) { - ifstream in(fn.str().c_str()); - if(!in) - return -1; - - Parser::Parser parser(in, fn.str()); - Loader loader(*this, fn.subpath(0, fn.size()-1)); - loader.load(parser); - - return 0; + logger = (l ? l : &default_logger); } -/** -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() +list Builder::collect_problems() const { - Target *world=new VirtualTarget(*this, "world"); - add_target(world); - - Target *def_tgt=new VirtualTarget(*this, "default"); - add_target(def_tgt); - world->add_depend(def_tgt); - - Target *install=new VirtualTarget(*this, "install"); - add_target(install); - world->add_depend(install); - - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - { - if(!i->second) - continue; - if(!i->second->get_buildable()) - continue; - - Path::Path inst_base; - if(i->second->get_buildable() && i->second->get_install_flags()) - inst_base=i->second->get_prefix(); - - const ComponentList &components=i->second->get_components(); - for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) + list problems; + set broken_packages; + set broken_components; + set broken_tools; + + const BuildGraph::TargetMap &targets = build_graph.get_targets(); + for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) + if(i->second->is_broken()) { - // 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) - { - 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; - - list objs; - for(PathList::iterator k=files.begin(); k!=files.end(); ++k) - { - string basename=(*k)[-1]; - string ext=Path::splitext(basename).ext; - if((ext==".cpp" || ext==".c") && build_exe) - { - 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") - { - Target *hdr=get_target(k->str()); - if(!hdr) - { - 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; - Install *inst=new Install(*this, *i->second, *hdr, inst_path.str()); - add_target(inst); - install->add_depend(inst); - } - } - } + const list &tgt_problems = i->second->get_problems(); + for(list::const_iterator j=tgt_problems.begin(); j!=tgt_problems.end(); ++j) + problems.push_back(format("%s: %s", i->second->get_name(), *j)); - if(build_exe) - { - 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); - } + const Package *package = i->second->get_package(); + if(package && !package->get_problems().empty()) + broken_packages.insert(package); - if(j->get_install()) - { - string inst_dir; - if(j->get_type()==Component::PROGRAM) - inst_dir="bin"; - else if(j->get_type()==Component::LIBRARY) - inst_dir="lib"; - if(!inst_dir.empty()) - { - 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); - } - } - } - } - } + const Component *component = i->second->get_component(); + if(component && !component->get_problems().empty()) + broken_components.insert(component); - if(i->second->get_install_flags()&(Package::LIB|Package::INCLUDE)) - { - PkgConfig *pc=new PkgConfig(*this, *i->second); - add_target(pc); - Install *inst=new Install(*this, *i->second, *pc, (inst_base/"lib"/"pkgconfig"/Path::basename(pc->get_name())).str()); - add_target(inst); - install->add_depend(inst); + const Tool *tool = i->second->get_tool(); + if(tool && !tool->get_problems().empty()) + broken_tools.insert(tool); } - } - // Find dependencies until no new targets are created - while(!new_tgts.empty()) + // TODO Sort components after their packages, and targets last + for(set::const_iterator i=broken_packages.begin(); i!=broken_packages.end(); ++i) { - Target *tgt=new_tgts.front(); - new_tgts.erase(new_tgts.begin()); - tgt->find_depends(); - if(!tgt->get_depends_ready()) - new_tgts.push_back(tgt); + const list &pkg_problems = (*i)->get_problems(); + for(list::const_iterator j=pkg_problems.begin(); j!=pkg_problems.end(); ++j) + problems.push_back(format("%s: %s", (*i)->get_name(), *j)); } - // Apply what-ifs - for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i) + for(set::const_iterator i=broken_components.begin(); i!=broken_components.end(); ++i) { - Target *tgt=get_target((cwd/ *i).str()); - if(!tgt) - { - cerr<<"Unknown what-if target "<<*i<<'\n'; - return -1; - } - tgt->touch(); + const list &comp_problems = (*i)->get_problems(); + for(list::const_iterator j=comp_problems.begin(); j!=comp_problems.end(); ++j) + problems.push_back(format("%s/%s: %s", (*i)->get_package().get_name(), (*i)->get_name(), *j)); } - // 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); - for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) + for(set::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++i) { - Target *tgt=get_target(*i); - if(!tgt) - tgt=get_target((cwd/ *i).str()); - if(!tgt) - { - cerr<<"I don't know anything about "<<*i<<'\n'; - return -1; - } - cmdline->add_depend(tgt); + const list &tool_problems = (*i)->get_problems(); + for(list::const_iterator j=tool_problems.begin(); j!=tool_problems.end(); ++j) + problems.push_back(format("%s: %s", (*i)->get_tag(), *j)); } - world->prepare(); - - return 0; + return problems; } -/** -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) +void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *opts, bool all) { - Target *tgt=get_target(fn.str()); - if(tgt) return tgt; - - if(Path::exists(fn)) - { - add_target(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) -{ - // Populate a list of candidate filenames - StringList candidates; - - if(mode!=ALL_STATIC) - { - if(arch=="win32") - candidates.push_back("lib"+lib+".dll"); - else - candidates.push_back("lib"+lib+".so"); - } - - /* Static libraries are always considered, since sometimes shared versions - may not be available */ - candidates.push_back("lib"+lib+".a"); - if(arch=="win32") - 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); - - if(tgt) - { - Target *real_tgt=tgt; - if(dynamic_cast(tgt)) - real_tgt=real_tgt->get_depends().front(); - - /* Ignore dynamic libraries from local packages unless library mode is - DYNAMIC */ - if(dynamic_cast(real_tgt) && mode!=DYNAMIC) - continue; - else if(tgt) - return tgt; - } - else if(Path::exists(full)) - { - tgt=new SystemLibrary(*this, full); - add_target(tgt); - return tgt; - } - } - - return 0; -} + IO::BufferedFile in(fn.str()); -/** -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); -} + get_logger().log("files", format("Reading %s", fn)); -/** -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"; + get_logger().log("summary", "Already up to date"); return 0; } - cout<<"Will build "< actions; + vector tasks; - 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; + bool starved = false; while(!finish) { - if(actions.size()get_buildable_target(); + Target *tgt = build_graph.get_buildable_target(); if(tgt) { - Action *action=tgt->build(); - if(action) - actions.push_back(action); + if(tgt->get_tool()) + get_logger().log("tasks", format("%-4s %s", tgt->get_tool()->get_tag(), tgt->get_name())); + Task *task = tgt->build(); + if(task) + { + get_logger().log("commands", format("%s", task->get_command())); + if(dry_run) + { + task->signal_finished.emit(true); + delete task; + } + else + { + task->start(); + tasks.push_back(task); + } + } + + if(show_progress) + IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : "")); } - else if(actions.empty()) - finish=true; + else if(tasks.empty()) + finish = true; + else + starved = true; } else Time::sleep(10*Time::msec); - for(unsigned i=0; icheck(); - if(status>=0) + Task::Status status; + if(jobs==1 || (tasks.size()==1 && starved)) + status = tasks[i]->wait(); + else + status = tasks[i]->check(); + + if(status!=Task::RUNNING) { ++count; - if(chrome) - { - cout<<"\e["<0) - fail=true; - if(actions.empty() && fail) - finish=true; + + delete tasks[i]; + tasks.erase(tasks.begin()+i); + if(status==Task::ERROR) + fail = true; + if(tasks.empty() && fail) + finish = true; + starved = false; } else ++i; } } + if(show_progress) + IO::print("\033[K"); if(fail) - cout<<"Build failed\n"; + get_logger().log("summary", "Build failed"); + else if(show_progress) + get_logger().log("summary", "Build complete"); + + if(!dry_run) + { + const PackageManager::PackageMap &packages = package_manager.get_packages(); + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + i->second->save_caches(); + } - 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() +int Builder::clean(bool all, bool dry_run) { // Cleaning doesn't care about ordering, so a simpler method can be used set clean_tgts; - TargetList queue; - queue.push_back(get_target("cmdline")); + list queue; + queue.push_back(&build_graph.get_goals()); while(!queue.empty()) { - Target *tgt=queue.front(); - queue.erase(queue.begin()); + Target *tgt = queue.front(); + queue.pop_front(); - if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2)) + if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all)) clean_tgts.insert(tgt); - const TargetList &deps=tgt->get_depends(); - for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i) + const Target::Dependencies &deps = tgt->get_dependencies(); + for(list::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; + get_logger().log("tasks", format("RM %s", (*i)->get_name())); + if(!dry_run) + (*i)->clean(); } return 0; } -/** -Prints out information about the default package. -*/ -void Builder::package_help() + +Builder::Loader::Loader(Builder &b, const Config::InputOptions *o, bool a): + DataFile::ObjectLoader(b), + options(o), + conf_all(a) { - const Config &config=default_pkg->get_config(); - const Config::OptionMap &options=config.get_options(); + add("architecture", &Loader::architecture); + add("binary_package", &Loader::binpkg); + add("build_type", &Loader::build_type); + add("package", &Loader::package); - 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<<" "<conf_all) + options = obj.top_loader->options; } -Application::RegApp Builder::reg; +Builder::Loader::~Loader() +{ + if(obj.top_loader==this) + obj.top_loader = 0; +} -Builder::Loader::Loader(Builder &b, const Path::Path &s): - bld(b), - src(s) +void Builder::Loader::architecture(const string &n) { - add("package", &Loader::package); + if(obj.current_arch->match_name(n)) + load_sub(*obj.current_arch); } -void Builder::Loader::package(const string &n) +void Builder::Loader::binpkg(const string &n) { - Package *pkg=new Package(bld, n, src); + BinaryPackage *pkg = new BinaryPackage(obj, n); load_sub(*pkg); - bld.packages.insert(PackageMap::value_type(n, pkg)); - bld.new_pkgs.push_back(pkg); } +void Builder::Loader::build_type(const string &n) +{ + BuildType btype(n); + load_sub(btype); + BuildTypeMap::iterator i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first; + if(!obj.build_type) + obj.build_type = &i->second; +} + +void Builder::Loader::package(const string &n) +{ + SourcePackage *pkg = new SourcePackage(obj, n, get_source()); + + if(options) + load_sub(*pkg, *options); + else + load_sub(*pkg); + + if(obj.build_type) + pkg->set_build_type(*obj.build_type); +}