Better logging system

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 20fec32acfb84d64665ff2c05372482761de3eb2..38829f758c76af4f44cde0ec1a88565b42238a22 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,29 +8,21 @@ 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),
        conf_done(false),
        use_pkgconfig(true)
-{ }
+{
+       builder.get_package_manager().add_package(this);
+}
 
-/**
-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';
+       builder.get_logger().log("configure", format("Configuring %s", name));
 
        do_configure(opts, flag);
 
@@ -48,10 +34,9 @@ void Package::configure(const StringMap &opts, unsigned flag)
 
        create_build_info();
 
-       conf_done=true;
+       conf_done = true;
 }
 
-/*** private ***/
 
 Package::Loader::Loader(Package &p):
        pkg(p)
@@ -61,7 +46,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_manager().find_package(n);
        if(req)
                pkg.requires.push_back(req);
 }