X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildercli.cpp;h=c7a2817ce4d6315ea99f33c3e414049c49f8b083;hb=ab1c7f6580c80b7f02ffc8a01199463fc881488b;hp=a37336f20e886686a7873d08947d1b6855c33f4b;hpb=8b6370186b119e56275401aefbea22b5e0d76142;p=builder.git diff --git a/source/buildercli.cpp b/source/buildercli.cpp index a37336f..c7a2817 100644 --- a/source/buildercli.cpp +++ b/source/buildercli.cpp @@ -191,7 +191,11 @@ int BuilderCLI::main() { FS::Path main_file = cwd/build_file; if(FS::exists(main_file)) + { builder.load_build_file(main_file, &cmdline_options, conf_all); + if(!dry_run && !cmdline_options.empty()) + builder.save_caches(); + } else if(!help) { IO::print(IO::cerr, "The file %s does not exist.\n", main_file); @@ -286,6 +290,9 @@ int BuilderCLI::main() if(build) exit_code = builder.build(jobs, dry_run, show_progress); + if(!dry_run) + builder.save_caches(); + return exit_code; } @@ -352,16 +359,22 @@ void BuilderCLI::package_help() SourcePackage &main_pkg = dynamic_cast(package_manager.get_main_package()); const Config &config = main_pkg.get_config(); const Config::OptionMap &options = config.get_options(); - - IO::print("\nRequired packages:\n "); const Package::Requirements &requires = main_pkg.get_required_packages(); - for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) + + if(!requires.empty() || !options.empty()) + IO::print("\nHelp for package %s:\n", main_pkg.get_name()); + + if(!requires.empty()) { - if(i!=requires.begin()) - IO::print(", "); - IO::print((*i)->get_name()); + IO::print("\nRequired packages:\n "); + for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) + { + if(i!=requires.begin()) + IO::print(", "); + IO::print((*i)->get_name()); + } + IO::print("\n"); } - IO::print("\n"); if(!options.empty()) {