Remove some unused #includes

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 5cf7e07b6bd7e67e00cdf550c217dfb6dc80a6cb..e16cd37aa592617a47de4e605d29462170d19896 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,66 +1,46 @@
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "package.h"
 
 using namespace std;
 using namespace Msp;
 
-PackageRef::PackageRef(Builder &b, const string &n):
+Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
-       package(0)
-{ }
-
-Package *PackageRef::get_package()
-{
-       if(!package)
-               package=builder.get_package(name);
-       return package;
-}
-
-Package::Package(Builder &b, const string &n, const Path::Path &s):
-       builder(b),
-       name(n),
-       source(s),
-       buildable(false)
+       label(string(1, toupper(n[0]))+n.substr(1)),
+       prepared(false),
+       use_pkgconfig(true)
 {
+       builder.get_package_manager().add_package(this);
 }
 
-void Package::resolve_refs()
+void Package::prepare()
 {
-       for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
-               i->get_package();
-}
+       if(prepared)
+               return;
 
-Package::Loader::Loader(Package &p):
-       pkg(p)
-{
-       add("version",     &Package::version);
-       add("description", &Package::description);
-       add("require",     &Loader::require);
-       add("program",     &Loader::program);
-       add("library",     &Loader::library);
-}
+       for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+               (*i)->prepare();
 
-Package::Loader::~Loader()
-{
-       pkg.buildable=true;
+       do_prepare();
+       prepared = true;
 }
 
-void Package::Loader::require(const string &n)
-{
-       pkg.requires.push_back(PackageRef(pkg.builder, n));
-}
 
-void Package::Loader::program(const std::string &n)
+Package::Loader::Loader(Package &p):
+       DataFile::ObjectLoader<Package>(p),
+       ArchitectureConditional(p.builder, p.name)
 {
-       Component prog(pkg, Component::PROGRAM, n);
-       load_sub(prog);
-       pkg.components.push_back(prog);
+       add("label",   &Package::label);
+       add("require", &Loader::require);
 }
 
-void Package::Loader::library(const std::string &n)
+void Package::Loader::require(const string &n)
 {
-       Component prog(pkg, Component::LIBRARY, n);
-       load_sub(prog);
-       pkg.components.push_back(prog);
+       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));
 }