X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=6e570c8628eb07f5d1bef95190bc1c539b2454d9;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=44444add8b04acb641d97fcccff567b4c74dae87;hpb=592fa2bca4e973678cbdc86802fe1c151b40e04d;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 44444ad..6e570c8 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,6 +8,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)
 {
@@ -22,8 +20,8 @@ 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();
 
 	do_prepare();
 	prepared = true;
@@ -31,25 +29,18 @@ 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)
-{
-	const Architecture &arch = obj.builder.get_current_arch();
-	bool negate = (cond[0]=='!');
-	bool match = (arch.match_name(cond.substr(negate))!=negate);
-	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);
 	if(req)
 		obj.requires.push_back(req);
+	else
+		obj.problems.push_back(format("Required package %s not found", n));
 }