Remove some unused #includes

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 7ec986e1c2c2d4395d76c8e20d78a2d91235538d..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,18 +20,19 @@ 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();
 
-       create_build_info();
-       create_targets();
+       do_prepare();
        prepared = true;
 }
 
 
 Package::Loader::Loader(Package &p):
-       DataFile::ObjectLoader<Package>(p)
+       DataFile::ObjectLoader<Package>(p),
+       ArchitectureConditional(p.builder, p.name)
 {
+       add("label",   &Package::label);
        add("require", &Loader::require);
 }
 
@@ -42,4 +41,6 @@ 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));
 }