X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=3c58f0245ecc773fa4945a9f6c614409b94151c6;hb=409a427f912f9c203b102beed0816b53b250931f;hp=de8375919e17678de591cdff9452cc36bf25057e;hpb=5622fc20f0be8bff0938d24f6f45d3ab384288ca;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index de83759..3c58f02 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,12 +1,12 @@ /* $Id$ This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ #include -#include +#include #include #include #include @@ -34,7 +34,6 @@ Distributed under the LGPL #include "sharedlibrary.h" #include "sourcepackage.h" #include "systemlibrary.h" -#include "tarball.h" #include "unlink.h" #include "virtualtarget.h" @@ -46,7 +45,7 @@ namespace { void update_hash(string &hash, const string &value) { for(unsigned i=0; i ...]"; - helpmsg=getopt.generate_help(); + usagemsg = getopt.generate_usage(argv[0])+" [ ...]"; + 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); @@ -119,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 vector &args=getopt.get_args(); + 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 @@ -137,37 +138,41 @@ Builder::Builder(int argc, char **argv): if(!work_dir.empty()) FS::chdir(work_dir); - cwd=FS::getcwd(); + cwd = FS::getcwd(); - utsname un; - string sysname="native"; - if(uname(&un)==0) - sysname=tolower(un.sysname); - - 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"); + 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"); load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str()); - load_build_file((FS::get_home_dir()/".builderrc").str()); + load_build_file((FS::get_user_data_dir("builder")/"rc").str()); if(arch.empty()) - current_arch=native_arch; + current_arch = &native_arch; else - current_arch=&get_architecture(arch); + current_arch = new Architecture(*this, arch); + + 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; + } + } if(prfx.empty()) { if(current_arch->is_native()) - prefix=(FS::get_home_dir()/"local").str(); + prefix = (FS::get_home_dir()/"local").str(); else - prefix=(FS::get_home_dir()/"local"/current_arch->get_name()).str(); + prefix = (FS::get_home_dir()/"local"/current_arch->get_name()).str(); } else - prefix=FS::getcwd()/prfx; + prefix = FS::getcwd()/prfx; warnings.push_back("all"); warnings.push_back("extra"); @@ -176,7 +181,7 @@ Builder::Builder(int argc, char **argv): warnings.push_back("error"); for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i) { - vector warns=split(*i, ','); + vector warns = split(*i, ','); warnings.insert(warnings.end(), warns.begin(), warns.end()); } @@ -195,6 +200,25 @@ Builder::~Builder() 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) @@ -219,39 +243,52 @@ int Builder::main() return 0; } - if(!conf_only && create_targets()) - return 1; - - PackageList all_reqs=main_pkg->collect_requires(); - if(conf_only) return 0; + if(create_targets()) + return 1; + if(verbose>=2) - IO::print("Building on %s, for %s\n", native_arch->get_name(), current_arch->get_name()); + { + 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) - IO::print("%d active packages, %d targets\n", all_reqs.size(), targets.size()); + { + 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(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { - IO::print(" %s", (*i)->get_name()); - if(dynamic_cast(*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 ood_count=0; + unsigned count = 0; + unsigned to_be_built = 0; for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j) - if(j->second->get_package()==*i) + if(j->second->get_package()==i->second) { ++count; if(j->second->get_rebuild()) - ++ood_count; + ++to_be_built; } if(count) { IO::print(" (%d targets", count); - if(ood_count) - IO::print(", %d out-of-date", ood_count); + if(to_be_built) + IO::print(", %d to be built", to_be_built); IO::print(")"); } IO::print("\n"); @@ -266,51 +303,84 @@ int Builder::main() 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"); + if(!analyzer) + IO::print(IO::cerr, "Please fix them and try again.\n"); return 1; } - //if(create_makefile - if(clean) - exit_code=do_clean(); + exit_code = do_clean(); else if(build) - exit_code=do_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"); + 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())); + + 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())); + PackageMap::iterator i = packages.find(format("%s/%s", name, current_arch->get_system())); if(i==packages.end()) - i=packages.find(name); + i = packages.find(name); if(i!=packages.end()) return i->second; - FS::Path path=get_package_location(name); - if(!path.empty() && !load_build_file(path/"Build")) + if(!no_externals) { - i=packages.find(name); - if(i!=packages.end()) - return i->second; + 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=BinaryPackage::from_pkgconfig(*this, name); + 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)); - if(!pkg) - problem(name, "not found"); - return pkg; } 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); + TargetMap::const_iterator i = targets.find(n); if(i!=targets.end()) return i->second; return 0; @@ -324,8 +394,8 @@ Target *Builder::get_header(const string &include, const FS::Path &from, const l 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; @@ -335,19 +405,24 @@ Target *Builder::get_header(const string &include, const FS::Path &from, const l StringList argv; argv.push_back(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)) + if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv))) { - unsigned dot=cxx_ver.rfind('.'); - if(dot==string::npos) - break; - cxx_ver.erase(dot); + 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); } - if(verbose>=5) - IO::print("C++ version is %s\n", cxx_ver); + else + cxx_ver = "-"; } - string fn=include.substr(1); + 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())); @@ -355,16 +430,17 @@ Target *Builder::get_header(const string &include, const FS::Path &from, const l if(current_arch->is_native()) syspath.push_back("/usr/include"); else - syspath.push_back("/usr/"+current_arch->get_prefix()+"/include"); - syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str()); + 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; + Target *tgt = 0; if(include[0]=='\"') - tgt=get_header(FS::Path(from)/fn); + 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); + 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); + tgt = get_header(FS::Path(*j)/fn); includes.insert(TargetMap::value_type(id, tgt)); @@ -377,8 +453,8 @@ Target *Builder::get_library(const string &lib, const list &path, LibMod for(list::const_iterator i=path.begin(); i!=path.end(); ++i) update_hash(hash, *i); - string id=hash+string(1, mode)+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; @@ -389,38 +465,29 @@ Target *Builder::get_library(const string &lib, const list &path, LibMod syspath.push_back("/usr/lib"); } else - syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib"); + syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/lib"); if(verbose>=5) IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end())); - Target *tgt=0; + Target *tgt = 0; for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) - tgt=get_library(lib, 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); + tgt = get_library(lib, *j, mode); libraries.insert(TargetMap::value_type(id, tgt)); return tgt; } -const Architecture &Builder::get_architecture(const string &arch) const -{ - ArchMap::const_iterator i=archs.find(arch); - if(i==archs.end()) - throw KeyError("Unknown architecture", arch); - - return i->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; @@ -433,7 +500,13 @@ void Builder::problem(const string &p, const string &d) problems.push_back(Problem(p, d)); } -void Builder::add_target(Target *t) +void Builder::add_target(FileTarget *t) +{ + targets.insert(TargetMap::value_type(t->get_path().str(), t)); + new_tgts.push_back(t); +} + +void Builder::add_target(VirtualTarget *t) { targets.insert(TargetMap::value_type(t->get_name(), t)); new_tgts.push_back(t); @@ -448,6 +521,7 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) IO::print(IO::cerr, "Usage: %s\n", usagemsg); else { + 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); @@ -459,25 +533,24 @@ FS::Path Builder::get_package_location(const string &name) if(verbose>=3) IO::print("Looking for package %s\n", 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) - IO::print("Running %s\n", join(argv.begin(), argv.end())); - string srcdir=strip(run_command(argv)); - if(!srcdir.empty()) - return srcdir; + try + { + // Try to get source directory with pkgconfig + string srcdir = strip(run_pkgconfig(name, "source")); + if(!srcdir.empty()) + return srcdir; + } + catch(...) + { } if(pkg_dirs.empty()) { for(list::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) { - list files=list_files(*i); + list files = list_files(*i); for(list::const_iterator j=files.begin(); j!=files.end(); ++j) { - FS::Path full=*i / *j; + FS::Path full = *i / *j; if(FS::exists(full/"Build")) pkg_dirs.push_back(full); } @@ -486,11 +559,11 @@ FS::Path Builder::get_package_location(const string &name) IO::print("%d packages found in path\n", pkg_dirs.size()); } - bool msp=!name.compare(0, 3, "msp"); + 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('-'); + string base = basename(*i); + unsigned dash = base.rfind('-'); if(!base.compare(0, dash, name)) return *i; @@ -514,7 +587,7 @@ int Builder::load_build_file(const FS::Path &fn) Loader loader(*this, fn.subpath(0, fn.size()-1)); loader.load(parser); } - catch(const IO::FileNotFound &) + catch(const IO::file_not_found &) { return -1; } @@ -524,41 +597,41 @@ int Builder::load_build_file(const FS::Path &fn) 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); - Target *tarballs=new VirtualTarget(*this, "tarballs"); + 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) + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { - SourcePackage *spkg=dynamic_cast(*i); + if(!i->second || !i->second->is_configured()) + continue; + + SourcePackage *spkg = dynamic_cast(i->second); if(!spkg) continue; - const ComponentList &components=spkg->get_components(); + const ComponentList &components = spkg->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) j->create_targets(); if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE)) { - PkgConfig *pc=new PkgConfig(*this, *spkg); + 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 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()) @@ -568,7 +641,7 @@ 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) { IO::print(IO::cerr, "Unknown what-if target %s\n", *i); @@ -578,51 +651,38 @@ int Builder::create_targets() } // 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) { 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. - - XXX Could we skip preparing targets we are not interested in? */ - 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)) + if(SourcePackage *spkg = dynamic_cast(i->second)) spkg->get_deps_cache().save(); return 0; } -Target *Builder::get_header(const Msp::FS::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(FS::is_reg(fn)) { - tgt=new SystemHeader(*this, fn.str()); + tgt = new SystemHeader(*this, fn.str()); return tgt; } return 0; @@ -635,7 +695,8 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo if(mode!=ALL_STATIC) { - if(current_arch->get_name()=="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"); @@ -647,19 +708,17 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo /* Static libraries are always considered, since sometimes shared versions may not be available */ candidates.push_back("lib"+lib+".a"); - if(current_arch->get_name()=="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(Install *inst=dynamic_cast(tgt)) - real_tgt=&inst->get_source(); + Target *real_tgt = tgt->get_real_target(); /* Ignore dynamic libraries from local packages unless library mode is DYNAMIC */ @@ -670,7 +729,7 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo } else if(FS::is_reg(full)) { - tgt=new SystemLibrary(*this, full); + tgt = new SystemLibrary(*this, full); return tgt; } } @@ -680,9 +739,13 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo int Builder::do_build() { - Target *cmdline=get_target("cmdline"); + Target *cmdline = get_target("cmdline"); + + unsigned total = 0; + for(map::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) { IO::print("Already up to date\n"); @@ -693,19 +756,19 @@ int Builder::do_build() vector actions; - 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); @@ -713,14 +776,14 @@ int Builder::do_build() 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; @@ -728,9 +791,9 @@ int Builder::do_build() delete actions[i]; actions.erase(actions.begin()+i); if(status>0) - fail=true; + fail = true; if(actions.empty() && fail) - finish=true; + finish = true; } else ++i; @@ -757,22 +820,22 @@ 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()==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(); + 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) - if(FileTarget *ft=dynamic_cast(*i)) + if(FileTarget *ft = dynamic_cast(*i)) { - Action *action=new Unlink(*this, *ft); + Action *action = new Unlink(*this, *ft); while(action->check()<0) ; delete action; } @@ -782,11 +845,11 @@ int Builder::do_clean() void Builder::package_help() { - const Config &config=main_pkg->get_config(); - const Config::OptionMap &options=config.get_options(); + const Config &config = main_pkg->get_config(); + const Config::OptionMap &options = config.get_options(); IO::print("Required packages:\n "); - const PackageList &requires=main_pkg->get_requires(); + const PackageList &requires = main_pkg->get_requires(); for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { if(i!=requires.begin()) @@ -796,7 +859,7 @@ void Builder::package_help() IO::print("\n\nPackage configuration:\n"); for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i) { - const Config::Option &opt=i->second; + const Config::Option &opt = i->second; IO::print(" %s: %s (%s)", opt.name, opt.descr, opt.value); if(opt.value!=opt.defv) IO::print(" [%s]", opt.defv); @@ -804,7 +867,6 @@ void Builder::package_help() } } -Application::RegApp Builder::reg; string Builder::usagemsg; string Builder::helpmsg; @@ -813,26 +875,24 @@ Builder::Loader::Loader(Builder &b, const FS::Path &s): bld(b), src(s) { - add("architecture", &Loader::architecture); add("binary_package", &Loader::binpkg); + add("cross_prefix", &Loader::cross_prefix); 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); + 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; @@ -843,9 +903,9 @@ void Builder::Loader::profile(const string &n) void Builder::Loader::package(const string &n) { - SourcePackage *pkg=new SourcePackage(bld, n, src); + SourcePackage *pkg = new SourcePackage(bld, n, src); if(!bld.main_pkg) - bld.main_pkg=pkg; + bld.main_pkg = pkg; load_sub(*pkg); bld.packages.insert(PackageMap::value_type(n, pkg));