X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=8ba3eb3c899fa4febd920ba9b18bcc2e6920e535;hb=75ac80cb255e4def7ee685ce9c46db7c2f6625aa;hp=883bbf65f345fe70fea0551ab14864362ba67526;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 883bbf6..8ba3eb3 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.
 */
@@ -35,6 +36,9 @@ public:
 
 	class Loader: public Package::Loader
 	{
+	private:
+		std::map<std::string, std::string> install_map;
+
 	public:
 		Loader(Package &);
 		SourcePackage &get_object() { return static_cast<SourcePackage &>(pkg); }
@@ -45,6 +49,7 @@ public:
 		void component(const std::string &);
 		void condition(const std::string &);
 		void build_info();
+		void headers(const std::string &);
 		void tarball(const std::string &);
 		void tar_file(const std::string &);
 	};
@@ -54,13 +59,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 +86,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);
 
@@ -92,6 +96,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