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