X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=32cbe0a79ee7edeb04b777ab43201aae9d35faa1;hb=740d7cdd71fc2f068e44bfc6c8cc7e9565de16f6;hp=cdb3f8d8dba01f9829d917c6cdb0157848595986;hpb=75ac80cb255e4def7ee685ce9c46db7c2f6625aa;p=builder.git

diff --git a/source/component.h b/source/component.h
index cdb3f8d..32cbe0a 100644
--- a/source/component.h
+++ b/source/component.h
@@ -2,7 +2,7 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "installmap.h"
@@ -20,14 +20,10 @@ their own.
 class Component
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>
 	{
-	private:
-		Component &comp;
-
 	public:
 		Loader(Component &);
-		Component &get_object() { return comp; }
 	private:
 		void source(const std::string &);
 		void require(const std::string &);
@@ -46,7 +42,7 @@ public:
 	};
 
 protected:
-	SourcePackage &pkg;
+	SourcePackage &package;
 	Type type;
 	std::string name;
 	StringList sources;
@@ -58,29 +54,35 @@ protected:
 
 public:
 	Component(SourcePackage &, Type, const std::string &);
-	const SourcePackage &get_package() const { return pkg; }
+
+	const SourcePackage &get_package() const { return package; }
 	Type get_type() const { return type; }
 	const std::string &get_name() const { return name; }
+
+	/** Returns a list of sources for the component.  They may refer to
+	directories or individual files. */
 	const StringList &get_sources() const { return sources; }
-	const BuildInfo &get_build_info() const { return build_info; }
+
+protected:
+	/** Returns a list of all source files for the component. */
+	PathList collect_source_files() const;
+
+public:
 	bool get_install() const { return install; }
-	const PackageList &get_requires() const { return requires; }
-	bool is_default() const { return deflt; }
 	const InstallMap &get_install_map() const { return install_map; }
+	const PackageList &get_required_packages() const { return requires; }
+	bool is_default() const { return deflt; }
 
-	void configure(const StringMap &, unsigned);
+	/** Prepares any required packages. */
+	void prepare();
 
 	/** Prepares the build information for building.  Pulls build info from the
 	parent and dependency packages, and adds any component-specific flags. */
 	void create_build_info();
 
-	void create_targets() const;
+	const BuildInfo &get_build_info() const { return build_info; }
 
-protected:
-	/** Returns a list of all source files for the component. */
-	PathList collect_source_files() const;
+	void create_targets() const;
 };
 
-typedef std::list<Component> ComponentList;
-
 #endif