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

diff --git a/source/component.h b/source/component.h
index 2e9e534..5479cc5 100644
--- a/source/component.h
+++ b/source/component.h
@@ -5,6 +5,7 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "installmap.h"
 #include "package.h"
 
@@ -19,75 +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();
-		void use(const std::string &);
-	};
-
-	enum Type
-	{
-		LIBRARY,
-		PROGRAM,
-		MODULE,
-		DATAFILE,
-		INSTALL,
-		TARBALL
+		void overlay(const std::string &);
+		void require(const std::string &);
+		void source(const std::string &);
 	};
 
-	typedef std::list<Msp::FS::Path> SourceList;
-	typedef std::list<const Component *> UseList;
-
 protected:
 	SourcePackage &package;
-	Type type;
 	std::string name;
-	SourceList sources;
-	bool install;
+	std::vector<Msp::FS::Path> sources;
+	std::vector<std::string> overlays;
+	bool install = false;
 	BuildInfo build_info;
 	Package::Requirements requires;
-	UseList uses;
-	bool deflt;
+	bool deflt = true;
 	InstallMap install_map;
+	std::vector<std::string> problems;
 
+	Component(SourcePackage &, const std::string &);
 public:
-	Component(SourcePackage &, Type, const std::string &);
+	virtual ~Component() { }
 
 	const SourcePackage &get_package() const { return package; }
-	Type get_type() const { return type; }
 	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 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. */
-	SourceList collect_source_files() const;
+	std::vector<Msp::FS::Path> 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; }
-	const UseList &get_used_components() const { return uses; }
 	bool is_default() const { return deflt; }
+	const std::vector<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();
+
+	virtual void update_exported_build_info(BuildInfo &) const { }
 
 	const BuildInfo &get_build_info() const { return build_info; }
 
-	void create_targets() const;
+	BuildInfo get_build_info_for_path(const Msp::FS::Path &) const;
+
+	virtual void create_targets() const = 0;
 };
 
 #endif