X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=64cec87f15e48803e349ab2b5a242470d7cc4f56;hb=e3407687a61bce56912b89818a9d9f006e9da41f;hp=c905ee464e7041de6372cbcca0f7e7142e20ef35;hpb=1968c546cfb30214e8dc5afc722bec14aa8373f5;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index c905ee4..64cec87 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,87 +1,48 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
-#include "misc.h"
 #include "package.h"
 
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
-/**
-Creates a buildable package.
-*/
 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)
-{ }
-
-/**
-Collects all directly and indirectly required packages, including the package
-itself.
-*/
-PackageList Package::collect_requires()
 {
-	PackageList result;
-	result.push_back(this);
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-	{
-		PackageList r=(*i)->collect_requires();
-		result.splice(result.end(), r);
-	}
-
-	result.sort();
-	result.unique();
-
-	return result;
+	builder.get_package_manager().add_package(this);
 }
 
-/**
-Processes configuration options that were most likely obtained from the command
-line.
-*/
-void Package::configure(const StringMap &opts, unsigned flag)
+void Package::prepare()
 {
-	if(conf_done)
+	if(prepared)
 		return;
 
-	if(builder.get_verbose()>=3)
-		cout<<"Configuring "<<name<<'\n';
-
-	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();
+	for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+		(*i)->prepare();
 
-	conf_done=true;
+	do_prepare();
+	prepared = true;
 }
 
-/*** private ***/
 
 Package::Loader::Loader(Package &p):
-	pkg(p)
+	DataFile::ObjectLoader<Package>(p),
+	ArchitectureConditional(p.builder, p.name)
 {
+	add("label",   &Package::label);
 	add("require", &Loader::require);
 }
 
 void Package::Loader::require(const string &n)
 {
-	Package *req=pkg.builder.get_package(n);
+	Package *req = obj.builder.get_package_manager().find_package(n);
 	if(req)
-		pkg.requires.push_back(req);
+		obj.requires.push_back(req);
+	else
+		obj.problems.push_back(format("Required package %s not found", n));
 }