X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=cf63b0ecbb8dd1c9960d8563751b966cd31989ea;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=0745a1b1614389643e5bf6ffc3936283a08bddc1;hpb=1fdef3ec9d6291af8a467ea0e2c90e7f19141ae2;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 0745a1b..cf63b0e 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef SOURCEPACKAGE_H_
 #define SOURCEPACKAGE_H_
 
+#include <stdexcept>
 #include <string>
 #include "buildinfo.h"
 #include "component.h"
@@ -19,6 +13,13 @@ Distributed under the LGPL
 
 class Builder;
 
+class bad_expansion: public std::runtime_error
+{
+public:
+	bad_expansion(const std::string &w): std::runtime_error(w) { }
+	virtual ~bad_expansion() throw() { }
+};
+
 /**
 A package that can be built by Builder.
 */
@@ -27,10 +28,10 @@ class SourcePackage: public Package
 public:
 	enum InstallFlags
 	{
-		INCLUDE=1,
-		BIN=2,
-		LIB=4,
-		DATA=8
+		INCLUDE = 1,
+		BIN = 2,
+		LIB = 4,
+		DATA = 8
 	};
 
 	class Loader: public Package::Loader
@@ -54,13 +55,11 @@ private:
 	std::string description;
 
 	Msp::FS::Path source;
-	PackageList base_reqs;
 	FeatureList features;
 	BuildInfo build_info;
 	ConditionList conditions;
 	ComponentList components;
 	Config config;
-	bool conf_done;
 	mutable DependencyCache deps_cache;
 
 public:
@@ -83,6 +82,7 @@ public:
 
 	LibMode get_library_mode() const;
 	DependencyCache &get_deps_cache() const { return deps_cache; }
+	std::string expand_string(const std::string &) const;
 private:
 	virtual void do_configure(const StringMap &, unsigned);