X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=64cec87f15e48803e349ab2b5a242470d7cc4f56;hb=e3407687a61bce56912b89818a9d9f006e9da41f;hp=5cf7e07b6bd7e67e00cdf550c217dfb6dc80a6cb;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 5cf7e07..64cec87 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,66 +1,48 @@
+#include <msp/io/print.h>
+#include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.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));
 }