X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=0e1efad028d5d627b69e6e59f32c5b4d60ce7d34;hb=e3407687a61bce56912b89818a9d9f006e9da41f;hp=f96f80023527b8bbaed4e8ad47fb99bae785047d;hpb=b5ad62c2c4c7eeadd881e3f157bde96e4dd2cc0e;p=builder.git

diff --git a/source/component.h b/source/component.h
index f96f800..0e1efad 100644
--- a/source/component.h
+++ b/source/component.h
@@ -2,13 +2,14 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/parser/loader.h>
-#include <msp/path/path.h>
+#include <msp/datafile/objectloader.h>
+#include <msp/fs/path.h>
 #include "buildinfo.h"
-#include "misc.h"
-#include "packageref.h"
+#include "conditionalloader.h"
+#include "installmap.h"
+#include "package.h"
 
-class Package;
+class SourcePackage;
 
 /**
 Components specify things to be built.  Each component may build one binary (it
@@ -19,59 +20,71 @@ their own.
 class Component
 {
 public:
-	/// Loads a Component from file.  Used from Package::Loader.
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>, public ConditionalLoader
 	{
 	public:
 		Loader(Component &);
-		Component &get_object() { return comp; }
 	private:
-		Component &comp;
-
-		void source(const std::string &);
-		void require(const std::string &);
-		void modular();
-		void host(const std::string &);
 		void build_info();
+		void install_map();
+		void overlay(const std::string &);
+		void require(const std::string &);
+		void source(const std::string &);
 	};
 
-	enum Type
-	{
-		PROGRAM,
-		LIBRARY,
-		MODULE,
-		HEADERS
-	};
+	typedef std::list<Msp::FS::Path> SourceList;
+	typedef std::list<std::string> OverlayList;
 
-	Component(Package &, Type, const std::string &);
-	const Package     &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 BuildInfo   &get_build_info() const      { return build_info; }
-	bool              get_install() const          { return install; }
-	const std::string &get_install_headers() const { return install_headers; }
-	bool              get_modular() const          { return modular; }
-	const PkgRefList  &get_requires() const        { return requires; }
-	bool              get_default() const          { return deflt; }
-	void              resolve_refs();
-	void              create_build_info();
-	void              create_targets() const;
 protected:
-	Package     &pkg;
-	Type        type;
+	SourcePackage &package;
 	std::string name;
-	PathList    sources;
-	bool        install;
-	std::string install_headers;
-	const Component *module_host;
-	bool        modular;
-	BuildInfo   build_info;
-	PkgRefList  requires;
-	bool        deflt;
-
-	PathList    collect_source_files() const;
+	SourceList sources;
+	OverlayList overlays;
+	bool install;
+	BuildInfo build_info;
+	Package::Requirements requires;
+	bool deflt;
+	InstallMap install_map;
+	std::list<std::string> problems;
+
+	Component(SourcePackage &, const std::string &);
+public:
+	virtual ~Component() { }
+
+	const SourcePackage &get_package() const { return package; }
+	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 SourceList &get_sources() const { return sources; }
+
+	const OverlayList &get_overlays() const { return overlays; }
+
+protected:
+	/** Returns a list of all source files for the component. */
+	SourceList collect_source_files() const;
+
+public:
+	bool get_install() const { return install; }
+	const InstallMap &get_install_map() const { return install_map; }
+	const Package::Requirements &get_required_packages() const { return requires; }
+	bool is_default() const { return deflt; }
+	const std::list<std::string> &get_problems() const { return problems; }
+
+	/** 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. */
+	virtual void create_build_info();
+
+	virtual void update_exported_build_info(BuildInfo &) const { }
+
+	const BuildInfo &get_build_info() const { return build_info; }
+
+	BuildInfo get_build_info_for_path(const Msp::FS::Path &) const;
+
+	virtual void create_targets() const = 0;
 };
-typedef std::list<Component> ComponentList;
 
 #endif