Reorder class members

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 23a8d9c8e6c73a0b592d0d0de5849419d1df0b0b..b35a0d8f0ab0af20eaa65acd03636592b86493ce 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,7 +1,7 @@
 /* $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
 */
 
@@ -16,9 +16,6 @@ using namespace Msp;
 
 #include <iostream>
 
-/**
-Creates a buildable package.
-*/
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
@@ -26,19 +23,22 @@ 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)
@@ -49,15 +49,17 @@ 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();
 
        conf_done=true;
 }
 
-/*** private ***/
 
 Package::Loader::Loader(Package &p):
        pkg(p)
@@ -67,5 +69,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);
 }