+#include <deque>
#include <set>
+#include <msp/core/except.h>
#include <msp/core/maputils.h>
#include <msp/datafile/parser.h>
#include <msp/fs/dir.h>
return keys;
}
+const BuildType &Builder::get_build_type() const
+{
+ if(!build_type)
+ throw invalid_state("no build type");
+ return *build_type;
+}
+
void Builder::set_build_type(const string &name)
{
build_type = &get_item(build_types, name);
logger = (l ? l : &default_logger);
}
-list<string> Builder::collect_problems() const
+vector<string> Builder::collect_problems() const
{
- list<string> problems;
+ vector<string> problems;
set<const Package *> broken_packages;
set<const Component *> broken_components;
set<const Tool *> broken_tools;
// Cleaning doesn't care about ordering, so a simpler method can be used
set<Target *> clean_tgts;
- list<Target *> queue;
+ deque<Target *> queue;
queue.push_back(&build_graph.get_goals());
while(!queue.empty())
{
BuildType btype(n);
load_sub(btype);
- BuildTypeMap::iterator i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first;
+ auto i = obj.build_types.insert({ n, btype }).first;
if(!obj.build_type)
obj.build_type = &i->second;
}
{
SourcePackage *pkg = new SourcePackage(obj, n, get_source());
- if(options)
- load_sub(*pkg, *options);
- else
- load_sub(*pkg);
+ load_sub(*pkg, options);
if(obj.build_type)
pkg->set_build_type(*obj.build_type);