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

diff --git a/source/component.h b/source/component.h
index 561a250..e68bc38 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;
@@ -41,42 +40,50 @@ public:
 		TARBALL
 	};
 
+	typedef std::list<Msp::FS::Path> SourceList;
+
 protected:
-	SourcePackage &pkg;
+	SourcePackage &package;
 	Type type;
 	std::string name;
-	StringList sources;
+	SourceList sources;
 	bool install;
 	BuildInfo build_info;
-	PackageList requires;
+	Package::Requirements requires;
 	bool deflt;
 	InstallMap install_map;
 
 public:
 	Component(SourcePackage &, Type, const std::string &);
-	const SourcePackage &get_package() const { return pkg; }
+
+	const SourcePackage &get_package() const { return package; }
 	Type get_type() const { return type; }
 	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 SourceList &get_sources() const { return sources; }
+
+protected:
+	/** Returns a list of all source files for the component. */
+	SourceList 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; }
 
+	/** 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();
 
-	void create_targets() const;
+	const BuildInfo &get_build_info() const { return build_info; }
 
-protected:
-	/** Returns a list of all source files for the component. */
-	PathList collect_source_files() const;
+	void create_targets() const;
 };
 
-typedef std::list<Component> ComponentList;
-
 #endif