X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=10c2db01d307c47a357b790ef3dd73cda87c980e;hb=40ab4f61eaf7fc14fc6d1c2ea5eecee21882893a;hp=19ee511a814cf34bf46efd20f9409c7394b5d879;hpb=02097e6a1ddbffbc2217005c3c2ebba528f5248f;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 19ee511..10c2db0 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,7 +1,4 @@
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
-#include <msp/strings/utils.h>
-#include "booleanevaluator.h"
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "package.h"
 
@@ -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,8 +18,8 @@ void Package::prepare()
 	if(prepared)
 		return;
 
-	for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->prepare();
+	for(Package *r: requires)
+		r->prepare();
 
 	do_prepare();
 	prepared = true;
@@ -31,21 +27,13 @@ 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)
-{
-	BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.builder.get_current_arch(), &Architecture::match_name)), false);
-	bool match = eval.evaluate(cond);
-	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);