X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildercli.cpp;h=0a84364c988e69bee2925f405573fcff63e66d74;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=35eba9c03512fe9024c68aad1fe5e986cb9357de;hpb=28bc25948ff58612600ce29a6a0b2cf58548dff9;p=builder.git

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index 35eba9c..0a84364 100644
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -8,11 +8,14 @@
 #include "buildercli.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "tool.h"
+#include "toolchain.h"
 
 using namespace std;
 using namespace Msp;
 
 BuilderCLI::BuilderCLI(int argc, char **argv):
+	RegisteredApplication<BuilderCLI>("builder"),
 	analyzer(0),
 	build(false),
 	clean(0),
@@ -121,14 +124,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())
@@ -140,15 +145,15 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 
 	package_manager.append_package_path(cwd);
 	package_manager.append_package_path(cwd/"..");
-	package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder"));
+	package_manager.append_binary_package_path(FS::get_sys_data_dir()/"packages");
 
 	package_manager.set_no_externals(no_externals);
 
-	builder.set_architecture(arch);
+	builder.set_architecture(tolower(arch));
 
 	list<FS::Path> start_files;
-	start_files.push_back(FS::get_sys_data_dir(argv[0], "builder")/"builderrc");
-	start_files.push_back(FS::get_user_data_dir("builder")/"rc");
+	start_files.push_back(FS::get_sys_data_dir()/"builderrc");
+	start_files.push_back(FS::get_user_data_dir()/"rc");
 	for(list<FS::Path>::const_iterator i=start_files.begin(); i!=start_files.end(); ++i)
 		if(FS::exists(*i))
 			builder.load_build_file(*i);
@@ -163,6 +168,18 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 		builder.set_build_type(build_type);
 
 	builder.add_default_tools();
+
+	const Toolchain &toolchain = builder.get_toolchain();
+	for(Config::InputOptions::iterator i=cmdline_options.begin(); i!=cmdline_options.end(); )
+	{
+		if(toolchain.has_tool(i->first))
+		{
+			toolchain.get_tool(i->first).set_command(i->second);
+			cmdline_options.erase(i++);
+		}
+		else
+			++i;
+	}
 }
 
 BuilderCLI::~BuilderCLI()
@@ -174,7 +191,11 @@ int BuilderCLI::main()
 {
 	FS::Path main_file = cwd/build_file;
 	if(FS::exists(main_file))
+	{
 		builder.load_build_file(main_file, &cmdline_options, conf_all);
+		if(!dry_run && !cmdline_options.empty())
+			builder.save_caches();
+	}
 	else if(!help)
 	{
 		IO::print(IO::cerr, "The file %s does not exist.\n", main_file);
@@ -253,12 +274,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;
@@ -269,6 +290,9 @@ int BuilderCLI::main()
 	if(build)
 		exit_code = builder.build(jobs, dry_run, show_progress);
 
+	if(!dry_run)
+		builder.save_caches();
+
 	return exit_code;
 }
 
@@ -313,11 +337,7 @@ 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;
 }
@@ -348,13 +368,29 @@ void BuilderCLI::package_help()
 			IO::print(", ");
 		IO::print((*i)->get_name());
 	}
-	IO::print("\n\nPackage configuration:\n");
-	for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
+	IO::print("\n");
+
+	if(!options.empty())
 	{
-		const Config::Option &opt = i->second;
-		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");
+		IO::print("\nPackage configuration:\n");
+		for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
+		{
+			const Config::Option &opt = i->second;
+			string line = format("  %s: %s (%s)", opt.name, opt.description, opt.value);
+			if(!opt.choices.empty())
+			{
+				line += " {";
+				for(list<string>::const_iterator j=opt.choices.begin(); j!=opt.choices.end(); ++j)
+				{
+					if(j!=opt.choices.begin())
+						line += ' ';
+					line += *j;
+				}
+				line += '}';
+			}
+			else if(opt.value!=opt.default_value)
+				line += format(" [%s]", opt.default_value);
+			IO::print("%s\n", line);
+		}
 	}
 }