bool no_externals = false;
unsigned verbose = 1;
bool silent = false;
- list<string> log_channels;
+ vector<string> log_channels;
string build_type;
GetOpt getopt;
else if(!clean && !create_makefile)
build = true;
- for(auto 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);
builder.set_architecture(tolower(arch));
- list<FS::Path> start_files;
+ vector<FS::Path> start_files;
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)
builder.add_default_tools();
const Toolchain &toolchain = builder.get_toolchain();
- for(auto i=cmdline_options.begin(); i!=cmdline_options.end(); )
+ for(auto i=cmdline_targets.begin(); i!=cmdline_targets.end(); )
{
- if(toolchain.has_tool(i->first))
+ string::size_type equal = i->find('=');
+ if(equal!=string::npos)
{
- toolchain.get_tool(i->first).set_command(i->second);
- cmdline_options.erase(i++);
+ 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;
return 0;
}
- if(!prepare_build())
- return 1;
-
- if(conf_only)
- return 0;
-
const Architecture &native_arch = builder.get_native_arch();
const Architecture ¤t_arch = builder.get_current_arch();
logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
const BuildType &build_type = builder.get_build_type();
logger.log("environment", format("Build type is %s", build_type.get_name()));
+ if(!prepare_build())
+ return 1;
+
+ if(conf_only)
+ return 0;
+
BuildGraph &build_graph = builder.get_build_graph();
PackageManager &package_manager = builder.get_package_manager();
- list<string> package_details;
+ vector<string> package_details;
for(const auto &kvp: package_manager.get_packages())
{
if(!kvp.second->is_prepared())
if(build_graph.get_goals().is_broken())
{
- list<string> problems = builder.collect_problems();
+ vector<string> problems = builder.collect_problems();
IO::print(IO::cerr, "The following problems were detected:\n");
for(const string &p: problems)
IO::print(IO::cerr, " %s\n", p);
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();
+ const auto &options = config.get_options();
const Package::Requirements &requires = main_pkg.get_required_packages();
if(!requires.empty() || !options.empty())