X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=5da28838f5d5035fe44aa3a51d798bdd26c92097;hb=de7ca0d3ce73bfa3f870c4257dbf71e621224876;hp=c5e1d0ccb9a1a98b7296493ec32045a6129fd059;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/component.h b/source/component.h
index c5e1d0c..5da2883 100644
--- a/source/component.h
+++ b/source/component.h
@@ -2,48 +2,80 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/parser/loader.h>
-#include <msp/path/path.h>
+#include <msp/datafile/objectloader.h>
+#include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "installmap.h"
+#include "misc.h"
+#include "package.h"
 
-class Package;
+class SourcePackage;
 
+/**
+Components specify things to be built.  Each component may build one binary (it
+may also build none), as well as install a bunch of headers.  Components inherit
+dependencies and build info from the package they belong to, and may also add
+their own.
+*/
 class Component
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>
 	{
 	public:
 		Loader(Component &);
-		Component &get_object() { return comp; }
 	private:
-		Component &comp;
-
 		void source(const std::string &);
+		void require(const std::string &);
+		void build_info();
+		void install_map();
 	};
-	
+
 	enum Type
 	{
-		PROGRAM,
 		LIBRARY,
-		MODULE
+		PROGRAM,
+		MODULE,
+		DATAFILE,
+		INSTALL,
+		TARBALL
 	};
 
-	Component(Package &, Type, const std::string &);
-	const Package &get_package() const { return pkg; }
+protected:
+	SourcePackage &package;
+	Type type;
+	std::string name;
+	StringList sources;
+	bool install;
+	BuildInfo build_info;
+	PackageList requires;
+	bool deflt;
+	InstallMap install_map;
+
+public:
+	Component(SourcePackage &, Type, const std::string &);
+
+	const SourcePackage &get_package() const { return package; }
 	Type get_type() const { return type; }
 	const std::string &get_name() const { return name; }
-	const Msp::Path::Path &get_source() const { return source; }
+	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_required_packages() const { return requires; }
+	bool is_default() const { return deflt; }
+	const InstallMap &get_install_map() const { return install_map; }
+
+	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;
+
 protected:
-	Package     &pkg;
-	Type        type;
-	std::string name;
-	Msp::Path::Path source;
-	bool        install;
-	std::string install_headers;
-	BuildInfo   build_info;
+	/** Returns a list of all source files for the component. */
+	PathList collect_source_files() const;
 };
-typedef std::list<Component> ComponentList;
 
 #endif