Replace per-file copyright notices with a single file

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 23a8d9c8e6c73a0b592d0d0de5849419d1df0b0b..c4710bca79a4f6082b7dd3e7b62297e85a247599 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 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 +8,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 +15,27 @@ Package::Package(Builder &b, const string &n):
        use_pkgconfig(true)
 { }
 
-/**
-Tries to resolve all references to dependency packages.
-*/
-void Package::resolve_refs()
-{
-       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               i->resolve();
-}
-
-/**
-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 +45,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);
 }