X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=9327f17c4eccc619cfa9e1b2dd5226d93c8ed701;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=3e30790c5f7192e63039eae1464ab29f63f739be;hpb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 3e30790..9327f17 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"
@@ -18,6 +12,14 @@ Distributed under the LGPL
 #include "package.h"
 
 class Builder;
+class BuildType;
+
+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.
@@ -25,69 +27,70 @@ A package that can be built by Builder.
 class SourcePackage: public Package
 {
 public:
-	enum InstallFlags
+	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
 	{
-		INCLUDE=1,
-		BIN=2,
-		LIB=4,
-		DATA=8
-	};
+	private:
+		const Config::InputOptions *options;
+		std::map<std::string, std::string> install_map;
 
-	/// Loads a package from a file.
-	class Loader: public Package::Loader
-	{
 	public:
-		Loader(Package &);
-		SourcePackage &get_object() { return static_cast<SourcePackage &>(pkg); }
+		Loader(SourcePackage &);
+		Loader(SourcePackage &, const Config::InputOptions &);
 	private:
+		void init(const Config::InputOptions *);
+		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 headers(const std::string &);
+		void if_arch(const std::string &);
+		void if_feature(const std::string &);
+		void tarball(const std::string &);
 		void tar_file(const std::string &);
 	};
 
-	SourcePackage(Builder &, const std::string &, const Msp::Path::Path &);
-	void                set_path(const Msp::Path::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::Path &get_source() const       { return source; }
-	Msp::Path::Path     get_temp_dir() const;
-	Msp::Path::Path     get_out_dir() const;
-	Msp::Path::Path     get_prefix() const          { return config.get_option("prefix").value; }
-	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();
-	const std::string   &get_arch() const           { return config.get_option("arch").value; }
-	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::Path source;
-	PackageList   base_reqs;
-	FeatureList   features;
-	BuildInfo     build_info;
-	ConditionList conditions;
+	Msp::FS::Path source;
+	const BuildType *build_type;
+	FeatureList features;
+	BuildInfo build_info;
 	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_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; }
+	void set_build_type(const BuildType &);
+	const BuildInfo &get_build_info() const { return build_info; }
+	Builder &get_builder() const { return builder; }
+
+	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();
+
+	virtual void save_caches();
 };
 
 #endif