-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007, 2009 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/io/print.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
#include "builder.h"
using namespace std;
using namespace Msp;
-#include <iostream>
-
Package::Package(Builder &b, const string &n):
builder(b),
name(n),
conf_done(false),
use_pkgconfig(true)
-{ }
-
-PackageList Package::collect_requires()
{
- PackageList result;
- result.push_back(this);
- for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
- {
- PackageList r=(*i)->collect_requires();
- result.splice(result.end(), r);
- }
-
- result.sort();
- result.unique();
-
- return result;
+ builder.get_package_manager().add_package(this);
}
void Package::configure(const StringMap &opts, unsigned flag)
if(conf_done)
return;
- if(builder.get_verbose()>=3)
- cout<<"Configuring "<<name<<'\n';
+ builder.get_logger().log("configure", format("Configuring %s", name));
do_configure(opts, flag);
create_build_info();
- conf_done=true;
+ conf_done = true;
}
Package::Loader::Loader(Package &p):
- pkg(p)
+ DataFile::ObjectLoader<Package>(p)
{
add("require", &Loader::require);
}
void Package::Loader::require(const string &n)
{
- Package *req=pkg.builder.get_package(n);
+ Package *req = obj.builder.get_package_manager().find_package(n);
if(req)
- pkg.requires.push_back(req);
+ obj.requires.push_back(req);
}