X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=b09ccf2a704f993cd8d873e0b28c2e198cf5149f;hb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;hp=a60c9d2bee94509287f510b5849ed973f4a10b40;hpb=2edc25f87590bd81808792c3c38cab5ae8b94eb3;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index a60c9d2..b09ccf2 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
@@ -41,11 +42,9 @@ public:
 	private:
 		virtual void finish();
 		void feature(const std::string &, const std::string &);
+		template<Component::Type>
+		void component(const std::string &);
 		void condition(const std::string &);
-		void program(const std::string &);
-		void library(const std::string &);
-		void module(const std::string &);
-		void headers(const std::string &);
 		void build_info();
 		void tarball(const std::string &);
 		void tar_file(const std::string &);
@@ -56,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:
@@ -85,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);
 
@@ -94,6 +92,8 @@ private:
 	/** Fills in build info based on configuration.  All required packages must be
 	configured when this is called. */
 	virtual void create_build_info();
+
+	virtual void create_targets();
 };
 
 #endif