Replace the chrome mode with a more useful progress display

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index d4669520abd93fd7aabaf4b9b1ba7cf2bfc690ac..2ef5a709e1913d33cae79f1677ce1b21290d1cee 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -43,7 +43,7 @@ Builder::Builder(int argc, char **argv):
        dry_run(false),
        help(false),
        verbose(1),
-       chrome(false),
+       show_progress(false),
        build_file("Build"),
        jobs(1),
        conf_all(false),
@@ -68,8 +68,8 @@ Builder::Builder(int argc, char **argv):
        getopt.add_option('A', "conf-all",   conf_all,     GetOpt::NO_ARG);
        getopt.add_option('B', "build-all",  build_all,    GetOpt::NO_ARG);
        getopt.add_option('C', "chdir",      work_dir,     GetOpt::REQUIRED_ARG);
+       getopt.add_option('P', "progress",   show_progress, GetOpt::NO_ARG);
        getopt.add_option('W', "what-if",    what_if,      GetOpt::REQUIRED_ARG);
-       getopt.add_option(     "chrome",     chrome,       GetOpt::NO_ARG);
        getopt.add_option(     "conf-only",  conf_only,    GetOpt::NO_ARG);
        getopt.add_option(     "full-paths", full_paths,   GetOpt::NO_ARG);
        //getopt.add_option(     "makefile",   create_makefile, GetOpt::NO_ARG);
@@ -97,8 +97,8 @@ Builder::Builder(int argc, char **argv):
        else if(!clean && !create_makefile)
                build=true;
 
-       const list<string> &args=getopt.get_args();
-       for(list<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
+       const vector<string> &args=getopt.get_args();
+       for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
        {
                unsigned equal=i->find('=');
                if(equal!=string::npos)
@@ -115,14 +115,12 @@ Builder::Builder(int argc, char **argv):
 
        cwd=Path::getcwd();
 
-       archs.insert(StringMap::value_type("native", ""));
-
-       StringMap &native_tools=tools.insert(ToolMap::value_type("native", StringMap())).first->second;
-       native_tools.insert(StringMap::value_type("CC",   "gcc"));
-       native_tools.insert(StringMap::value_type("CXX",  "g++"));
-       native_tools.insert(StringMap::value_type("LD",   "gcc"));
-       native_tools.insert(StringMap::value_type("LDXX", "g++"));
-       native_tools.insert(StringMap::value_type("AR",   "ar"));
+       Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
+       native_arch.set_tool("CC",  "gcc");
+       native_arch.set_tool("CXX", "g++");
+       native_arch.set_tool("LD",  "gcc");
+       native_arch.set_tool("LXX", "g++");
+       native_arch.set_tool("AR",  "ar");
 
        const char *home=getenv("HOME");
        if(home)
@@ -260,7 +258,7 @@ Target *Builder::get_library(const string &lib, const string &arch, const list<s
                syspath.push_back("/usr/lib");
        }
        else
-               syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib");
+               syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
 
        Target *tgt=0;
        for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
@@ -273,34 +271,15 @@ Target *Builder::get_library(const string &lib, const string &arch, const list<s
        return tgt;
 }
 
-const string &Builder::get_arch_prefix(const string &arch) const
+const Architecture &Builder::get_architecture(const string &arch) const
 {
-       StringMap::const_iterator i=archs.find(arch);
+       ArchMap::const_iterator i=archs.find(arch);
        if(i==archs.end())
                throw InvalidParameterValue("Unknown architecture");
 
        return i->second;
 }
 
-string Builder::get_tool(const std::string &tool, const std::string &arch)
-{
-       ToolMap::iterator i=tools.find(arch);
-       if(i!=tools.end())
-       {
-               StringMap::iterator j=i->second.find(tool);
-               if(j!=i->second.end())
-                       return j->second;
-       }
-
-       // Either the arch, or the tool within the arch was not found
-       i=tools.find("native");
-       StringMap::iterator j=i->second.find(tool);
-       if(j==i->second.end())
-               throw InvalidParameterValue("Unknown tool");
-
-       return get_arch_prefix(arch)+"-"+j->second;
-}
-
 void Builder::apply_profile_template(Config &config, const string &pt) const
 {
        vector<string> parts=split(pt, '-');
@@ -447,8 +426,8 @@ void Builder::usage(const char *reason, const char *argv0, bool brief)
                        "  -A, --conf-all      Apply configuration to all packages.\n"
                        "  -B, --build-all     Build all targets unconditionally.\n"
                        "  -C, --chdir DIR     Change to DIR before doing anything else.\n"
+                       "  -P, --progress      Display progress while building.\n"
                        "  -W, --what-if FILE  Pretend that FILE has changed.\n"
-                       "  --chrome            Use extra chrome to print status.\n"
                        "  --conf-only         Stop after configuring packages.\n"
                        "  --full-paths        Output full paths in analysis.\n"
                        //"  --makefile          Create a makefile for this package.\n"
@@ -667,8 +646,6 @@ int Builder::do_build()
 
        vector<Action *> actions;
 
-       if(chrome)
-               cout<<"0 targets built\n";
        unsigned count=0;
 
        bool fail=false;
@@ -684,6 +661,12 @@ int Builder::do_build()
                                Action *action=tgt->build();
                                if(action)
                                        actions.push_back(action);
+
+                               if(show_progress)
+                               {
+                                       cout<<count<<" of "<<total<<" targets built\033[1G";
+                                       cout.flush();
+                               }
                        }
                        else if(actions.empty())
                                finish=true;
@@ -697,17 +680,7 @@ int Builder::do_build()
                        if(status>=0)
                        {
                                ++count;
-                               if(chrome)
-                               {
-                                       cout<<"\e["<<actions.size()+1<<'A';
-                                       cout<<count<<" targets built\n";
-                                       if(i)
-                                               cout<<"\e["<<i<<"B";
-                                       cout<<"\e[M";
-                                       if(i<actions.size()-1)
-                                               cout<<"\e["<<actions.size()-i-1<<"B";
-                                       cout.flush();
-                               }
+
                                delete actions[i];
                                actions.erase(actions.begin()+i);
                                if(status>0)
@@ -720,8 +693,12 @@ int Builder::do_build()
                }
        }
 
+       if(show_progress)
+               cout<<"\033[K";
        if(fail)
                cout<<"Build failed\n";
+       else if(show_progress)
+               cout<<"Build complete\n";
 
        return fail?1:0;
 }
@@ -800,9 +777,11 @@ Builder::Loader::Loader(Builder &b, const Path::Path &s):
        add("package", &Loader::package);
 }
 
-void Builder::Loader::architecture(const string &a, const string &p)
+void Builder::Loader::architecture(const string &n)
 {
-       bld.archs.insert(StringMap::value_type(a, p));
+       Architecture arch(bld, n);
+       load_sub(arch);
+       bld.archs.insert(ArchMap::value_type(n, arch));
 }
 
 void Builder::Loader::binpkg(const string &n)