X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=e16cd37aa592617a47de4e605d29462170d19896;hb=0e76f1c82e89feea5f49ce20b771fd304bd93bd3;hp=f74b4a09bdda43e905df82ff8584009b2da0b9db;hpb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index f74b4a0..e16cd37 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,36 +8,31 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
 	builder(b),
 	name(n),
-	conf_done(false),
+	label(string(1, toupper(n[0]))+n.substr(1)),
+	prepared(false),
 	use_pkgconfig(true)
 {
 	builder.get_package_manager().add_package(this);
 }
 
-void Package::configure(const StringMap &opts, unsigned flag)
+void Package::prepare()
 {
-	if(conf_done)
+	if(prepared)
 		return;
 
-	builder.get_logger().log("configure", format("Configuring %s", name));
+	for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+		(*i)->prepare();
 
-	do_configure(opts, flag);
-
-	requires.sort();
-	requires.unique();
-
-	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->configure(opts, flag&2);
-
-	create_build_info();
-
-	conf_done = true;
+	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);
 }
 
@@ -49,4 +41,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));
 }