X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=5f25f1a90eb053705092d75b13f565109ffbf2a4;hb=62106ed7cef9b8ef6f07aaf491f8250f7e8d9398;hp=05bebcc55f929971cb5d1780ba98200b6730bcca;hpb=5ed38947b3fabd977a7f68b512115fe1456ea096;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 05bebcc..5f25f1a 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,6 +1,7 @@
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "booleanevaluator.h"
 #include "builder.h"
 #include "package.h"
 
@@ -10,6 +11,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)
 {
@@ -33,12 +35,14 @@ Package::Loader::Loader(Package &p):
 	DataFile::ObjectLoader<Package>(p)
 {
 	add("if_arch", &Loader::if_arch);
+	add("label",   &Package::label);
 	add("require", &Loader::require);
 }
 
 void Package::Loader::if_arch(const string &cond)
 {
-	bool match = obj.builder.get_current_arch().match_name(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);
@@ -49,4 +53,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));
 }