X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=5a1d624390fa45250bab4451b3196693d5d46dc9;hb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;hp=28d57d44012ce1465720185b1ea5d04c7558b910;hpb=4fcc283a4bb1f695bd124006906bcdaba053193f;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 28d57d4..5a1d624 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -27,12 +27,12 @@ using namespace std; using namespace Msp; Builder::Builder(int argc, char **argv): + analyzer(0), + do_build(true), verbose(1), + chrome(false), build_file("Build"), - do_build(true), - analyzer(0), - jobs(1), - chrome(false) + jobs(1) { GetOpt getopt; getopt.add_option(GetOpt::Option('a', "analyze", GetOpt::REQUIRED)); @@ -256,7 +256,7 @@ int Builder::main() return 0; } - std::list missing; + StringList missing; for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) if(!i->second) missing.push_back(i->first); @@ -639,8 +639,8 @@ void Builder::package_help() const Config::OptionMap &options=config.get_options(); cout<<"Required packages:\n "; - const list &requires=default_pkg->get_requires(); - for(list::const_iterator i=requires.begin(); i!=requires.end(); ++i) + const PkgRefList &requires=default_pkg->get_requires(); + for(PkgRefList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { if(i!=requires.begin()) cout<<", ";