X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=58288ffbfa096a71e4dfbe82fe360c207824f7b7;hb=52586d9f4aa721e924d17c7e9a16cb0b98ddc05d;hp=ccfb407276ee1a619b1bf85e1869a7acd75eab0a;hpb=55b6c1dba6f02a399d98080c23a75098e8a080f7;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index ccfb407..58288ff 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,26 +1,39 @@ -#include +/* $Id$ + +This file is part of builder +Copyright © 2006-2007 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 "action.h" #include "analyzer.h" +#include "binarypackage.h" #include "builder.h" -#include "executable.h" #include "header.h" #include "install.h" #include "misc.h" -#include "objectfile.h" #include "package.h" #include "pkgconfig.h" #include "sharedlibrary.h" -#include "staticlibrary.h" +#include "sourcepackage.h" #include "systemlibrary.h" +#include "tarball.h" #include "unlink.h" #include "virtualtarget.h" @@ -28,24 +41,28 @@ using namespace std; using namespace Msp; Builder::Builder(int argc, char **argv): + main_pkg(0), analyzer(0), build(false), clean(0), dry_run(false), help(false), verbose(1), - chrome(false), + show_progress(false), build_file("Build"), jobs(1), conf_all(false), conf_only(false), build_all(false), - create_makefile(false) + create_makefile(false), + current_arch("native") { string analyze_mode; string work_dir; bool full_paths=false; unsigned max_depth=5; + StringList cmdline_warn; + string prfx; GetOpt getopt; getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG); @@ -59,12 +76,15 @@ Builder::Builder(int argc, char **argv): 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('P', "progress", show_progress, GetOpt::NO_ARG); getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_ARG); - getopt.add_option( "chrome", chrome, GetOpt::NO_ARG); + getopt.add_option( "arch", current_arch, GetOpt::REQUIRED_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.add_option( "prefix", prfx, GetOpt::REQUIRED_ARG); + getopt.add_option( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG); getopt(argc, argv); if(!analyze_mode.empty()) @@ -88,8 +108,8 @@ Builder::Builder(int argc, char **argv): else if(!clean && !create_makefile) 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('='); if(equal!=string::npos) @@ -104,85 +124,72 @@ Builder::Builder(int argc, char **argv): if(!work_dir.empty()) chdir(work_dir.c_str()); - 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")); + 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"); - 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_home_dir()/".builderrc").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")); - - 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(prfx.empty()) { - 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")); + if(current_arch=="native") + prefix=(FS::get_home_dir()/"local").str(); + else + prefix=(FS::get_home_dir()/"local"/current_arch).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/".."); } /** -Gets a package with the specified name, possibly creating it. +Gets a package by name, possibly creating it. -@param n Package name +@param name Package name @return Pointer to the package, or 0 if the package could not be located */ -Package *Builder::get_package(const string &n) +Package *Builder::get_package(const string &name) { - PackageMap::iterator i=packages.find(n); + PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch)); + 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")) - { - i=packages.find(n); - if(i!=packages.end()) - return i->second; - break; - } + 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; + } // 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=BinaryPackage::from_pkgconfig(*this, name); + + packages.insert(PackageMap::value_type(name, pkg)); + + if(!pkg) + problem(name, "not found"); return pkg; } @@ -190,9 +197,9 @@ Package *Builder::get_package(const string &n) /** Returns the target with the given name, or 0 if no such target exists. */ -Target *Builder::get_target(const string &n) +Target *Builder::get_target(const string &n) const { - TargetMap::iterator i=targets.find(n); + TargetMap::const_iterator i=targets.find(n); if(i!=targets.end()) return i->second; return 0; @@ -204,7 +211,7 @@ 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 string &from, const list &path) { string hash(8, 0); update_hash(hash, from); @@ -216,21 +223,43 @@ Target *Builder::get_header(const string &include, const string &, const string 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(get_current_arch().get_tool("CXX")); + argv.push_back("--version"); + 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) + break; + cxx_ver.erase(dot); + } + if(verbose>=5) + cout<<"C++ version is "<=5) + cout<<"Looking for include "<::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; @@ -247,64 +276,52 @@ a new SystemLibrary target will be created and returned. @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=="native") { syspath.push_back("/lib"); syspath.push_back("/usr/lib"); } else - syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib"); + syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib"); + + if(verbose>=5) + cout<<"Looking for library "<second; } -string Builder::get_tool(const std::string &tool, const std::string &arch) +const Architecture &Builder::get_current_arch() const { - 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; + return get_architecture(current_arch); } void Builder::apply_profile_template(Config &config, const string &pt) const @@ -321,6 +338,21 @@ void Builder::apply_profile_template(Config &config, const string &pt) const } } +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() { if(load_build_file(cwd/build_file)) @@ -329,16 +361,7 @@ int Builder::main() 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); + main_pkg->configure(cmdline_options, conf_all?2:1); if(help) { @@ -348,45 +371,27 @@ int Builder::main() 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"; + if(!conf_only && create_targets()) return 1; - } + + PackageList all_reqs=main_pkg->collect_requires(); if(conf_only) return 0; - if(create_targets()) - return 1; - - cout<=1) + cout<=2) { - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { - cout<<' '<second->get_name(); - if(i->second->get_buildable()) + 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->second) + if(j->second->get_package()==*i) { ++count; if(j->second->get_rebuild()) @@ -406,6 +411,15 @@ int Builder::main() if(analyzer) analyzer->analyze(); + if(!problems.empty()) + { + 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; + } + //if(create_makefile if(clean) @@ -431,7 +445,7 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) cerr< ...]"; + cerr<<"Usage: "< ...]\n"; else { cerr<< @@ -449,15 +463,64 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) " -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" - " --chrome Use extra chrome to print status.\n" + " --arch ARCH Architecture to build for.\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"; + " --max-depth NUM Maximum depth to show in analysis.\n" + " --prefix DIR Directory to install things to.\n" + " --warnings LIST Compiler warnings to use.\n"; } } +/** +Determines the source directory of a package. pkg-config is consulted first, +and if it fails, the package path is searched for matches. +*/ +FS::Path Builder::get_package_location(const string &name) +{ + // Try to get source directory with pkgconfig + list argv; + argv.push_back("pkg-config"); + argv.push_back("--variable=source"); + argv.push_back(name); + if(verbose>=4) + cout<<"Running "<::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) + { + list files=list_files(*i); + for(list::const_iterator j=files.begin(); j!=files.end(); ++j) + { + FS::Path full=*i / *j; + if(FS::exists(full/"Build")) + pkg_dirs.push_back(full); + } + } + } + + 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(!base.compare(0, dash, name)) + return *i; + else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) + return *i; + } + + return FS::Path(); +} + /** Loads the given build file. @@ -465,15 +528,24 @@ Loads the given build file. @return 0 on success, -1 if the file could not be opened */ -int Builder::load_build_file(const Path::Path &fn) +int Builder::load_build_file(const FS::Path &fn) { - ifstream in(fn.str().c_str()); - if(!in) - return -1; + try + { + IO::File inf(fn.str()); + IO::Buffered in(inf); - Parser::Parser parser(in, fn.str()); - Loader loader(*this, fn.subpath(0, fn.size()-1)); - loader.load(parser); + if(verbose>=3) + cout<<"Reading "<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) + Target *tarballs=new VirtualTarget(*this, "tarballs"); + world->add_depend(tarballs); + + PackageList all_reqs=main_pkg->collect_requires(); + for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { - if(!i->second) + SourcePackage *spkg=dynamic_cast(*i); + if(!spkg) 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(); + const ComponentList &components=spkg->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) - { - 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); + j->create_targets(); - // 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); - } - } - } - - 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); - } - - 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); - } - } - } - } - } - - 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); - 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); + PkgConfig *pc=new PkgConfig(*this, *spkg); + install->add_depend(new Install(*this, *spkg, *pc)); } + + tarballs->add_depend(new TarBall(*this, *spkg)); } // Find dependencies until no new targets are created @@ -648,8 +613,7 @@ int Builder::create_targets() // 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); + bool build_world=false; for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) { Target *tgt=get_target(*i); @@ -660,10 +624,25 @@ int Builder::create_targets() cerr<<"I don't know anything about "<<*i<<'\n'; return -1; } + if(tgt==world) + build_world=true; cmdline->add_depend(tgt); } - world->prepare(); + /* 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(); + } + + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + if(SourcePackage *spkg=dynamic_cast(i->second)) + spkg->get_deps_cache().save(); return 0; } @@ -672,28 +651,31 @@ int Builder::create_targets() 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 Msp::FS::Path &fn) { Target *tgt=get_target(fn.str()); if(tgt) return tgt; - if(Path::exists(fn)) + if(FS::is_reg(fn)) { - add_target(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") + if(current_arch=="win32") + { candidates.push_back("lib"+lib+".dll"); + candidates.push_back(lib+".dll"); + } else candidates.push_back("lib"+lib+".so"); } @@ -701,7 +683,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=="win32") candidates.push_back("lib"+lib+".dll.a"); for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i) @@ -722,10 +704,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); - add_target(tgt); return tgt; } } @@ -733,15 +714,6 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path:: 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. */ @@ -765,12 +737,11 @@ int Builder::do_build() cout<<"Already up to date\n"; return 0; } - cout<<"Will build "<=1) + cout<<"Will build "< actions; - if(chrome) - cout<<"0 targets built\n"; unsigned count=0; bool fail=false; @@ -786,6 +757,12 @@ int Builder::do_build() Action *action=tgt->build(); if(action) actions.push_back(action); + + if(show_progress) + { + cout<=0) { ++count; - if(chrome) - { - cout<<"\e["<0) @@ -822,8 +789,12 @@ int Builder::do_build() } } + if(show_progress) + cout<<"\033[K"; if(fail) cout<<"Build failed\n"; + else if(show_progress) + cout<<"Build complete\n"; return fail?1:0; } @@ -845,7 +816,7 @@ int Builder::do_clean() Target *tgt=queue.front(); queue.erase(queue.begin()); - if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2)) + if(tgt->get_buildable() && (tgt->get_package()==main_pkg || clean>=2)) clean_tgts.insert(tgt); const TargetList &deps=tgt->get_depends(); @@ -857,7 +828,7 @@ 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); + while(action->check()<0) ; delete action; } @@ -869,16 +840,16 @@ Prints out information about the default package. */ void Builder::package_help() { - const Config &config=default_pkg->get_config(); + 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) + 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(); + cout<<(*i)->get_name(); } cout<<"\n\n"; cout<<"Package configuration:\n"; @@ -891,18 +862,57 @@ void Builder::package_help() Application::RegApp Builder::reg; -Builder::Loader::Loader(Builder &b, const Path::Path &s): + +Builder::Loader::Loader(Builder &b, const FS::Path &s): bld(b), src(s) { + add("architecture", &Loader::architecture); + add("binary_package", &Loader::binpkg); + add("profile", &Loader::profile); add("package", &Loader::package); } +void Builder::Loader::architecture(const string &n) +{ + Architecture arch(bld, n); + load_sub(arch); + bld.archs.insert(ArchMap::value_type(n, arch)); +} + +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::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)); +}