-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <set>
#include <cstdlib>
-#include <msp/core/except.h>
#include <msp/core/getopt.h>
#include <msp/datafile/parser.h>
#include <msp/fs/dir.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/io/buffered.h>
-#include <msp/io/except.h>
#include <msp/io/file.h>
#include <msp/io/print.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include <msp/strings/regex.h>
#include <msp/strings/utils.h>
#include <msp/time/units.h>
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");
else if(analyze_mode=="rdeps")
analyzer->set_mode(Analyzer::RDEPS);
else
- throw UsageError("Invalid analyze mode");
+ throw usage_error("Invalid analyze mode");
analyzer->set_max_depth(max_depth);
analyzer->set_full_paths(full_paths);
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%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())
int status;
string res = run_command(argv, &status);
if(status)
- throw Exception(format("pkg-config for package %s failed", pkg));
+ throw runtime_error(format("pkg-config for package %s failed", pkg));
return res;
}
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;
{
syspath.push_back("/lib");
syspath.push_back("/usr/lib");
+ if(current_arch->match_name("pc-32-linux"))
+ syspath.push_back("/usr/lib/i386-linux-gnu");
+ else if(current_arch->match_name("pc-64-linux"))
+ syspath.push_back("/usr/lib/x86_64-linux-gnu");
}
else
syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/lib");
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;
// 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(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;