#include <set>
-#include <cstdlib>
#include <msp/core/getopt.h>
#include <msp/datafile/parser.h>
#include <msp/fs/dir.h>
conf_all(false),
conf_only(false),
build_all(false),
- create_makefile(false)
+ create_makefile(false),
+ tempdir("temp")
{
string analyze_mode;
string work_dir;
unsigned max_depth = 5;
StringList cmdline_warn;
string prfx;
+ string temp_str;
string arch;
bool no_externals = false;
unsigned verbose = 1;
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( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST");
+ 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");
usagemsg = getopt.generate_usage(argv[0])+" [<target> ...]";
helpmsg = getopt.generate_help();
getopt(argc, argv);
prefix = (FS::get_home_dir()/"local"/current_arch->get_name()).str();
}
else
- prefix = FS::getcwd()/prfx;
+ prefix = cwd/prfx;
+
+ if(!temp_str.empty())
+ tempdir = temp_str;
if(!build_type_name.empty())
{
build_type = &i->second;
}
- warnings.push_back("all");
- warnings.push_back("extra");
- warnings.push_back("shadow");
- warnings.push_back("pointer-arith");
- warnings.push_back("error");
- for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i)
- {
- vector<string> warns = split(*i, ',');
- warnings.insert(warnings.end(), warns.begin(), warns.end());
- }
-
toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
toolchain.add_tool(new GnuLinker(*this, *current_arch));
int Builder::main()
{
- if(prefix.str()!="/usr")
- {
- FS::Path pcdir = prefix/"lib"/"pkgconfig";
- if(const char *pcp = getenv("PKG_CONFIG_PATH"))
- {
- vector<string> path = split(pcp, ':');
- bool found = false;
- for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
- found = (*i==pcdir.str());
- if(!found)
- {
- path.push_back(pcdir.str());
- setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
- }
- }
- else
- setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true);
- }
-
if(load_build_file(cwd/build_file))
{
if(help)
}
}
- main_pkg->configure(cmdline_options, conf_all?2:1);
-
if(help)
{
usage(0, "builder", false);
return 0;
}
+ if(!prepare_build())
+ return 1;
+
if(conf_only)
return 0;
- if(create_targets())
- return 1;
-
logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")));
logger.log("environment", format("Prefix is %s", prefix));
+ if(tempdir.is_absolute())
+ logger.log("environment", format("Temporary directory is %s", tempdir));
+ else
+ logger.log("environment", format("Using per-package temporary directory %s", tempdir));
if(build_type)
logger.log("environment", format("Build type is %s", build_type->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();
targets.insert(TargetMap::value_type(t->get_name(), t));
}
+void Builder::add_primary_target(Target &t)
+{
+ get_target("world")->add_dependency(t);
+
+ if(t.get_package()==main_pkg && t.get_component() && t.get_component()->is_default())
+ get_target("default")->add_dependency(t);
+}
+
void Builder::usage(const char *reason, const char *argv0, bool brief)
{
if(reason)
return 0;
}
-int Builder::create_targets()
+bool Builder::prepare_build()
{
Target *world = new VirtualTarget(*this, "world");
Target *def_tgt = new VirtualTarget(*this, "default");
- world->add_depend(*def_tgt);
+ world->add_dependency(*def_tgt);
Target *install = new VirtualTarget(*this, "install");
- world->add_depend(*install);
+ world->add_dependency(*install);
Target *tarballs = new VirtualTarget(*this, "tarballs");
- world->add_depend(*tarballs);
+ world->add_dependency(*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);
+ cmdline->add_dependency(*tgt);
}
cmdline->prepare();
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(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
clean_tgts.insert(tgt);
- const Target::Dependencies &deps = tgt->get_depends();
+ const Target::Dependencies &deps = tgt->get_dependencies();
for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
if(!clean_tgts.count(*i))
queue.push_back(*i);
const Config::OptionMap &options = config.get_options();
IO::print("Required packages:\n ");
- const PackageList &requires = main_pkg->get_requires();
+ const PackageList &requires = main_pkg->get_required_packages();
for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
{
if(i!=requires.begin())
for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
{
const Config::Option &opt = i->second;
- IO::print(" %s: %s (%s)", opt.name, opt.descr, opt.value);
- if(opt.value!=opt.defv)
- IO::print(" [%s]", opt.defv);
+ 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");
}
}
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);
}
projects / builder.git / blobdiff