X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=38829f758c76af4f44cde0ec1a88565b42238a22;hb=ca18323d45d67243773b03668e79c715aa976441;hp=b35a0d8f0ab0af20eaa65acd03636592b86493ce;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index b35a0d8..38829f7 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,10 +1,4 @@
-/* $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"
@@ -14,29 +8,13 @@ Distributed under the LGPL
 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)
@@ -44,8 +22,7 @@ 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);
 
@@ -57,7 +34,7 @@ void Package::configure(const StringMap &opts, unsigned flag)
 
 	create_build_info();
 
-	conf_done=true;
+	conf_done = true;
 }
 
 
@@ -69,7 +46,7 @@ Package::Loader::Loader(Package &p):
 
 void Package::Loader::require(const string &n)
 {
-	Package *req=pkg.builder.get_package(n);
+	Package *req = pkg.builder.get_package_manager().find_package(n);
 	if(req)
 		pkg.requires.push_back(req);
 }