X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=10c2db01d307c47a357b790ef3dd73cda87c980e;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=7ec986e1c2c2d4395d76c8e20d78a2d91235538d;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 7ec986e..10c2db0 100644
--- 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,8 +8,7 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
 	builder(b),
 	name(n),
-	prepared(false),
-	use_pkgconfig(true)
+	label(string(1, toupper(n[0]))+n.substr(1))
 {
 	builder.get_package_manager().add_package(this);
 }
@@ -22,18 +18,19 @@ void Package::prepare()
 	if(prepared)
 		return;
 
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->prepare();
+	for(Package *r: requires)
+		r->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 +39,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));
 }