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

diff --git a/source/package.cpp b/source/package.cpp
index 5cf7e07..c905ee4 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,66 +1,87 @@
+/* $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 "builder.h"
+#include "misc.h"
 #include "package.h"
 
 using namespace std;
 using namespace Msp;
 
-PackageRef::PackageRef(Builder &b, const string &n):
+#include <iostream>
+
+/**
+Creates a buildable package.
+*/
+Package::Package(Builder &b, const string &n):
 	builder(b),
 	name(n),
-	package(0)
+	conf_done(false),
+	use_pkgconfig(true)
 { }
 
-Package *PackageRef::get_package()
+/**
+Collects all directly and indirectly required packages, including the package
+itself.
+*/
+PackageList Package::collect_requires()
 {
-	if(!package)
-		package=builder.get_package(name);
-	return package;
-}
+	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);
+	}
 
-Package::Package(Builder &b, const string &n, const Path::Path &s):
-	builder(b),
-	name(n),
-	source(s),
-	buildable(false)
-{
-}
+	result.sort();
+	result.unique();
 
-void Package::resolve_refs()
-{
-	for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->get_package();
+	return result;
 }
 
-Package::Loader::Loader(Package &p):
-	pkg(p)
+/**
+Processes configuration options that were most likely obtained from the command
+line.
+*/
+void Package::configure(const StringMap &opts, unsigned flag)
 {
-	add("version",     &Package::version);
-	add("description", &Package::description);
-	add("require",     &Loader::require);
-	add("program",     &Loader::program);
-	add("library",     &Loader::library);
-}
+	if(conf_done)
+		return;
 
-Package::Loader::~Loader()
-{
-	pkg.buildable=true;
-}
+	if(builder.get_verbose()>=3)
+		cout<<"Configuring "<<name<<'\n';
 
-void Package::Loader::require(const string &n)
-{
-	pkg.requires.push_back(PackageRef(pkg.builder, 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();
+
+	conf_done=true;
 }
 
-void Package::Loader::program(const std::string &n)
+/*** private ***/
+
+Package::Loader::Loader(Package &p):
+	pkg(p)
 {
-	Component prog(pkg, Component::PROGRAM, n);
-	load_sub(prog);
-	pkg.components.push_back(prog);
+	add("require", &Loader::require);
 }
 
-void Package::Loader::library(const std::string &n)
+void Package::Loader::require(const string &n)
 {
-	Component prog(pkg, Component::LIBRARY, n);
-	load_sub(prog);
-	pkg.components.push_back(prog);
+	Package *req=pkg.builder.get_package(n);
+	if(req)
+		pkg.requires.push_back(req);
 }