X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildercli.cpp;h=a7dd1e23ff2402f94ab07a1b67ce85f0fb446801;hb=43d1143e6dc6bbf3797dbaae42d4bfce3dea5d88;hp=0bdf8777d0f51cfb5909821d0b119db0ccfc0860;hpb=8170b77be8c1ec66f4e860fe88dafa791031e57f;p=builder.git

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index 0bdf877..a7dd1e2 100644
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -121,14 +121,16 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 	else if(!clean && !create_makefile)
 		build = true;
 
-	const vector<string> &args = getopt.get_args();
-	for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
+	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); )
 	{
 		string::size_type equal = i->find('=');
 		if(equal!=string::npos)
+		{
 			cmdline_options.insert(Config::InputOptions::value_type(i->substr(0, equal), i->substr(equal+1)));
+			cmdline_targets.erase(i++);
+		}
 		else
-			cmdline_targets.push_back(*i);
+			++i;
 	}
 
 	if(!work_dir.empty())
@@ -253,12 +255,12 @@ int BuilderCLI::main()
 	if(analyzer)
 		analyzer->analyze();
 
-	const Builder::ProblemList &problems = builder.get_problems();
-	if(!problems.empty())
+	if(build_graph.get_goals().is_broken())
 	{
+		list<string> problems = builder.collect_problems();
 		IO::print(IO::cerr, "The following problems were detected:\n");
-		for(Builder::ProblemList::const_iterator i=problems.begin(); i!=problems.end(); ++i)
-			IO::print(IO::cerr, "  %s: %s\n", i->package, i->descr);
+		for(list<string>::const_iterator i=problems.begin(); i!=problems.end(); ++i)
+			IO::print(IO::cerr, "  %s\n", *i);
 		if(!analyzer)
 			IO::print(IO::cerr, "Please fix them and try again.\n");
 		return 1;
@@ -279,18 +281,13 @@ bool BuilderCLI::prepare_build()
 	during preparation. */
 	BuildGraph &build_graph = builder.get_build_graph();
 	PackageManager &package_manager = builder.get_package_manager();
-	VirtualFileSystem &vfs = builder.get_vfs();
 
 	package_manager.get_main_package().prepare();
 
 	// Add targets from command line as goals
 	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
 	{
-		Target *tgt = build_graph.get_target(*i);
-		if(!tgt)
-			tgt = vfs.get_target(*i);
-		if(!tgt)
-			tgt = vfs.get_target(cwd/ *i);
+		Target *tgt = resolve_target(*i);
 		if(!tgt)
 		{
 			IO::print("I don't know anything about %s\n", *i);
@@ -305,7 +302,7 @@ bool BuilderCLI::prepare_build()
 	// Apply what-ifs
 	for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
 	{
-		FileTarget *tgt = vfs.get_target(cwd/ *i);
+		FileTarget *tgt = dynamic_cast<FileTarget *>(resolve_target(*i));
 		if(!tgt)
 		{
 			IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
@@ -318,15 +315,19 @@ bool BuilderCLI::prepare_build()
 		build_graph.force_full_rebuild();
 
 	if(!dry_run)
-	{
-		const PackageManager::PackageMap &packages = package_manager.get_packages();
-		for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
-			i->second->save_caches();
-	}
+		package_manager.save_all_caches();
 
 	return true;
 }
 
+Target *BuilderCLI::resolve_target(const string &name)
+{
+	Target *tgt = builder.get_build_graph().get_target(name);
+	if(!tgt)
+		tgt = builder.get_vfs().get_target(cwd/name);
+	return tgt;
+}
+
 void BuilderCLI::package_help()
 {
 	PackageManager &package_manager = builder.get_package_manager();