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

diff --git a/source/package.cpp b/source/package.cpp
index 23a8d9c..c905ee4 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -27,12 +27,23 @@ Package::Package(Builder &b, const string &n):
 { }
 
 /**
-Tries to resolve all references to dependency packages.
+Collects all directly and indirectly required packages, including the package
+itself.
 */
-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;
 }
 
 /**
@@ -49,8 +60,11 @@ void Package::configure(const StringMap &opts, unsigned flag)
 
 	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();
 
@@ -67,5 +81,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);
 }