X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=1db925928a9a88cea2221bf98fbc7736cfd0a412;hb=3938f8030b1f62802decce19777ce70fdafaff10;hp=561a25091381bb4eb5838d1aa0b34b4f9fb89793;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git

diff --git a/source/component.h b/source/component.h
index 561a250..1db9259 100644
--- a/source/component.h
+++ b/source/component.h
@@ -5,8 +5,8 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "installmap.h"
-#include "misc.h"
 #include "package.h"
 
 class SourcePackage;
@@ -20,63 +20,68 @@ their own.
 class Component
 {
 public:
-	class Loader: public Msp::DataFile::ObjectLoader<Component>
+	class Loader: public Msp::DataFile::ObjectLoader<Component>, public ConditionalLoader
 	{
 	public:
 		Loader(Component &);
 	private:
-		void source(const std::string &);
-		void require(const std::string &);
 		void build_info();
 		void install_map();
-	};
-
-	enum Type
-	{
-		LIBRARY,
-		PROGRAM,
-		MODULE,
-		DATAFILE,
-		INSTALL,
-		TARBALL
+		void overlay(const std::string &);
+		void require(const std::string &);
+		void source(const std::string &);
 	};
 
 protected:
-	SourcePackage &pkg;
-	Type type;
+	SourcePackage &package;
 	std::string name;
-	StringList sources;
+	std::list<Msp::FS::Path> sources;
+	std::list<std::string> overlays;
 	bool install;
 	BuildInfo build_info;
-	PackageList requires;
+	Package::Requirements requires;
 	bool deflt;
 	InstallMap install_map;
+	std::list<std::string> problems;
 
+	Component(SourcePackage &, const std::string &);
 public:
-	Component(SourcePackage &, Type, const std::string &);
-	const SourcePackage &get_package() const { return pkg; }
-	Type get_type() const { return type; }
+	virtual ~Component() { }
+
+	const SourcePackage &get_package() const { return package; }
 	const std::string &get_name() const { return name; }
-	const StringList &get_sources() const { return sources; }
-	const BuildInfo &get_build_info() const { return build_info; }
+
+	/** Returns a list of sources for the component.  They may refer to
+	directories or individual files. */
+	const std::list<Msp::FS::Path> &get_sources() const { return sources; }
+
+	const std::list<std::string> &get_overlays() const { return overlays; }
+
+protected:
+	/** Returns a list of all source files for the component. */
+	std::list<Msp::FS::Path> 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 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. */
-	void create_build_info();
+	virtual void create_build_info();
 
-	void create_targets() const;
+	virtual void update_exported_build_info(BuildInfo &) const { }
 
-protected:
-	/** Returns a list of all source files for the component. */
-	PathList collect_source_files() const;
-};
+	const BuildInfo &get_build_info() const { return build_info; }
+
+	BuildInfo get_build_info_for_path(const Msp::FS::Path &) const;
 
-typedef std::list<Component> ComponentList;
+	virtual void create_targets() const = 0;
+};
 
 #endif