-#include <fstream>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
#include <iostream>
#include <set>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
#include <msp/core/getopt.h>
-#include <msp/parser/parser.h>
+#include <msp/datafile/parser.h>
+#include <msp/io/buffered.h>
+#include <msp/io/except.h>
+#include <msp/io/file.h>
#include <msp/path/utils.h>
+#include <msp/strings/formatter.h>
+#include <msp/strings/regex.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 "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"
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),
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( "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);
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)
+ const vector<string> &args=getopt.get_args();
+ for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
{
unsigned equal=i->find('=');
if(equal!=string::npos)
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"));
+ cwd=getcwd();
- 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"));
+ 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 &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"));
- }
+ const char *home=getenv("HOME");
+ if(home)
+ load_build_file((Path(home)/".builderrc").str());
}
/**
argv.push_back("pkg-config");
argv.push_back("--variable=source");
argv.push_back(n);
+ if(verbose>=4)
+ cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
string srcdir=strip(run_command(argv));
PathList dirs;
}
// Package source not found - create a binary package
- Package *pkg=Package::create(*this, n);
+ Package *pkg=BinaryPackage::from_pkgconfig(*this, n);
+
packages.insert(PackageMap::value_type(n, pkg));
- if(pkg)
- new_pkgs.push_back(pkg);
+
+ if(!pkg)
+ problem(n, "not found");
return pkg;
}
/**
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;
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)
+Target *Builder::get_header(const string &include, const string &arch, const string &from, const list<string> &path)
{
string hash(8, 0);
update_hash(hash, from);
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<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
- tgt=get_header(cwd/ *j/fn);
+ StringList argv;
+ argv.push_back(get_architecture(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() && !exists(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 "<<cxx_ver<<'\n';
}
+ string fn=include.substr(1);
+ if(verbose>=5)
+ cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
+
+ StringList syspath;
+ if(arch=="native")
+ syspath.push_back("/usr/include");
+ else
+ syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/include");
+ syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
+
+ Target *tgt=0;
+ if(include[0]=='\"')
+ tgt=get_header(Path(from)/fn);
+ for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
+ tgt=get_header(cwd/ *j/fn);
+ for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_header(Path(*j)/fn);
+
includes.insert(TargetMap::value_type(id, tgt));
return tgt;
syspath.push_back("/usr/lib");
}
else
- syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib");
+ syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
+
+ if(verbose>=5)
+ cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
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);
+ for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_library(lib, arch, *j, mode);
libraries.insert(TargetMap::value_type(id, tgt));
return tgt;
}
-const string &Builder::get_arch_prefix(const string &arch) const
+const Architecture &Builder::get_architecture(const string &arch) const
{
- StringMap::const_iterator i=archs.find(arch);
+ ArchMap::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, '-');
}
}
+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))
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)
{
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(!conf_only && create_targets())
+ return 1;
- if(!problems.empty())
+ PackageList all_reqs=main_pkg->collect_requires();
+
+ for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
- 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;
+ SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
+ string prob;
+ if(spkg && spkg->get_arch()!=main_pkg->get_arch())
+ problem(spkg->get_name(), format("wrong architecture (%s)", spkg->get_arch()));
}
if(conf_only)
return 0;
- if(create_targets())
- return 1;
-
- cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
+ cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
if(verbose>=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<<' '<<i->second->get_name();
- if(i->second->get_buildable())
+ cout<<' '<<(*i)->get_name();
+ if(dynamic_cast<SourcePackage *>(*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())
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<<" "<<i->package<<": "<<i->descr<<'\n';
+ cerr<<"Please fix them and try again.\n";
+ return 1;
+ }
+
//if(create_makefile
if(clean)
" -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"
" --conf-only Stop after configuring packages.\n"
" --full-paths Output full paths in analysis.\n"
//" --makefile Create a makefile for this package.\n"
@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 Path &fn)
{
- ifstream in(fn.str().c_str());
- if(!in)
- return -1;
+ try
+ {
+ IO::File inf(fn.str());
+ IO::Buffered in(inf);
+
+ if(verbose>=3)
+ cout<<"Reading "<<fn<<'\n';
- Parser::Parser parser(in, fn.str());
- Loader loader(*this, fn.subpath(0, fn.size()-1));
- loader.load(parser);
+ DataFile::Parser parser(in, fn.str());
+ Loader loader(*this, fn.subpath(0, fn.size()-1));
+ loader.load(parser);
+ }
+ catch(const IO::FileNotFound &)
+ {
+ return -1;
+ }
return 0;
}
int Builder::create_targets()
{
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)
+ 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)
- continue;
- if(!i->second->get_buildable())
+ SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
+ if(!spkg)
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<string> sfiles=list_files(*k);
- for(list<string>::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<ObjectFile *> 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);
- }
- }
- }
+ j->create_targets();
- 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
// 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<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
{
Target *tgt=get_target(*i);
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<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 *Builder::get_header(const Msp::Path &fn)
{
Target *tgt=get_target(fn.str());
if(tgt) return tgt;
- if(Path::exists(fn))
+ if(exists(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 string &arch, const 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");
+ candidates.push_back(lib+".dll");
+ }
else
candidates.push_back("lib"+lib+".so");
}
else if(tgt)
return tgt;
}
- else if(Path::exists(full))
+ else if(exists(full))
{
tgt=new SystemLibrary(*this, full);
- add_target(tgt);
return tgt;
}
}
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.
*/
vector<Action *> actions;
- if(chrome)
- cout<<"0 targets built\n";
unsigned count=0;
bool fail=false;
Action *action=tgt->build();
if(action)
actions.push_back(action);
+
+ if(show_progress)
+ {
+ cout<<count<<" of "<<total<<" targets built\033[1G";
+ cout.flush();
+ }
}
else if(actions.empty())
finish=true;
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)
}
}
+ if(show_progress)
+ cout<<"\033[K";
if(fail)
cout<<"Build failed\n";
+ else if(show_progress)
+ cout<<"Build complete\n";
return fail?1:0;
}
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();
*/
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<<i->get_name();
+ cout<<(*i)->get_name();
}
cout<<"\n\n";
cout<<"Package configuration:\n";
Application::RegApp<Builder> Builder::reg;
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
+
+Builder::Loader::Loader(Builder &b, const 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;
+ load_sub<ProfileLoader>(prf);
+ 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));
+}