X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=0f9d581bcfb1695805036437edb73ed5bf2eea39;hb=632361796a7ddadf8a726526c937fab22281fb7b;hp=663132ad3f7ede8c6fc994f6112c77c83c531ee9;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/component.h b/source/component.h
index 663132a..0f9d581 100644
--- a/source/component.h
+++ b/source/component.h
@@ -2,13 +2,13 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/parser/loader.h>
-#include <msp/path/path.h>
+#include <msp/datafile/loader.h>
+#include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "misc.h"
-#include "packageref.h"
+#include "package.h"
 
-class Package;
+class SourcePackage;
 
 /**
 Components specify things to be built.  Each component may build one binary (it
@@ -19,48 +19,67 @@ their own.
 class Component
 {
 public:
-	/// Loads a Component from file.  Used from Package::Loader.
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
+	private:
+		Component &comp;
+		std::string inst_hdr;
+
 	public:
 		Loader(Component &);
 		Component &get_object() { return comp; }
 	private:
-		Component &comp;
-
+		virtual void finish();
 		void source(const std::string &);
 		void require(const std::string &);
 		void build_info();
 	};
-	
+
 	enum Type
 	{
-		PROGRAM,
+		HEADERS,
 		LIBRARY,
+		PROGRAM,
 		MODULE,
-		HEADERS
+		DATAFILE,
+		INSTALL,
+		TARBALL
 	};
 
-	Component(Package &, Type, const std::string &);
-	const Package     &get_package() const         { return pkg; }
-	Type              get_type() const             { return type; }
-	const std::string &get_name() const            { return name; }
-	const PathList    &get_sources() const         { return sources; }
-	const BuildInfo   &get_build_info() const      { return build_info; }
-	bool              get_install() const          { return install; }
-	const std::string &get_install_headers() const { return install_headers; }
-	void              resolve_refs();
-	void              create_build_info();
 protected:
-	Package     &pkg;
-	Type        type;
+	SourcePackage &pkg;
+	Type type;
 	std::string name;
-	PathList    sources;
-	bool        install;
-	std::string install_headers;
-	BuildInfo   build_info;
-	PkgRefList  requires;
+	StringList sources;
+	bool install;
+	BuildInfo build_info;
+	PackageList requires;
+	bool deflt;
+
+public:
+	Component(SourcePackage &, Type, const std::string &);
+	const SourcePackage &get_package() const { return pkg; }
+	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; }
+	bool get_install() const { return install; }
+	const PackageList &get_requires() const { return requires; }
+	bool is_default() const { return deflt; }
+
+	void configure(const StringMap &, unsigned);
+
+	/** 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;
+
+protected:
+	/** Returns a list of all source files for the component. */
+	PathList collect_source_files() const;
 };
+
 typedef std::list<Component> ComponentList;
 
 #endif