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

diff --git a/source/package.cpp b/source/package.cpp
index 23a8d9c..e16cd37 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,71 +1,46 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#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;
 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)
-{ }
-
-/**
-Tries to resolve all references to dependency packages.
-*/
-void Package::resolve_refs()
 {
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->resolve();
+	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);
-
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->get_package()->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)
 {
-	pkg.requires.push_back(PackageRef(pkg.builder, 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));
 }