-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <set>
#include <cstdlib>
#include <msp/core/getopt.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 "copy.h"
+#include "gnuarchiver.h"
+#include "gnuccompiler.h"
+#include "gnucxxcompiler.h"
+#include "gnulinker.h"
+#include "installedfile.h"
#include "package.h"
-#include "pkgconfig.h"
+#include "pkgconfiggenerator.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
-#include "systemlibrary.h"
-#include "unlink.h"
+#include "tar.h"
+#include "task.h"
#include "virtualtarget.h"
using namespace std;
using namespace Msp;
-namespace {
-
-void update_hash(string &hash, const string &value)
-{
- for(unsigned i=0; i<value.size(); ++i)
- hash[i%hash.size()] ^= value[i];
-}
-
-}
-
-
Builder::Builder(int argc, char **argv):
+ package_manager(*this),
main_pkg(0),
native_arch(*this, string()),
+ vfs(*this),
analyzer(0),
build(false),
clean(0),
dry_run(false),
help(false),
- verbose(1),
show_progress(false),
build_file("Build"),
jobs(1),
StringList cmdline_warn;
string prfx;
string arch;
+ bool no_externals = false;
+ unsigned verbose = 1;
+ bool silent = false;
+ list<string> log_channels;
GetOpt getopt;
getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG).set_help("Perform analysis. MODE can be deps, alldeps or rebuild.", "MODE");
getopt.add_option('f', "file", build_file, GetOpt::REQUIRED_ARG).set_help("Read info from FILE instead of Build.", "FILE");
getopt.add_option('h', "help", help, GetOpt::NO_ARG).set_help("Print this message.");
getopt.add_option('j', "jobs", jobs, GetOpt::REQUIRED_ARG).set_help("Run NUM commands at once, whenever possible.", "NUM");
+ getopt.add_option('l', "log", log_channels, GetOpt::REQUIRED_ARG).set_help("Set log channels to be displayed.", "LIST");
getopt.add_option('n', "dry-run", dry_run, GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done.");
+ getopt.add_option('s', "silent", silent, GetOpt::NO_ARG).set_help("Don't print any messages other than errors.");
getopt.add_option('v', "verbose", verbose, GetOpt::NO_ARG).set_help("Print more information about what's going on.");
getopt.add_option('x', "no-externals", no_externals, GetOpt::NO_ARG).set_help("Do not load external source packages.");
getopt.add_option('A', "conf-all", conf_all, GetOpt::NO_ARG).set_help("Apply configuration to all packages.");
helpmsg = getopt.generate_help();
getopt(argc, argv);
+ if(silent)
+ --verbose;
+ if(verbose>=1)
+ {
+ logger.enable_channel("summary");
+ logger.enable_channel("tasks");
+ }
+ if(verbose>=2)
+ {
+ logger.enable_channel("packages");
+ logger.enable_channel("commands");
+ }
+ if(verbose>=3)
+ {
+ logger.enable_channel("packagemgr");
+ logger.enable_channel("configure");
+ }
+ if(verbose>=4)
+ {
+ logger.enable_channel("files");
+ logger.enable_channel("auxcommands");
+ }
+ if(verbose>=5)
+ {
+ logger.enable_channel("tools");
+ logger.enable_channel("vfs");
+ }
+ for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
+ {
+ vector<string> parts = split(*i, ',');
+ for(vector<string>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
+ logger.enable_channel(*j);
+ }
+
if(!analyze_mode.empty())
{
analyzer = new Analyzer(*this);
cwd = FS::getcwd();
- 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");
+ package_manager.set_no_externals(no_externals);
load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
load_build_file((FS::get_user_data_dir("builder")/"rc").str());
warnings.insert(warnings.end(), warns.begin(), warns.end());
}
- pkg_path.push_back(cwd/".");
- pkg_path.push_back(cwd/"..");
+ toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
+ toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
+ toolchain.add_tool(new GnuLinker(*this, *current_arch));
+ toolchain.add_tool(new GnuArchiver(*this, *current_arch));
+ toolchain.add_tool(new Copy(*this));
+ toolchain.add_tool(new Tar(*this));
+ toolchain.add_tool(new PkgConfigGenerator(*this));
}
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;
if(create_targets())
return 1;
- if(verbose>=2)
- {
- 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);
- }
+ logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
+ current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")));
+ logger.log("environment", format("Prefix is %s", prefix));
- if(verbose>=1)
+ const PackageManager::PackageMap &packages = package_manager.get_packages();
+ list<string> package_details;
+ for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
{
- 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(!i->second || !i->second->is_configured())
+ continue;
- if(verbose>=2)
- {
- for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ string line = i->second->get_name();
+ if(dynamic_cast<SourcePackage *>(i->second))
{
- if(!i->second->is_configured())
- continue;
+ line += '*';
- IO::print(" %s", i->second->get_name());
- if(dynamic_cast<SourcePackage *>(i->second))
- IO::print("*");
unsigned count = 0;
unsigned to_be_built = 0;
for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
if(j->second->get_package()==i->second)
{
++count;
- if(j->second->get_rebuild())
+ if(j->second->needs_rebuild())
++to_be_built;
}
if(count)
{
- IO::print(" (%d targets", count);
+ line += format(" (%d targets", count);
if(to_be_built)
- IO::print(", %d to be built", to_be_built);
- IO::print(")");
+ line += format(", %d to be built", to_be_built);
+ line += ')';
}
- IO::print("\n");
}
+
+ package_details.push_back(line);
}
+ logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size()));
+ for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
+ logger.log("packages", *i);
+
if(analyzer)
analyzer->analyze();
return exit_code;
}
-string Builder::run_pkgconfig(const string &pkg, const string &what)
-{
- list<string> 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 runtime_error(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_system()));
- if(i==packages.end())
- i = packages.find(name);
- if(i!=packages.end())
- return i->second;
-
- if(!no_externals)
- {
- 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 *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));
-
- 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);
if(i!=targets.end())
return i->second;
return 0;
}
-Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
-{
- string hash(8, 0);
- if(include[0]=='\"')
- update_hash(hash, from.str());
- 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;
-
- static string cxx_ver;
- if(cxx_ver.empty())
- {
- StringList argv;
- argv.push_back(current_arch->get_tool("CXX"));
- argv.push_back("--version");
- if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv)))
- {
- 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);
- }
- else
- cxx_ver = "-";
- }
-
- 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()));
-
- StringList syspath;
- if(current_arch->is_native())
- syspath.push_back("/usr/include");
- else
- 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;
- if(include[0]=='\"')
- tgt = get_header(FS::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(FS::Path(*j)/fn);
-
- includes.insert(TargetMap::value_type(id, tgt));
-
- return tgt;
-}
-
-Target *Builder::get_library(const string &lib, 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);
-
- string id = hash+string(1, mode)+lib;
- TargetMap::iterator i = libraries.find(id);
- if(i!=libraries.end())
- return i->second;
-
- StringList syspath;
- if(current_arch->is_native())
- {
- syspath.push_back("/lib");
- syspath.push_back("/usr/lib");
- if(current_arch->match_name("pc-32-linux"))
- syspath.push_back("/usr/lib/i386-linux-gnu");
- else if(current_arch->match_name("pc-64-linux"))
- syspath.push_back("/usr/lib/x86_64-linux-gnu");
- }
- else
- 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;
- for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
- tgt = get_library(lib, cwd/ *j, mode);
- for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
- tgt = get_library(lib, *j, mode);
-
- libraries.insert(TargetMap::value_type(id, tgt));
-
- return tgt;
-}
-
void Builder::apply_profile_template(Config &config, const string &pt) const
{
vector<string> parts = split(pt, '-');
problems.push_back(Problem(p, d));
}
-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)
+void Builder::add_target(Target *t)
{
targets.insert(TargetMap::value_type(t->get_name(), t));
- new_tgts.push_back(t);
}
void Builder::usage(const char *reason, const char *argv0, bool brief)
}
}
-FS::Path Builder::get_package_location(const string &name)
-{
- if(verbose>=3)
- IO::print("Looking for package %s\n", name);
-
- 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<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
- {
- list<string> files = list_files(*i);
- for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
- {
- FS::Path full = *i / *j;
- if(FS::exists(full/"Build"))
- pkg_dirs.push_back(full);
- }
- }
- if(verbose>=3)
- IO::print("%d packages found in path\n", pkg_dirs.size());
- }
-
- bool msp = !name.compare(0, 3, "msp");
- for(list<FS::Path>::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();
-}
-
int Builder::load_build_file(const FS::Path &fn)
{
- try
- {
- IO::BufferedFile in(fn.str());
+ if(!FS::exists(fn))
+ return -1;
- if(verbose>=3)
- IO::print("Reading %s\n", fn);
+ IO::BufferedFile in(fn.str());
- DataFile::Parser parser(in, fn.str());
- Loader loader(*this, fn.subpath(0, fn.size()-1));
- loader.load(parser);
- }
- catch(const IO::file_not_found &)
- {
- return -1;
- }
+ logger.log("files", format("Reading %s", fn));
+
+ DataFile::Parser parser(in, fn.str());
+ Loader loader(*this, fn.subpath(0, fn.size()-1));
+ loader.load(parser);
return 0;
}
Target *tarballs = new VirtualTarget(*this, "tarballs");
world->add_depend(tarballs);
- for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
- {
- if(!i->second || !i->second->is_configured())
- continue;
-
- 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));
- }
- }
-
- // 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)
- {
- FileTarget *tgt = dynamic_cast<FileTarget *>(get_target((cwd/ *i).str()));
- if(!tgt)
- {
- IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
- return -1;
- }
- tgt->touch();
- }
+ const PackageManager::PackageMap &packages = package_manager.get_packages();
+ for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ if(i->second && i->second->is_configured())
+ i->second->create_targets();
// Make the cmdline target depend on all targets mentioned on the command line
Target *cmdline = new VirtualTarget(*this, "cmdline");
{
Target *tgt = get_target(*i);
if(!tgt)
- tgt = get_target((cwd/ *i).str());
+ tgt = vfs.get_target(*i);
+ if(!tgt)
+ tgt = vfs.get_target(cwd/ *i);
if(!tgt)
{
IO::print("I don't know anything about %s\n", *i);
cmdline->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;
-}
-
-Target *Builder::get_header(const FS::Path &fn)
-{
- Target *tgt = get_target(fn.str());
- if(tgt) return tgt;
-
- if(FS::is_reg(fn))
- {
- tgt = new SystemHeader(*this, fn.str());
- return tgt;
- }
- return 0;
-}
-
-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)
+ // Apply what-ifs
+ for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
{
- // XXX Should probably let the Architecture populate the list
- if(current_arch->get_system()=="windows")
+ FileTarget *tgt = vfs.get_target(cwd/ *i);
+ if(!tgt)
{
- candidates.push_back("lib"+lib+".dll");
- candidates.push_back(lib+".dll");
+ IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
+ return -1;
}
- else
- candidates.push_back("lib"+lib+".so");
+ tgt->touch();
}
- /* Static libraries are always considered, since sometimes shared versions
- may not be available */
- candidates.push_back("lib"+lib+".a");
- if(current_arch->get_system()=="windows")
- candidates.push_back("lib"+lib+".dll.a");
-
- for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
+ if(build_all)
{
- string full = (path/ *i).str();
- Target *tgt = get_target(full);
-
- if(tgt)
- {
- Target *real_tgt = tgt->get_real_target();
-
- /* 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(FS::is_reg(full))
- {
- tgt = new SystemLibrary(*this, full);
- return tgt;
- }
+ for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+ if(i->second->is_buildable() && !i->second->needs_rebuild())
+ i->second->force_rebuild();
}
+ for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ if(SourcePackage *spkg = dynamic_cast<SourcePackage *>(i->second))
+ spkg->get_deps_cache().save();
+
return 0;
}
unsigned total = 0;
for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
- if(i->second->is_buildable() && i->second->get_rebuild())
+ if(i->second->is_buildable() && i->second->needs_rebuild())
++total;
if(!total)
{
- IO::print("Already up to date\n");
+ logger.log("summary", "Already up to date");
return 0;
}
- if(verbose>=1)
- IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : ""));
+ logger.log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
- vector<Action *> actions;
+ vector<Task *> tasks;
unsigned count = 0;
while(!finish)
{
- if(actions.size()<jobs && !fail)
+ if(tasks.size()<jobs && !fail)
{
Target *tgt = cmdline->get_buildable_target();
if(tgt)
{
- Action *action = tgt->build();
- if(action)
- actions.push_back(action);
+ if(tgt->get_tool())
+ logger.log("tasks", format("%-4s %s", tgt->get_tool()->get_tag(), tgt->get_name()));
+ Task *task = tgt->build();
+ if(task)
+ {
+ logger.log("commands", format("%s", task->get_command()));
+ if(dry_run)
+ {
+ task->signal_finished.emit(true);
+ delete task;
+ }
+ else
+ {
+ task->start();
+ tasks.push_back(task);
+ }
+ }
if(show_progress)
IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
}
- else if(actions.empty())
+ else if(tasks.empty())
finish = true;
}
else
Time::sleep(10*Time::msec);
- for(unsigned i=0; i<actions.size();)
+ for(unsigned i=0; i<tasks.size();)
{
- int status = actions[i]->check();
- if(status>=0)
+ Task::Status status = tasks[i]->check();
+ if(status!=Task::RUNNING)
{
++count;
- delete actions[i];
- actions.erase(actions.begin()+i);
- if(status>0)
+ delete tasks[i];
+ tasks.erase(tasks.begin()+i);
+ if(status==Task::ERROR)
fail = true;
- if(actions.empty() && fail)
+ if(tasks.empty() && fail)
finish = true;
}
else
if(show_progress)
IO::print("\033[K");
if(fail)
- IO::print("Build failed\n");
+ logger.log("summary", "Build failed");
else if(show_progress)
- IO::print("Build complete\n");
+ logger.log("summary", "Build complete");
return fail;
}
// Cleaning doesn't care about ordering, so a simpler method can be used
set<Target *> clean_tgts;
- TargetList queue;
+ list<Target *> queue;
queue.push_back(get_target("cmdline"));
while(!queue.empty())
if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
clean_tgts.insert(tgt);
- const TargetList &deps = tgt->get_depends();
- for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+ const Target::Dependencies &deps = tgt->get_depends();
+ for(list<Target *>::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)
if(FileTarget *ft = dynamic_cast<FileTarget *>(*i))
- {
- Action *action = new Unlink(*this, *ft);
- while(action->check()<0) ;
- delete action;
- }
+ if(ft->get_mtime())
+ FS::unlink(ft->get_path());
return 0;
}
Builder::Loader::Loader(Builder &b, const FS::Path &s):
- bld(b),
+ DataFile::ObjectLoader<Builder>(b),
src(s)
{
add("binary_package", &Loader::binpkg);
void Builder::Loader::binpkg(const string &n)
{
- BinaryPackage *pkg = new BinaryPackage(bld, n);
+ BinaryPackage *pkg = new BinaryPackage(obj, 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;
+ obj.cross_prefixes[a] = p;
}
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));
+ obj.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
}
void Builder::Loader::package(const string &n)
{
- SourcePackage *pkg = new SourcePackage(bld, n, src);
- if(!bld.main_pkg)
- bld.main_pkg = pkg;
+ SourcePackage *pkg = new SourcePackage(obj, n, src);
+ if(!obj.main_pkg)
+ obj.main_pkg = pkg;
load_sub(*pkg);
- bld.packages.insert(PackageMap::value_type(n, pkg));
}
projects / builder.git / blobdiff