Trim down the package preparation code

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index b35a0d8f0ab0af20eaa65acd03636592b86493ce..7ec986e1c2c2d4395d76c8e20d78a2d91235538d 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of builder
-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,62 +8,38 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
-       conf_done(false),
+       prepared(false),
        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;
+       builder.get_package_manager().add_package(this);
 }
 
-void Package::configure(const StringMap &opts, unsigned flag)
+void Package::prepare()
 {
-       if(conf_done)
+       if(prepared)
                return;
 
-       if(builder.get_verbose()>=3)
-               cout<<"Configuring "<<name<<'\n';
-
-       do_configure(opts, flag);
-
-       requires.sort();
-       requires.unique();
-
-       for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               (*i)->configure(opts, flag&2);
+       for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+               (*i)->prepare();
 
        create_build_info();
-
-       conf_done=true;
+       create_targets();
+       prepared = true;
 }
 
 
 Package::Loader::Loader(Package &p):
-       pkg(p)
+       DataFile::ObjectLoader<Package>(p)
 {
        add("require", &Loader::require);
 }
 
 void Package::Loader::require(const string &n)
 {
-       Package *req=pkg.builder.get_package(n);
+       Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
-               pkg.requires.push_back(req);
+               obj.requires.push_back(req);
 }