X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=f1374298eac0c8d14315a03d751498d5ba144a97;hb=20994a6f4802f2dbcf01888d0e1996edf554ade5;hp=23a8d9c8e6c73a0b592d0d0de5849419d1df0b0b;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 23a8d9c..f137429 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,10 +1,11 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+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,11 +15,6 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
-/**
-Creates a buildable package.
-*/
 Package::Package(Builder &b, const string &n):
 	builder(b),
 	name(n),
@@ -26,38 +22,43 @@ Package::Package(Builder &b, const string &n):
 	use_pkgconfig(true)
 { }
 
-/**
-Tries to resolve all references to dependency packages.
-*/
-void Package::resolve_refs()
+PackageList Package::collect_requires()
 {
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->resolve();
+	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;
 }
 
-/**
-Processes configuration options that were most likely obtained from the command
-line.
-*/
 void Package::configure(const StringMap &opts, unsigned flag)
 {
 	if(conf_done)
 		return;
 
 	if(builder.get_verbose()>=3)
-		cout<<"Configuring "<<name<<'\n';
+		IO::print("Configuring %s\n", name);
 
 	do_configure(opts, flag);
 
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->get_package()->configure(opts, flag&2);
+	requires.sort();
+	requires.unique();
+
+	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
+		(*i)->configure(opts, flag&2);
 
 	create_build_info();
 
-	conf_done=true;
+	conf_done = true;
 }
 
-/*** private ***/
 
 Package::Loader::Loader(Package &p):
 	pkg(p)
@@ -67,5 +68,7 @@ Package::Loader::Loader(Package &p):
 
 void Package::Loader::require(const string &n)
 {
-	pkg.requires.push_back(PackageRef(pkg.builder, n));
+	Package *req = pkg.builder.get_package(n);
+	if(req)
+		pkg.requires.push_back(req);
 }