X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=b8750ee393f3d0946818297c58301840edd5f54e;hb=3aad704c2d2fac737424a0a2697874927bd95c37;hp=f4a8e242adb69bb1f63b2caec1b736d822a8fdb3;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index f4a8e24..b8750ee 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -16,7 +16,6 @@ Distributed under the LGPL
 #include "dependencycache.h"
 #include "feature.h"
 #include "package.h"
-#include "packageref.h"
 
 class Builder;
 
@@ -34,7 +33,6 @@ public:
 		DATA=8
 	};
 
-	/// Loads a package from a file.
 	class Loader: public Package::Loader
 	{
 	public:
@@ -51,44 +49,50 @@ public:
 		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; }
-	virtual void        resolve_refs();
 private:
-	std::string   version;
-	std::string   description;
+	std::string version;
+	std::string description;
 
-	Msp::Path::Path source;
-	PackageList   all_reqs;
-	FeatureList   features;
-	BuildInfo     build_info;
+	Msp::FS::Path source;
+	PackageList base_reqs;
+	FeatureList features;
+	BuildInfo build_info;
 	ConditionList conditions;
 	ComponentList components;
-	Config        config;
-	bool          conf_done;
+	Config config;
+	bool conf_done;
 	mutable DependencyCache deps_cache;
-	PathList      tar_files;
+	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;
+	const PathList &get_tar_files() const { return tar_files; }
+	DependencyCache &get_deps_cache() const { return deps_cache; }
+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();
 };