Bump version to 3.0 and update copyright years

[builder.git] / source / buildercli.cpp

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index 8ba8d96bdba0e105ac3f43bf811fbe05af9eddb8..688a1db1b2df5a898cc1b62262e68e982bdc231d 100644 (file)
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -39,7 +39,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
        bool no_externals = false;
        unsigned verbose = 1;
        bool silent = false;
-       list<string> log_channels;
+       vector<string> log_channels;
        string build_type;
 
        GetOpt getopt;
@@ -136,7 +136,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 
        builder.set_architecture(tolower(arch));
 
-       list<FS::Path> start_files;
+       vector<FS::Path> start_files;
        start_files.push_back(FS::get_sys_data_dir()/"builderrc");
        start_files.push_back(FS::get_user_data_dir()/"rc");
        for(const FS::Path &f: start_files)
@@ -195,8 +195,8 @@ int BuilderCLI::main()
 
        if(help)
        {
-               IO::print("Builder 1.0\n"
-                       "Copyright © 2006-2013  Mikkosoft Productions, Mikko Rasa\n"
+               IO::print("Builder 3.0\n"
+                       "Copyright © 2006-2022  Mikkosoft Productions, Mikko Rasa\n"
                        "Licensed under the GPL\n\n"
                        "%s", helpmsg);
                package_help();
@@ -205,16 +205,16 @@ int BuilderCLI::main()
 
        const Architecture &native_arch = builder.get_native_arch();
        const Architecture &current_arch = builder.get_current_arch();
-       logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
-               current_arch.get_name(), (current_arch.is_native() ? " (native)" : "")));
-       logger.log("environment", format("Prefix is %s", builder.get_prefix()));
+       logger.log("environment", "Building on %s, for %s%s", native_arch.get_name(),
+               current_arch.get_name(), (current_arch.is_native() ? " (native)" : ""));
+       logger.log("environment", "Prefix is %s", builder.get_prefix());
        const FS::Path &tempdir = builder.get_temp_directory();
        if(tempdir.is_absolute())
-               logger.log("environment", format("Temporary directory is %s", tempdir));
+               logger.log("environment", "Temporary directory is %s", tempdir);
        else
-               logger.log("environment", format("Using per-package temporary directory %s", tempdir));
+               logger.log("environment", "Using per-package temporary directory %s", tempdir);
        const BuildType &build_type = builder.get_build_type();
-       logger.log("environment", format("Build type is %s", build_type.get_name()));
+       logger.log("environment", "Build type is %s", build_type.get_name());
 
        if(!prepare_build())
                return 1;
@@ -224,7 +224,7 @@ int BuilderCLI::main()
 
        BuildGraph &build_graph = builder.get_build_graph();
        PackageManager &package_manager = builder.get_package_manager();
-       list<string> package_details;
+       vector<string> package_details;
        for(const auto &kvp: package_manager.get_packages())
        {
                if(!kvp.second->is_prepared())
@@ -256,7 +256,7 @@ int BuilderCLI::main()
                package_details.push_back(line);
        }
 
-       logger.log("summary", format("%d active packages, %d targets", package_details.size(), build_graph.get_targets().size()));
+       logger.log("summary", "%d active packages, %d targets", package_details.size(), build_graph.get_targets().size());
        for(const string &d: package_details)
                logger.log("packages", d);
 
@@ -265,7 +265,7 @@ int BuilderCLI::main()
 
        if(build_graph.get_goals().is_broken())
        {
-               list<string> problems = builder.collect_problems();
+               vector<string> problems = builder.collect_problems();
                IO::print(IO::cerr, "The following problems were detected:\n");
                for(const string &p: problems)
                        IO::print(IO::cerr, "  %s\n", p);