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())
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;
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;
}