getopt.add_option('C', "chdir", work_dir, GetOpt::REQUIRED_ARG).set_help("Change to DIR before doing anything else.", "DIR");
getopt.add_option('P', "progress", show_progress, GetOpt::NO_ARG).set_help("Display progress while building.");
getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_ARG).set_help("Pretend that FILE has changed.", "FILE");
- getopt.add_option( "arch", arch, GetOpt::REQUIRED_ARG).set_help("Architecture to build for.", "ARCH");
+ getopt.add_option( "arch", arch, GetOpt::REQUIRED_ARG).set_help("Build for architecture ARCH.", "ARCH");
getopt.add_option( "conf-only", conf_only, GetOpt::NO_ARG).set_help("Stop after configuring packages.");
getopt.add_option( "full-paths", full_paths, GetOpt::NO_ARG).set_help("Output full paths in analysis.");
- getopt.add_option( "max-depth", max_depth, GetOpt::REQUIRED_ARG).set_help("Maximum depth to show in analysis.", "NUM");
- getopt.add_option( "prefix", prfx, GetOpt::REQUIRED_ARG).set_help("Directory to install things to.", "DIR");
+ getopt.add_option( "max-depth", max_depth, GetOpt::REQUIRED_ARG).set_help("Show up to NUM levels in analysis..", "NUM");
+ getopt.add_option( "prefix", prfx, GetOpt::REQUIRED_ARG).set_help("Install things to DIR.", "DIR");
getopt.add_option( "tempdir", temp_str, GetOpt::REQUIRED_ARG).set_help("Store temporary files in DIR.", "DIR");
getopt.add_option( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST");
usagemsg = getopt.generate_usage(argv[0])+" [<target> ...]";
}
}
- main_pkg->configure(cmdline_options, conf_all?2:1);
-
if(help)
{
usage(0, "builder", false);
if(conf_only)
return 0;
- if(create_targets())
+ if(!prepare_build())
return 1;
logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
list<string> package_details;
for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
{
- if(!i->second || !i->second->is_configured())
+ if(!i->second || !i->second->is_prepared())
continue;
string line = i->second->get_name();
return 0;
}
-int Builder::create_targets()
+bool Builder::prepare_build()
{
Target *world = new VirtualTarget(*this, "world");
Target *tarballs = new VirtualTarget(*this, "tarballs");
world->add_depend(*tarballs);
- const PackageManager::PackageMap &packages = package_manager.get_packages();
- for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
- if(i->second && i->second->is_configured())
- i->second->create_targets();
+ main_pkg->prepare();
// Make the cmdline target depend on all targets mentioned on the command line
Target *cmdline = new VirtualTarget(*this, "cmdline");
if(!tgt)
{
IO::print("I don't know anything about %s\n", *i);
- return -1;
+ return false;
}
cmdline->add_depend(*tgt);
if(!tgt)
{
IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
- return -1;
+ return false;
}
tgt->touch();
}
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();
}
- return 0;
+ return true;
}
int Builder::do_build()
if(!obj.main_pkg)
obj.main_pkg = pkg;
- load_sub(*pkg);
+ if(obj.conf_all || pkg==obj.main_pkg)
+ load_sub(*pkg, obj.cmdline_options);
+ else
+ load_sub(*pkg);
+
if(obj.build_type)
pkg->set_build_type(*obj.build_type);
}