X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcomponent.h;h=5da28838f5d5035fe44aa3a51d798bdd26c92097;hb=7bf0b5d013b88b0408031e2d6594357e71c8138f;hp=890cad48cb72527a916fac1e3b0dc7bd11bad88e;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/component.h b/source/component.h
index 890cad4..5da2883 100644
--- a/source/component.h
+++ b/source/component.h
@@ -2,9 +2,10 @@
 #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"
 #include "misc.h"
 #include "package.h"
 
@@ -19,28 +20,19 @@ their own.
 class Component
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>
 	{
-	private:
-		Component &comp;
-		std::string inst_hdr;
-
 	public:
 		Loader(Component &);
-		Component &get_object() { return comp; }
 	private:
-		virtual void finish();
 		void source(const std::string &);
 		void require(const std::string &);
-		void modular();
-		void host(const std::string &);
-		void install_headers(const std::string &);
 		void build_info();
+		void install_map();
 	};
 
 	enum Type
 	{
-		HEADERS,
 		LIBRARY,
 		PROGRAM,
 		MODULE,
@@ -50,7 +42,7 @@ public:
 	};
 
 protected:
-	SourcePackage &pkg;
+	SourcePackage &package;
 	Type type;
 	std::string name;
 	StringList sources;
@@ -58,19 +50,22 @@ protected:
 	BuildInfo build_info;
 	PackageList requires;
 	bool deflt;
+	InstallMap install_map;
 
 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; }
 	const StringList &get_sources() const { return sources; }
 	const BuildInfo &get_build_info() const { return build_info; }
 	bool get_install() const { return install; }
-	const PackageList &get_requires() const { return requires; }
+	const PackageList &get_required_packages() const { return requires; }
 	bool is_default() const { return deflt; }
+	const InstallMap &get_install_map() const { return install_map; }
 
-	void configure(const StringMap &, unsigned);
+	void prepare();
 
 	/** Prepares the build information for building.  Pulls build info from the
 	parent and dependency packages, and adds any component-specific flags. */
@@ -83,6 +78,4 @@ protected:
 	PathList collect_source_files() const;
 };
 
-typedef std::list<Component> ComponentList;
-
 #endif