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

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 3b6ef11..b09ccf2 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 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,65 +28,72 @@ class SourcePackage: public Package
 public:
 	enum InstallFlags
 	{
-		INCLUDE=1,
-		BIN=2,
-		LIB=4,
-		DATA=8
+		INCLUDE = 1,
+		BIN = 2,
+		LIB = 4,
+		DATA = 8
 	};
 
-	/// Loads a package from a file.
 	class Loader: public Package::Loader
 	{
 	public:
 		Loader(Package &);
 		SourcePackage &get_object() { return static_cast<SourcePackage &>(pkg); }
 	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 &);
 	};
 
-	SourcePackage(Builder &, const std::string &, const Msp::Path &);
-	void                set_path(const Msp::Path &);
-	const std::string   &get_name() const           { return name; }
-	const std::string   &get_version() const        { return version; }
-	const std::string   &get_description() const    { return description; }
-	const Msp::Path &get_source() const       { return source; }
-	Msp::Path     get_temp_dir() const;
-	Msp::Path     get_out_dir() const;
-	const ComponentList &get_components() const     { return components; }
-	const Config        &get_config() const         { return config; }
-	const BuildInfo     &get_build_info() const     { return build_info; }
-	const BuildInfo     &get_exported_binfo() const { return export_binfo; }
-	Builder             &get_builder() const        { return builder; }
-	unsigned            get_install_flags();
-	LibMode             get_library_mode() const;
-	const PathList      &get_tar_files() const      { return tar_files; }
-	DependencyCache     &get_deps_cache() const     { return deps_cache; }
 private:
-	std::string   version;
-	std::string   description;
+	std::string version;
+	std::string description;
 
-	Msp::Path source;
-	PackageList   base_reqs;
-	FeatureList   features;
-	BuildInfo     build_info;
+	Msp::FS::Path source;
+	FeatureList features;
+	BuildInfo build_info;
 	ConditionList conditions;
 	ComponentList components;
-	Config        config;
-	bool          conf_done;
+	Config config;
 	mutable DependencyCache deps_cache;
-	PathList      tar_files;
 
-	//Package(Builder &, const std::string &, const std::vector<std::string> &);
+public:
+	SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
+	const std::string &get_name() const { return name; }
+	const std::string &get_version() const { return version; }
+	const std::string &get_description() const { return description; }
+	const Msp::FS::Path &get_source() const { return source; }
+	Msp::FS::Path get_temp_dir() const;
+	Msp::FS::Path get_out_dir() const;
+	const ComponentList &get_components() const { return components; }
+	const Config &get_config() const { return config; }
+	const BuildInfo &get_build_info() const { return build_info; }
+	const BuildInfo &get_exported_binfo() const { return export_binfo; }
+	Builder &get_builder() const { return builder; }
+
+	/** Returns a bitmask indicating which kinds of things the components of
+	this package install. */
+	unsigned get_install_flags();
+
+	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);
-	void         init_config();
+
+	/** Initializes configuration options. */
+	void init_config();
+
+	/** 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