Various fixes to package dependency and build info handling

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index b35a0d8f0ab0af20eaa65acd03636592b86493ce..c3d7d75a0fcb037e021a9cfd45c219f8a694c552 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -5,6 +5,7 @@ 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,8 +15,6 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
@@ -23,29 +22,13 @@ Package::Package(Builder &b, const string &n):
        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;
-}
-
 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);
 
@@ -57,7 +40,7 @@ void Package::configure(const StringMap &opts, unsigned flag)
 
        create_build_info();
 
-       conf_done=true;
+       conf_done = true;
 }
 
 
@@ -69,7 +52,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(n);
        if(req)
                pkg.requires.push_back(req);
 }