+++ /dev/null
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <fstream>
-#include <iostream>
-#include <set>
-#include <msp/core/error.h>
-#include <msp/core/getopt.h>
-#include <msp/datafile/parser.h>
-#include <msp/path/utils.h>
-#include <msp/strings/utils.h>
-#include <msp/time/units.h>
-#include <msp/time/utils.h>
-#include "action.h"
-#include "analyzer.h"
-#include "binarypackage.h"
-#include "builder.h"
-#include "header.h"
-#include "install.h"
-#include "misc.h"
-#include "package.h"
-#include "pkgconfig.h"
-#include "sharedlibrary.h"
-#include "sourcepackage.h"
-#include "systemlibrary.h"
-#include "tarball.h"
-#include "unlink.h"
-#include "virtualtarget.h"
-
-using namespace std;
-using namespace Msp;
-
-Builder::Builder(int argc, char **argv):
- default_pkg(0),
- 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)
-{
- 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<string> &args=getopt.get_args();
- for(list<string>::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", ""));
-
- 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"));
-
- const char *home=getenv("HOME");
- if(home)
- load_build_file((Path::Path(home)/".builderrc").str());
-}
-
-/**
-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<string> 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=BinaryPackage::from_pkgconfig(*this, n);
-
- packages.insert(PackageMap::value_type(n, pkg));
- if(pkg)
- new_pkgs.push_back(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);
- 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<string> &path)
-{
- string hash(8, 0);
- update_hash(hash, from);
- for(list<string>::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
- {
- for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
- tgt=get_header(cwd/ *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<string> &path, LibMode mode)
-{
- string hash(8, 0);
- for(list<string>::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")
- {
- syspath.push_back("/lib");
- syspath.push_back("/usr/lib");
- }
- 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
-{
- 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<string> parts=split(pt, '-');
-
- for(vector<string>::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);
- }
-}
-
-/**
-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))
- {
- cerr<<"No build info here.\n";
- return 1;
- }
-
- 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)
- {
- SourcePackage *spkg=dynamic_cast<SourcePackage *>(i->second);
- string prob;
- if(!i->second)
- prob="missing";
- else if(spkg && spkg->get_arch()!=default_pkg->get_arch())
- prob="wrong architecture ("+spkg->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<<" "<<i->first<<": "<<i->second<<'\n';
- cerr<<"Please fix them and try again.\n";
- return 1;
- }
-
- if(conf_only)
- return 0;
-
- if(create_targets())
- return 1;
-
- cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
- if(verbose>=2)
- {
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
- {
- cout<<' '<<i->second->get_name();
- if(dynamic_cast<SourcePackage *>(i->second))
- 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<<" ("<<count<<" targets";
- if(ood_count)
- cout<<", "<<ood_count<<" out-of-date";
- cout<<')';
- }
- cout<<'\n';
- }
- }
-
- if(analyzer)
- analyzer->analyze();
-
- //if(create_makefile
-
- if(clean)
- exit_code=do_clean();
- else if(build)
- exit_code=do_build();
-
- return exit_code;
-}
-
-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;
-}
-
-void Builder::usage(const char *reason, const char *argv0, bool brief)
-{
- if(reason)
- cerr<<reason<<'\n';
-
- if(brief)
- cerr<<"Usage: "<<argv0<<" [-a|--analyze MODE] [-b|--build] [-c|--clean] [-f|--file FILE] [-h|--help] [-j|--jobs NUM] [-n||--dry-run] [-v|--verbose] [-A|--conf-all] [-B|--build-all] [-C|--chdir DIRECTORY] [-W|--what-if FILE] [--chrome] [--conf-only] [--full-paths] [--max-depth NUM] [<target> ...]";
- else
- {
- cerr<<
- "Usage: "<<argv0<<" [options] [<target> ...]\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";
- }
-}
-
-/**
-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)
-{
- ifstream in(fn.str().c_str());
- if(!in)
- return -1;
-
- if(verbose>=3)
- cout<<"Reading "<<fn<<'\n';
-
- DataFile::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 *def_tgt=new VirtualTarget(*this, "default");
- world->add_depend(def_tgt);
-
- Target *install=new VirtualTarget(*this, "install");
- world->add_depend(install);
-
- Target *tarballs=new VirtualTarget(*this, "tarballs");
- world->add_depend(tarballs);
-
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
- {
- SourcePackage *spkg=dynamic_cast<SourcePackage *>(i->second);
- if(!spkg)
- continue;
-
- 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);
- 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();
- new_tgts.erase(new_tgts.begin());
- tgt->find_depends();
- if(!tgt->get_depends_ready())
- new_tgts.push_back(tgt);
- }
-
- // Apply what-ifs
- for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
- {
- Target *tgt=get_target((cwd/ *i).str());
- if(!tgt)
- {
- cerr<<"Unknown what-if target "<<*i<<'\n';
- 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;
- for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.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;
- }
- 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();
- }
-
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
- if(SourcePackage *spkg=dynamic_cast<SourcePackage *>(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 *tgt=get_target(fn.str());
- if(tgt) return tgt;
-
- if(Path::exists(fn))
- {
- 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<Install *>(tgt))
- real_tgt=real_tgt->get_depends().front();
-
- /* Ignore dynamic libraries from local packages unless library mode is
- DYNAMIC */
- if(dynamic_cast<SharedLibrary *>(real_tgt) && mode!=DYNAMIC)
- continue;
- else if(tgt)
- return tgt;
- }
- else if(Path::exists(full))
- {
- tgt=new SystemLibrary(*this, full);
- return tgt;
- }
- }
-
- 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<value.size(); ++i)
- hash[i%hash.size()]^=value[i];
-}
-
-/**
-This function supervises the build process, starting new actions when slots
-become available.
-*/
-int Builder::do_build()
-{
- Target *cmdline=get_target("cmdline");
-
- unsigned total=cmdline->count_rebuild();
- if(!total)
- {
- cout<<"Already up to date\n";
- return 0;
- }
- cout<<"Will build "<<total<<" target(s)\n";
-
- vector<Action *> actions;
-
- if(chrome)
- cout<<"0 targets built\n";
- unsigned count=0;
-
- bool fail=false;
- bool finish=false;
-
- while(!finish)
- {
- if(actions.size()<jobs && !fail)
- {
- Target *tgt=cmdline->get_buildable_target();
- if(tgt)
- {
- Action *action=tgt->build();
- if(action)
- actions.push_back(action);
- }
- else if(actions.empty())
- finish=true;
- }
- else
- Time::sleep(10*Time::msec);
-
- for(unsigned i=0; i<actions.size();)
- {
- int status=actions[i]->check();
- if(status>=0)
- {
- ++count;
- if(chrome)
- {
- cout<<"\e["<<actions.size()+1<<'A';
- cout<<count<<" targets built\n";
- if(i)
- cout<<"\e["<<i<<"B";
- cout<<"\e[M";
- if(i<actions.size()-1)
- cout<<"\e["<<actions.size()-i-1<<"B";
- cout.flush();
- }
- delete actions[i];
- actions.erase(actions.begin()+i);
- if(status>0)
- fail=true;
- if(actions.empty() && fail)
- finish=true;
- }
- else
- ++i;
- }
- }
-
- if(fail)
- cout<<"Build failed\n";
-
- return fail?1:0;
-}
-
-/**
-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
-
- set<Target *> clean_tgts;
- TargetList queue;
- queue.push_back(get_target("cmdline"));
-
- while(!queue.empty())
- {
- Target *tgt=queue.front();
- queue.erase(queue.begin());
-
- if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2))
- clean_tgts.insert(tgt);
-
- 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<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
- {
- Action *action=new Unlink(*this, **i);
- 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();
-
- 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<<i->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<<" "<<opt.name<<": "<<opt.descr<<" ("<<opt.value<<") ["<<opt.defv<<"]\n";
- }
-}
-
-Application::RegApp<Builder> Builder::reg;
-
-
-Builder::Loader::Loader(Builder &b, const Path::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 &a, const string &p)
-{
- bld.archs.insert(StringMap::value_type(a, p));
-}
-
-void Builder::Loader::binpkg(const string &n)
-{
- BinaryPackage *pkg=new BinaryPackage(bld, n);
- load_sub(*pkg);
- bld.packages.insert(PackageMap::value_type(n, pkg));
- bld.new_pkgs.push_back(pkg);
-}
-
-void Builder::Loader::profile(const string &n)
-{
- StringMap prf;
- load_sub<ProfileLoader>(prf);
- bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
-}
-
-void Builder::Loader::package(const string &n)
-{
- SourcePackage *pkg=new SourcePackage(bld, n, src);
- load_sub(*pkg);
- bld.packages.insert(PackageMap::value_type(n, pkg));
- bld.new_pkgs.push_back(pkg);
- if(!bld.default_pkg)
- bld.default_pkg=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));
-}
projects / builder.git / blobdiff