Move conditionals into helper classes

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 8a05ddc89699950dd5d59ce2977741b4f4be47ad..64cec87f15e48803e349ab2b5a242470d7cc4f56 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -2,7 +2,6 @@
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
-#include "misc.h"
 #include "package.h"
 
 using namespace std;
@@ -11,43 +10,39 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
-       conf_done(false),
+       label(string(1, toupper(n[0]))+n.substr(1)),
+       prepared(false),
        use_pkgconfig(true)
 {
        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)
-               IO::print("Configuring %s\n", name);
+       for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+               (*i)->prepare();
 
-       do_configure(opts, flag);
-
-       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;
+       do_prepare();
+       prepared = true;
 }
 
 
 Package::Loader::Loader(Package &p):
-       pkg(p)
+       DataFile::ObjectLoader<Package>(p),
+       ArchitectureConditional(p.builder, p.name)
 {
+       add("label",   &Package::label);
        add("require", &Loader::require);
 }
 
 void Package::Loader::require(const string &n)
 {
-       Package *req = pkg.builder.get_package_manager().find_package(n);
+       Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
-               pkg.requires.push_back(req);
+               obj.requires.push_back(req);
+       else
+               obj.problems.push_back(format("Required package %s not found", n));
 }