/* $Id$
This file is part of builder
-Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
#include <set>
#include <cstdlib>
-#include <sys/utsname.h>
#include <msp/core/except.h>
#include <msp/core/getopt.h>
#include <msp/datafile/parser.h>
Builder::Builder(int argc, char **argv):
main_pkg(0),
+ native_arch(*this, string()),
analyzer(0),
build(false),
clean(0),
getopt.add_option('j', "jobs", jobs, GetOpt::REQUIRED_ARG).set_help("Run NUM commands at once, whenever possible.", "NUM");
getopt.add_option('n', "dry-run", dry_run, GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done.");
getopt.add_option('v', "verbose", verbose, GetOpt::NO_ARG).set_help("Print more information about what's going on.");
+ getopt.add_option('x', "no-externals", no_externals, GetOpt::NO_ARG).set_help("Do not load external source packages.");
getopt.add_option('A', "conf-all", conf_all, GetOpt::NO_ARG).set_help("Apply configuration to all packages.");
getopt.add_option('B', "build-all", build_all, GetOpt::NO_ARG).set_help("Build all targets unconditionally.");
getopt.add_option('C', "chdir", work_dir, GetOpt::REQUIRED_ARG).set_help("Change to DIR before doing anything else.", "DIR");
cwd = FS::getcwd();
- utsname un;
- string sysname = "native";
- if(uname(&un)==0)
- sysname = tolower(un.sysname);
-
- native_arch = &archs.insert(ArchMap::value_type(sysname, Architecture(*this, sysname, true))).first->second;
- native_arch->set_tool("CC", "gcc");
- native_arch->set_tool("CXX", "g++");
- native_arch->set_tool("LD", "gcc");
- native_arch->set_tool("LXX", "g++");
- native_arch->set_tool("AR", "ar");
+ native_arch.set_tool("CC", "gcc");
+ native_arch.set_tool("CXX", "g++");
+ native_arch.set_tool("LD", "gcc");
+ native_arch.set_tool("LXX", "g++");
+ native_arch.set_tool("AR", "ar");
load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
load_build_file((FS::get_user_data_dir("builder")/"rc").str());
if(arch.empty())
- current_arch = native_arch;
+ current_arch = &native_arch;
else
- current_arch = &get_architecture(arch);
+ current_arch = new Architecture(*this, arch);
+
+ if(!current_arch->is_native())
+ {
+ for(StringMap::const_iterator i=cross_prefixes.begin(); i!=cross_prefixes.end(); ++i)
+ if(current_arch->match_name(i->first))
+ {
+ current_arch->set_cross_prefix(i->second);
+ break;
+ }
+ }
if(prfx.empty())
{
return 0;
}
- if(!conf_only && create_targets())
- return 1;
-
- PackageList all_reqs = main_pkg->collect_requires();
-
if(conf_only)
return 0;
+ if(create_targets())
+ return 1;
+
if(verbose>=2)
- IO::print("Building on %s, for %s\n", native_arch->get_name(), current_arch->get_name());
+ {
+ IO::print("Building on %s, for %s%s\n", native_arch.get_name(),
+ current_arch->get_name(), (current_arch->is_native() ? " (native)" : ""));
+ IO::print("Prefix is %s\n", prefix);
+ }
+
if(verbose>=1)
- IO::print("%d active packages, %d targets\n", all_reqs.size(), targets.size());
+ {
+ unsigned n_packages = 0;
+ for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ if(i->second && i->second->is_configured())
+ ++n_packages;
+ IO::print("%d active packages, %d targets\n", n_packages, targets.size());
+ }
+
if(verbose>=2)
{
- for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
{
- IO::print(" %s", (*i)->get_name());
- if(dynamic_cast<SourcePackage *>(*i))
+ if(!i->second->is_configured())
+ continue;
+
+ IO::print(" %s", i->second->get_name());
+ if(dynamic_cast<SourcePackage *>(i->second))
IO::print("*");
unsigned count = 0;
unsigned to_be_built = 0;
for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
- if(j->second->get_package()==*i)
+ if(j->second->get_package()==i->second)
{
++count;
if(j->second->get_rebuild())
Package *Builder::get_package(const string &name)
{
- PackageMap::iterator i = packages.find(format("%s/%s", name, current_arch->get_name()));
+ PackageMap::iterator i = packages.find(format("%s/%s", name, current_arch->get_system()));
if(i==packages.end())
i = packages.find(name);
if(i!=packages.end())
return i->second;
- FS::Path path = get_package_location(name);
- if(!path.empty() && !load_build_file(path/"Build"))
+ if(!no_externals)
{
- i = packages.find(name);
- if(i!=packages.end())
- return i->second;
+ FS::Path path = get_package_location(name);
+ if(!path.empty() && !load_build_file(path/"Build"))
+ {
+ i = packages.find(name);
+ if(i!=packages.end())
+ return i->second;
+ }
}
Package *pkg = 0;
if(current_arch->is_native())
syspath.push_back("/usr/include");
else
- syspath.push_back("/usr/"+current_arch->get_prefix()+"/include");
+ syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/include");
if(cxx_ver!="-")
syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
syspath.push_back("/usr/lib");
}
else
- syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib");
+ syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/lib");
if(verbose>=5)
IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
return tgt;
}
-const Architecture &Builder::get_architecture(const string &arch) const
-{
- ArchMap::const_iterator i = archs.find(arch);
- if(i==archs.end())
- throw KeyError("Unknown architecture", arch);
-
- return i->second;
-}
-
void Builder::apply_profile_template(Config &config, const string &pt) const
{
vector<string> parts = split(pt, '-');
problems.push_back(Problem(p, d));
}
-void Builder::add_target(Target *t)
+void Builder::add_target(FileTarget *t)
+{
+ targets.insert(TargetMap::value_type(t->get_path().str(), t));
+ new_tgts.push_back(t);
+}
+
+void Builder::add_target(VirtualTarget *t)
{
targets.insert(TargetMap::value_type(t->get_name(), t));
new_tgts.push_back(t);
Loader loader(*this, fn.subpath(0, fn.size()-1));
loader.load(parser);
}
- catch(const IO::FileNotFound &)
+ catch(const IO::file_not_found &)
{
return -1;
}
Target *tarballs = new VirtualTarget(*this, "tarballs");
world->add_depend(tarballs);
- PackageList all_reqs = main_pkg->collect_requires();
- for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
{
- SourcePackage *spkg = dynamic_cast<SourcePackage *>(*i);
+ if(!i->second || !i->second->is_configured())
+ continue;
+
+ SourcePackage *spkg = dynamic_cast<SourcePackage *>(i->second);
if(!spkg)
continue;
// Apply what-ifs
for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
{
- Target *tgt = get_target((cwd/ *i).str());
+ FileTarget *tgt = dynamic_cast<FileTarget *>(get_target((cwd/ *i).str()));
if(!tgt)
{
IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
// Make the cmdline target depend on all targets mentioned on the command line
Target *cmdline = new VirtualTarget(*this, "cmdline");
- bool build_world = false;
for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
{
Target *tgt = get_target(*i);
IO::print("I don't know anything about %s\n", *i);
return -1;
}
- if(tgt==world)
- build_world = true;
+
cmdline->add_depend(tgt);
}
if(mode!=ALL_STATIC)
{
- if(current_arch->get_name()=="win32")
+ // XXX Should probably let the Architecture populate the list
+ if(current_arch->get_system()=="windows")
{
candidates.push_back("lib"+lib+".dll");
candidates.push_back(lib+".dll");
/* Static libraries are always considered, since sometimes shared versions
may not be available */
candidates.push_back("lib"+lib+".a");
- if(current_arch->get_name()=="win32")
+ if(current_arch->get_system()=="windows")
candidates.push_back("lib"+lib+".dll.a");
for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
if(tgt)
{
- Target *real_tgt = tgt;
- if(Install *inst = dynamic_cast<Install *>(tgt))
- real_tgt = &inst->get_source();
+ Target *real_tgt = tgt->get_real_target();
/* Ignore dynamic libraries from local packages unless library mode is
DYNAMIC */
}
}
-Application::RegApp<Builder> Builder::reg;
string Builder::usagemsg;
string Builder::helpmsg;
bld(b),
src(s)
{
- add("architecture", &Loader::architecture);
add("binary_package", &Loader::binpkg);
+ add("cross_prefix", &Loader::cross_prefix);
add("profile", &Loader::profile);
add("package", &Loader::package);
}
-void Builder::Loader::architecture(const string &n)
-{
- Architecture arch(bld, n);
- load_sub(arch);
- bld.archs.insert(ArchMap::value_type(n, arch));
-}
-
void Builder::Loader::binpkg(const string &n)
{
BinaryPackage *pkg = new BinaryPackage(bld, n);
bld.packages.insert(PackageMap::value_type(n, pkg));
}
+void Builder::Loader::cross_prefix(const string &a, const string &p)
+{
+ bld.cross_prefixes[a] = p;
+}
+
void Builder::Loader::profile(const string &n)
{
StringMap prf;
projects / builder.git / blobdiff