X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flib%2Fsourcepackage.cpp;h=6261d2c844ba42fbdb283bf5e56ed8a4ec88cef1;hb=c26f1550706f1f674d3040ebb42d2b35d21952ff;hp=dfbf16e92553737e9aa9a333db5b5a4a13d048e0;hpb=1dc209f3b40259a5ff2ebdc3081e533b9fbc7b52;p=builder.git

diff --git a/source/lib/sourcepackage.cpp b/source/lib/sourcepackage.cpp
index dfbf16e..6261d2c 100644
--- a/source/lib/sourcepackage.cpp
+++ b/source/lib/sourcepackage.cpp
@@ -170,6 +170,8 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions *o):
 	add("source_tarball", &Loader::source_archive);
 	add("tarball",     &Loader::tarball);
 	add("version",     &Loader::version);
+
+	p.builder.get_component_registry().invoke_all(*this);
 }
 
 void SourcePackage::Loader::finish()
@@ -200,16 +202,6 @@ void SourcePackage::Loader::feature(const string &n, const string &d)
 	}
 }
 
-template<typename C, typename... Args>
-void SourcePackage::Loader::component(Args... args, const string &n)
-{
-	if(any_of(obj.components.begin(), obj.components.end(), [&n](const Component *c){ return c->get_name()==n; }))
-		throw key_error(n);
-	C *comp = new C(obj, n, args...);
-	load_sub(*comp);
-	obj.components.push_back(comp);
-}
-
 void SourcePackage::Loader::build_info()
 {
 	load_sub(obj.build_info);