X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildercli.cpp;h=2e588aded12e2a2158432b83bbfb0d289ca8c534;hb=eadb72197ef2fde2a44914067277054c59b67161;hp=c470f047f6a930653f2d3ddb63dd0b86d3f8eef5;hpb=cb286fd20b9b194947b6b583bf18f8d7e57ae995;p=builder.git

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index c470f04..2e588ad 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),
@@ -92,12 +95,9 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 		logger.enable_channel("files");
 		logger.enable_channel("auxcommands");
 	}
-	for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
-	{
-		vector<string> parts = split(*i, ',');
-		for(vector<string>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
-			logger.enable_channel(*j);
-	}
+	for(const string &c: log_channels)
+		for(const string &p: split(c, ','))
+			logger.enable_channel(p);
 	builder.set_logger(&logger);
 
 	if(!analyze_mode.empty())
@@ -121,18 +121,6 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 	else if(!clean && !create_makefile)
 		build = true;
 
-	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
-			++i;
-	}
-
 	if(!work_dir.empty())
 		FS::chdir(work_dir);
 
@@ -142,18 +130,18 @@ 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");
-	for(list<FS::Path>::const_iterator i=start_files.begin(); i!=start_files.end(); ++i)
-		if(FS::exists(*i))
-			builder.load_build_file(*i);
+	start_files.push_back(FS::get_sys_data_dir()/"builderrc");
+	start_files.push_back(FS::get_user_data_dir()/"rc");
+	for(const FS::Path &f: start_files)
+		if(FS::exists(f))
+			builder.load_build_file(f);
 
 	if(!prefix.empty())
 		builder.set_prefix(cwd/prefix);
@@ -165,6 +153,24 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 		builder.set_build_type(build_type);
 
 	builder.add_default_tools();
+
+	const Toolchain &toolchain = builder.get_toolchain();
+	for(auto i=cmdline_targets.begin(); i!=cmdline_targets.end(); )
+	{
+		string::size_type equal = i->find('=');
+		if(equal!=string::npos)
+		{
+			string key = i->substr(0, equal);
+			string value = i->substr(equal+1);
+			if(toolchain.has_tool(key))
+				toolchain.get_tool(key).set_command(value);
+			else
+				cmdline_options.insert({ key, value });
+			i = cmdline_targets.erase(i);
+		}
+		else
+			++i;
+	}
 }
 
 BuilderCLI::~BuilderCLI()
@@ -176,7 +182,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);
@@ -214,26 +224,24 @@ int BuilderCLI::main()
 
 	BuildGraph &build_graph = builder.get_build_graph();
 	PackageManager &package_manager = builder.get_package_manager();
-	const PackageManager::PackageMap &packages = package_manager.get_packages();
 	list<string> package_details;
-	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+	for(const auto &kvp: package_manager.get_packages())
 	{
-		if(!i->second->is_prepared())
+		if(!kvp.second->is_prepared())
 			continue;
 
-		string line = i->second->get_name();
-		if(dynamic_cast<SourcePackage *>(i->second))
+		string line = kvp.second->get_name();
+		if(dynamic_cast<SourcePackage *>(kvp.second))
 		{
 			line += '*';
 
 			unsigned count = 0;
 			unsigned to_be_built = 0;
-			const BuildGraph::TargetMap &targets = build_graph.get_targets();
-			for(BuildGraph::TargetMap::const_iterator j=targets.begin(); j!=targets.end(); ++j)
-				if(j->second->get_package()==i->second)
+			for(const auto &kvp2: build_graph.get_targets())
+				if(kvp2.second->get_package()==kvp.second)
 				{
 					++count;
-					if(j->second->needs_rebuild())
+					if(kvp2.second->needs_rebuild())
 						++to_be_built;
 				}
 			if(count)
@@ -249,18 +257,18 @@ int BuilderCLI::main()
 	}
 
 	logger.log("summary", format("%d active packages, %d targets", package_details.size(), build_graph.get_targets().size()));
-	for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
-		logger.log("packages", *i);
+	for(const string &d: package_details)
+		logger.log("packages", d);
 
 	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(const string &p: problems)
+			IO::print(IO::cerr, "  %s\n", p);
 		if(!analyzer)
 			IO::print(IO::cerr, "Please fix them and try again.\n");
 		return 1;
@@ -271,6 +279,9 @@ int BuilderCLI::main()
 	if(build)
 		exit_code = builder.build(jobs, dry_run, show_progress);
 
+	if(!dry_run)
+		builder.save_caches();
+
 	return exit_code;
 }
 
@@ -285,12 +296,12 @@ bool BuilderCLI::prepare_build()
 	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)
+	for(const string &t: cmdline_targets)
 	{
-		Target *tgt = resolve_target(*i);
+		Target *tgt = resolve_target(t);
 		if(!tgt)
 		{
-			IO::print("I don't know anything about %s\n", *i);
+			IO::print("I don't know anything about %s\n", t);
 			return false;
 		}
 
@@ -300,12 +311,12 @@ bool BuilderCLI::prepare_build()
 	build_graph.prepare();
 
 	// Apply what-ifs
-	for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+	for(const string &w: what_if)
 	{
-		FileTarget *tgt = dynamic_cast<FileTarget *>(resolve_target(*i));
+		FileTarget *tgt = dynamic_cast<FileTarget *>(resolve_target(w));
 		if(!tgt)
 		{
-			IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
+			IO::print(IO::cerr, "Unknown what-if target %s\n", w);
 			return false;
 		}
 		tgt->touch();
@@ -315,11 +326,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;
 }
@@ -340,23 +347,40 @@ void BuilderCLI::package_help()
 
 	SourcePackage &main_pkg = dynamic_cast<SourcePackage &>(package_manager.get_main_package());
 	const Config &config = main_pkg.get_config();
-	const Config::OptionMap &options = config.get_options();
-
-	IO::print("\nRequired packages:\n  ");
+	const auto &options = config.get_options();
 	const Package::Requirements &requires = main_pkg.get_required_packages();
-	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+
+	if(!requires.empty() || !options.empty())
+		IO::print("\nHelp for package %s:\n", main_pkg.get_name());
+
+	if(!requires.empty())
 	{
-		if(i!=requires.begin())
-			IO::print(", ");
-		IO::print((*i)->get_name());
+		IO::print("\nRequired packages:\n  ");
+		for(auto i=requires.begin(); i!=requires.end(); ++i)
+		{
+			if(i!=requires.begin())
+				IO::print(", ");
+			IO::print((*i)->get_name());
+		}
+		IO::print("\n");
 	}
-	IO::print("\n\nPackage configuration:\n");
-	for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
+
+	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(const auto &kvp: options)
+		{
+			const Config::Option &opt = kvp.second;
+			string line = format("  %s: %s (%s)", opt.name, opt.description, opt.value);
+			if(!opt.choices.empty())
+			{
+				line += " {";
+				line += join(opt.choices.begin(), opt.choices.end(), " ");
+				line += '}';
+			}
+			else if(opt.value!=opt.default_value)
+				line += format(" [%s]", opt.default_value);
+			IO::print("%s\n", line);
+		}
 	}
 }