X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuilder.cpp;h=0b1cd2cf0b02cc061383df31d4201670cb029722;hb=f2b26f1929a8209a746bcf4944165b0ba9ef303f;hp=96df23b7df5c0394800fa21caf59160fff8cdac0;hpb=a5b439969c06a4794a3914580a29256773f24778;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 96df23b..0b1cd2c 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -165,23 +165,13 @@ Builder::Builder(int argc, char **argv):
 
 	package_manager.set_no_externals(no_externals);
 
-	load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
-	load_build_file((FS::get_user_data_dir("builder")/"rc").str());
-
 	if(arch.empty())
 		current_arch = &native_arch;
 	else
 		current_arch = new Architecture(*this, arch);
 
-	if(!current_arch->is_native())
-	{
-		for(StringMap::const_iterator i=cross_prefixes.begin(); i!=cross_prefixes.end(); ++i)
-			if(current_arch->match_name(i->first))
-			{
-				current_arch->set_cross_prefix(i->second);
-				break;
-			}
-	}
+	load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
+	load_build_file((FS::get_user_data_dir("builder")/"rc").str());
 
 	if(prfx.empty())
 	{
@@ -402,13 +392,13 @@ int Builder::create_targets()
 	Target *world = new VirtualTarget(*this, "world");
 
 	Target *def_tgt = new VirtualTarget(*this, "default");
-	world->add_depend(def_tgt);
+	world->add_depend(*def_tgt);
 
 	Target *install = new VirtualTarget(*this, "install");
-	world->add_depend(install);
+	world->add_depend(*install);
 
 	Target *tarballs = new VirtualTarget(*this, "tarballs");
-	world->add_depend(tarballs);
+	world->add_depend(*tarballs);
 
 	const PackageManager::PackageMap &packages = package_manager.get_packages();
 	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
@@ -430,7 +420,7 @@ int Builder::create_targets()
 			return -1;
 		}
 
-		cmdline->add_depend(tgt);
+		cmdline->add_depend(*tgt);
 	}
 
 	cmdline->prepare();
@@ -606,24 +596,25 @@ string Builder::helpmsg;
 
 
 Builder::Loader::Loader(Builder &b, const FS::Path &s):
-	bld(b),
+	DataFile::ObjectLoader<Builder>(b),
 	src(s)
 {
+	add("architecture", &Loader::architecture);
 	add("binary_package", &Loader::binpkg);
-	add("cross_prefix", &Loader::cross_prefix);
 	add("profile", &Loader::profile);
 	add("package", &Loader::package);
 }
 
-void Builder::Loader::binpkg(const string &n)
+void Builder::Loader::architecture(const string &n)
 {
-	BinaryPackage *pkg = new BinaryPackage(bld, n);
-	load_sub(*pkg);
+	if(obj.current_arch->match_name(n))
+		load_sub(*obj.current_arch);
 }
 
-void Builder::Loader::cross_prefix(const string &a, const string &p)
+void Builder::Loader::binpkg(const string &n)
 {
-	bld.cross_prefixes[a] = p;
+	BinaryPackage *pkg = new BinaryPackage(obj, n);
+	load_sub(*pkg);
 }
 
 void Builder::Loader::profile(const string &n)
@@ -631,14 +622,14 @@ void Builder::Loader::profile(const string &n)
 	StringMap prf;
 	ProfileLoader ldr(prf);
 	load_sub_with(ldr);
-	bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
+	obj.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
 }
 
 void Builder::Loader::package(const string &n)
 {
-	SourcePackage *pkg = new SourcePackage(bld, n, src);
-	if(!bld.main_pkg)
-		bld.main_pkg = pkg;
+	SourcePackage *pkg = new SourcePackage(obj, n, src);
+	if(!obj.main_pkg)
+		obj.main_pkg = pkg;
 
 	load_sub(*pkg);
 }