X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=5479cc5a1aa71d86ed163f73ec8e6a5c3c4bfb3b;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=0d67fdeb874deaa60c1438f01764bbb1c697bf9c;hpb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;p=builder.git

diff --git a/source/component.h b/source/component.h
index 0d67fde..5479cc5 100644
--- a/source/component.h
+++ b/source/component.h
@@ -2,11 +2,11 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
+#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,70 +20,68 @@ their own.
 class Component
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>, public ConditionalLoader
 	{
-	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 build_info();
 		void install_map();
-	};
-
-	enum Type
-	{
-		HEADERS,
-		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;
-	bool install;
+	std::vector<Msp::FS::Path> sources;
+	std::vector<std::string> overlays;
+	bool install = false;
 	BuildInfo build_info;
-	PackageList requires;
-	bool deflt;
+	Package::Requirements requires;
+	bool deflt = true;
 	InstallMap install_map;
+	std::vector<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::vector<Msp::FS::Path> &get_sources() const { return sources; }
+
+	const std::vector<std::string> &get_overlays() const { return overlays; }
+
+protected:
+	/** Returns a list of all source files for the component. */
+	std::vector<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::vector<std::string> &get_problems() const { return problems; }
 
-	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();
+	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