X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=1c90aa8e2229ac6192fcc9bff7c92b7c59417e2a;hb=c8dfe708b5551818dad3f6cf3e86cc72fe684572;hp=7b222df4997c1f05e31febfef670a10d46fc80dd;hpb=95d5743c0f2a0dd8b56928525b8caa5f6ee8cc1d;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 7b222df..1c90aa8 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -331,6 +331,14 @@ void Builder::add_target(Target *t)
 	targets.insert(TargetMap::value_type(t->get_name(), t));
 }
 
+void Builder::add_primary_target(Target &t)
+{
+	get_target("world")->add_dependency(t);
+
+	if(t.get_package()==main_pkg && t.get_component() && t.get_component()->is_default())
+		get_target("default")->add_dependency(t);
+}
+
 void Builder::usage(const char *reason, const char *argv0, bool brief)
 {
 	if(reason)
@@ -357,7 +365,7 @@ int Builder::load_build_file(const FS::Path &fn)
 	logger.log("files", format("Reading %s", fn));
 
 	DataFile::Parser parser(in, fn.str());
-	Loader loader(*this, fn.subpath(0, fn.size()-1));
+	Loader loader(*this);
 	loader.load(parser);
 
 	return 0;
@@ -571,9 +579,8 @@ string Builder::usagemsg;
 string Builder::helpmsg;
 
 
-Builder::Loader::Loader(Builder &b, const FS::Path &s):
-	DataFile::ObjectLoader<Builder>(b),
-	src(s)
+Builder::Loader::Loader(Builder &b):
+	DataFile::ObjectLoader<Builder>(b)
 {
 	add("architecture", &Loader::architecture);
 	add("binary_package", &Loader::binpkg);
@@ -610,7 +617,7 @@ void Builder::Loader::profile(const string &)
 
 void Builder::Loader::package(const string &n)
 {
-	SourcePackage *pkg = new SourcePackage(obj, n, src);
+	SourcePackage *pkg = new SourcePackage(obj, n, get_source());
 	if(!obj.main_pkg)
 		obj.main_pkg = pkg;