X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=7cbd1e13cbe1f0099522161e4e2eb74c708fcad3;hb=33202532d4afbebdef4047f6bd216eca22d27813;hp=32cbe0a79ee7edeb04b777ab43201aae9d35faa1;hpb=1dbeace0c44127bee08a3a8b231f4c8dcf707b2c;p=builder.git

diff --git a/source/component.h b/source/component.h
index 32cbe0a..7cbd1e1 100644
--- a/source/component.h
+++ b/source/component.h
@@ -6,7 +6,6 @@
 #include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "installmap.h"
-#include "misc.h"
 #include "package.h"
 
 class SourcePackage;
@@ -25,10 +24,14 @@ public:
 	public:
 		Loader(Component &);
 	private:
-		void source(const std::string &);
-		void require(const std::string &);
 		void build_info();
+		void if_arch(const std::string &);
+		void if_feature(const std::string &);
 		void install_map();
+		void overlay(const std::string &);
+		void require(const std::string &);
+		void source(const std::string &);
+		void use(const std::string &);
 	};
 
 	enum Type
@@ -36,21 +39,28 @@ public:
 		LIBRARY,
 		PROGRAM,
 		MODULE,
-		DATAFILE,
+		DATAPACK,
 		INSTALL,
 		TARBALL
 	};
 
+	typedef std::list<Msp::FS::Path> SourceList;
+	typedef std::list<std::string> OverlayList;
+	typedef std::list<const Component *> UseList;
+
 protected:
 	SourcePackage &package;
 	Type type;
 	std::string name;
-	StringList sources;
+	SourceList sources;
+	OverlayList overlays;
 	bool install;
 	BuildInfo build_info;
-	PackageList requires;
+	Package::Requirements requires;
+	UseList uses;
 	bool deflt;
 	InstallMap install_map;
+	std::list<std::string> problems;
 
 public:
 	Component(SourcePackage &, Type, const std::string &);
@@ -61,17 +71,21 @@ public:
 
 	/** Returns a list of sources for the component.  They may refer to
 	directories or individual files. */
-	const StringList &get_sources() const { return sources; }
+	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. */
-	PathList collect_source_files() const;
+	SourceList collect_source_files() const;
 
 public:
 	bool get_install() const { return install; }
 	const InstallMap &get_install_map() const { return install_map; }
-	const PackageList &get_required_packages() const { return requires; }
+	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::list<std::string> &get_problems() const { return problems; }
 
 	/** Prepares any required packages. */
 	void prepare();
@@ -82,6 +96,8 @@ public:
 
 	const BuildInfo &get_build_info() const { return build_info; }
 
+	BuildInfo get_build_info_for_path(const Msp::FS::Path &) const;
+
 	void create_targets() const;
 };