X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=6fb231d1d247899103172aaab1720c06377cdbd8;hb=a2adbd9c0a8d7a7567848c4c6bdbf0de6ba32bb1;hp=82b32e4ad7b7717fb78b96dd92ad57fe06a8eabd;hpb=4f78d9f016482ce1ac7d726852e33e07c090df1b;p=builder.git

diff --git a/source/component.h b/source/component.h
index 82b32e4..6fb231d 100644
--- a/source/component.h
+++ b/source/component.h
@@ -1,14 +1,21 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef COMPONENT_H_
 #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
@@ -20,7 +27,7 @@ class Component
 {
 public:
 	/// Loads a Component from file.  Used from Package::Loader.
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Component &);
@@ -30,9 +37,11 @@ public:
 
 		void source(const std::string &);
 		void require(const std::string &);
+		void modular();
+		void host(const std::string &);
 		void build_info();
 	};
-	
+
 	enum Type
 	{
 		PROGRAM,
@@ -41,26 +50,33 @@ public:
 		HEADERS
 	};
 
-	Component(Package &, Type, const std::string &);
-	const Package     &get_package() const         { return pkg; }
+	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 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; }
-	const PkgRefList  &get_requires() const        { return requires; }
-	void              resolve_refs();
+	bool              get_modular() const          { return modular; }
+	const PackageList &get_requires() const        { return requires; }
+	bool              get_default() const          { return deflt; }
 	void              create_build_info();
+	void              create_targets() const;
 protected:
-	Package     &pkg;
+	SourcePackage &pkg;
 	Type        type;
 	std::string name;
 	PathList    sources;
 	bool        install;
 	std::string install_headers;
+	const Component *module_host;
+	bool        modular;
 	BuildInfo   build_info;
-	PkgRefList  requires;
+	PackageList requires;
+	bool        deflt;
+
+	PathList    collect_source_files() const;
 };
 typedef std::list<Component> ComponentList;