X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=5efed1a08ad06bd1ef4db470b3c263f4f4d53f09;hb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;hp=1b32bfa10cf4dde67dd50ce33b6007f24d5f46d3;hpb=b3ce9052ba98a4585aec75117265d170b7ccfdb8;p=builder.git

diff --git a/source/component.h b/source/component.h
index 1b32bfa..5efed1a 100644
--- a/source/component.h
+++ b/source/component.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef COMPONENT_H_
 #define COMPONENT_H_
 
@@ -12,6 +5,7 @@ Distributed under the LGPL
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "installmap.h"
 #include "misc.h"
 #include "package.h"
 
@@ -30,19 +24,15 @@ public:
 	{
 	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
@@ -52,33 +42,34 @@ public:
 		PROGRAM,
 		MODULE,
 		DATAFILE,
-		TARBALL,
-		INSTALL
+		INSTALL,
+		TARBALL
 	};
 
 protected:
 	SourcePackage &pkg;
 	Type type;
 	std::string name;
-	PathList sources;
+	StringList sources;
 	bool install;
-	const Component *module_host;
-	bool modular;
 	BuildInfo build_info;
 	PackageList requires;
 	bool deflt;
+	InstallMap install_map;
 
 public:
 	Component(SourcePackage &, Type, const std::string &);
 	const SourcePackage &get_package() const { return pkg; }
 	Type get_type() const { return type; }
 	const std::string &get_name() const { return name; }
-	const PathList &get_sources() const { return sources; }
+	const StringList &get_sources() const { return sources; }
 	const BuildInfo &get_build_info() const { return build_info; }
 	bool get_install() const { return install; }
-	bool is_modular() const { return modular; }
 	const PackageList &get_requires() const { return requires; }
 	bool is_default() const { return deflt; }
+	const InstallMap &get_install_map() const { return install_map; }
+
+	void configure(const StringMap &, unsigned);
 
 	/** Prepares the build information for building.  Pulls build info from the
 	parent and dependency packages, and adds any component-specific flags. */