X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=11f47940dc29f8712a79cd1da203bfe39d52d19d;hb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;hp=e170399aa4ab14db6abd94a3b7bc1f17f884db66;hpb=49ee08bb6f63f6b3a8cdd3b7cf032dea9b2cba8a;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index e170399..11f4794 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.
 */
@@ -33,11 +34,13 @@ public:
 		DATA = 8
 	};
 
-	class Loader: public Package::Loader
+	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
 	{
+	private:
+		std::map<std::string, std::string> install_map;
+
 	public:
-		Loader(Package &);
-		SourcePackage &get_object() { return static_cast<SourcePackage &>(pkg); }
+		Loader(SourcePackage &);
 	private:
 		virtual void finish();
 		void feature(const std::string &, const std::string &);
@@ -45,6 +48,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 &);
 	};
@@ -81,6 +85,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);
 
@@ -90,6 +95,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