Remove some unused #includes

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 44444add8b04acb641d97fcccff567b4c74dae87..e16cd37aa592617a47de4e605d29462170d19896 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,8 +1,5 @@
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
-#include <msp/strings/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
-#include "misc.h"
 #include "package.h"
 
 using namespace std;
@@ -11,6 +8,7 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
+       label(string(1, toupper(n[0]))+n.substr(1)),
        prepared(false),
        use_pkgconfig(true)
 {
@@ -22,7 +20,7 @@ void Package::prepare()
        if(prepared)
                return;
 
-       for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+       for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
                (*i)->prepare();
 
        do_prepare();
@@ -31,25 +29,18 @@ void Package::prepare()
 
 
 Package::Loader::Loader(Package &p):
-       DataFile::ObjectLoader<Package>(p)
+       DataFile::ObjectLoader<Package>(p),
+       ArchitectureConditional(p.builder, p.name)
 {
-       add("if_arch", &Loader::if_arch);
+       add("label",   &Package::label);
        add("require", &Loader::require);
 }
 
-void Package::Loader::if_arch(const string &cond)
-{
-       const Architecture &arch = obj.builder.get_current_arch();
-       bool negate = (cond[0]=='!');
-       bool match = (arch.match_name(cond.substr(negate))!=negate);
-       obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
-       if(match)
-               load_sub_with(*this);
-}
-
 void Package::Loader::require(const string &n)
 {
        Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
                obj.requires.push_back(req);
+       else
+               obj.problems.push_back(format("Required package %s not found", n));
 }