Replace the chrome mode with a more useful progress display

Getopt::get_args now returns a vector
Use build info from conditions again

diff --git a/source/builder.cpp b/source/builder.cpp
index ee7eabfd1c9e93ff3913f510fb8e0ee09563cc7d..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)
@@ -426,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"
@@ -646,8 +646,6 @@ int Builder::do_build()
 
        vector<Action *> actions;
 
-       if(chrome)
-               cout<<"0 targets built\n";
        unsigned count=0;
 
        bool fail=false;
@@ -663,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;
@@ -676,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)
@@ -699,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;
 }

diff --git a/source/builder.h b/source/builder.h
index 270f8162d7af543acf1b6b694d0ba968f034963b..7036efd7238eea0891a5516a616eacf7619c9fa8 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -101,7 +101,7 @@ private:
        bool            dry_run;
        bool            help;
        unsigned        verbose;
-       bool            chrome;
+       bool            show_progress;
        std::string     build_file;
        unsigned        jobs;
        StringList      what_if;

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index aaea4e68c3002428bfd937778a7e694f601bcaf9..caedaf673c2d5a9ef6bc8b305f896bbb85da0d0d 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -218,6 +218,10 @@ void SourcePackage::create_build_info()
                if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
                        build_info.cflags.push_back("-DWITH_"+toupper(i->name));
 
+       for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
+               if(i->eval())
+                       build_info.add(i->get_build_info());
+
        build_info.unique();
 
        for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)