X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=2f71f1a74c2b3e8ccbd93bf235618a07cdd1ce99;hb=c63d5e1c1a1b3c095a94d1e21a302aaa694dd656;hp=5909834ab411aa6bee12ac6b2bce18a734b1505b;hpb=64f01c486e48f260a5d895092806ee341ef23198;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 5909834..2f71f1a 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -251,12 +251,12 @@ int Builder::main()
 		return 0;
 	}
 
-	if(conf_only)
-		return 0;
-
 	if(!prepare_build())
 		return 1;
 
+	if(conf_only)
+		return 0;
+
 	logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
 		current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")));
 	logger.log("environment", format("Prefix is %s", prefix));
@@ -380,13 +380,13 @@ bool Builder::prepare_build()
 	Target *world = new VirtualTarget(*this, "world");
 
 	Target *def_tgt = new VirtualTarget(*this, "default");
-	world->add_depend(*def_tgt);
+	world->add_dependency(*def_tgt);
 
 	Target *install = new VirtualTarget(*this, "install");
-	world->add_depend(*install);
+	world->add_dependency(*install);
 
 	Target *tarballs = new VirtualTarget(*this, "tarballs");
-	world->add_depend(*tarballs);
+	world->add_dependency(*tarballs);
 
 	main_pkg->prepare();
 
@@ -405,7 +405,7 @@ bool Builder::prepare_build()
 			return false;
 		}
 
-		cmdline->add_depend(*tgt);
+		cmdline->add_dependency(*tgt);
 	}
 
 	cmdline->prepare();
@@ -541,7 +541,7 @@ int Builder::do_clean()
 		if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
 			clean_tgts.insert(tgt);
 
-		const Target::Dependencies &deps = tgt->get_depends();
+		const Target::Dependencies &deps = tgt->get_dependencies();
 		for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 			if(!clean_tgts.count(*i))
 				queue.push_back(*i);
@@ -561,7 +561,7 @@ void Builder::package_help()
 	const Config::OptionMap &options = config.get_options();
 
 	IO::print("Required packages:\n  ");
-	const PackageList &requires = main_pkg->get_requires();
+	const PackageList &requires = main_pkg->get_required_packages();
 	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		if(i!=requires.begin())
@@ -572,9 +572,9 @@ void Builder::package_help()
 	for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
 	{
 		const Config::Option &opt = i->second;
-		IO::print("  %s: %s (%s)", opt.name, opt.descr, opt.value);
-		if(opt.value!=opt.defv)
-			IO::print(" [%s]", opt.defv);
+		IO::print("  %s: %s (%s)", opt.name, opt.description, opt.value);
+		if(opt.value!=opt.default_value)
+			IO::print(" [%s]", opt.default_value);
 		IO::print("\n");
 	}
 }