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

diff --git a/source/component.h b/source/component.h
index 32cbe0a..2e9e534 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;
@@ -29,6 +28,7 @@ public:
 		void require(const std::string &);
 		void build_info();
 		void install_map();
+		void use(const std::string &);
 	};
 
 	enum Type
@@ -41,14 +41,18 @@ public:
 		TARBALL
 	};
 
+	typedef std::list<Msp::FS::Path> SourceList;
+	typedef std::list<const Component *> UseList;
+
 protected:
 	SourcePackage &package;
 	Type type;
 	std::string name;
-	StringList sources;
+	SourceList sources;
 	bool install;
 	BuildInfo build_info;
-	PackageList requires;
+	Package::Requirements requires;
+	UseList uses;
 	bool deflt;
 	InstallMap install_map;
 
@@ -61,16 +65,17 @@ 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; }
 
 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; }
 
 	/** Prepares any required packages. */