X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=8dec23912f41d5ef8f6c067d932a11851bb5d2cd;hb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;hp=143de983cb91e66c232cbd0590e0a47236e992ed;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/component.h b/source/component.h
index 143de98..8dec239 100644
--- a/source/component.h
+++ b/source/component.h
@@ -9,13 +9,13 @@ Distributed under the LGPL
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include <msp/path/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
@@ -27,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 &);
@@ -50,8 +50,8 @@ 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; }
@@ -59,13 +59,12 @@ public:
 	bool              get_install() const          { return install; }
 	const std::string &get_install_headers() const { return install_headers; }
 	bool              get_modular() const          { return modular; }
-	const PkgRefList  &get_requires() const        { return requires; }
+	const PackageList &get_requires() const        { return requires; }
 	bool              get_default() const          { return deflt; }
-	void              resolve_refs();
 	void              create_build_info();
 	void              create_targets() const;
 protected:
-	Package     &pkg;
+	SourcePackage &pkg;
 	Type        type;
 	std::string name;
 	PathList    sources;
@@ -74,7 +73,7 @@ protected:
 	const Component *module_host;
 	bool        modular;
 	BuildInfo   build_info;
-	PkgRefList  requires;
+	PackageList requires;
 	bool        deflt;
 
 	PathList    collect_source_files() const;