Adapt to changes in msppath

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index ee7eabfd1c9e93ff3913f510fb8e0ee09563cc7d..34c65af48be88df4d0be392b9735bad57472a3ea 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)
@@ -113,7 +113,7 @@ Builder::Builder(int argc, char **argv):
        if(!work_dir.empty())
                chdir(work_dir.c_str());
 
-       cwd=Path::getcwd();
+       cwd=getcwd();
 
        Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
        native_arch.set_tool("CC",  "gcc");
@@ -124,7 +124,7 @@ Builder::Builder(int argc, char **argv):
 
        const char *home=getenv("HOME");
        if(home)
-               load_build_file((Path::Path(home)/".builderrc").str());
+               load_build_file((Path(home)/".builderrc").str());
 }
 
 /**
@@ -145,6 +145,8 @@ Package *Builder::get_package(const string &n)
        argv.push_back("pkg-config");
        argv.push_back("--variable=source");
        argv.push_back(n);
+       if(verbose>=4)
+               cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
        string srcdir=strip(run_command(argv));
 
        PathList dirs;
@@ -210,12 +212,12 @@ Target *Builder::get_header(const string &include, const string &, const string
 
        string fn=include.substr(1);
        Target *tgt=0;
-       if(include[0]=='"' && (tgt=get_header(Path::Path(from)/fn)))
+       if(include[0]=='"' && (tgt=get_header(Path(from)/fn)))
                ;
-       else if((tgt=get_header(Path::Path("/usr/include")/fn)))
+       else if((tgt=get_header(Path("/usr/include")/fn)))
                ;
        //XXX Determine the C++ header location dynamically
-       else if((tgt=get_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
+       else if((tgt=get_header(Path("/usr/include/c++/4.1.2")/fn)))
                ;
        else
        {
@@ -426,8 +428,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"
@@ -442,7 +444,7 @@ Loads the given build file.
 
 @return  0 on success, -1 if the file could not be opened
 */
-int Builder::load_build_file(const Path::Path &fn)
+int Builder::load_build_file(const Path &fn)
 {
        ifstream in(fn.str().c_str());
        if(!in)
@@ -559,12 +561,12 @@ int Builder::create_targets()
 Check if a header exists, either as a target or a file.  Either an existing
 target or a new SystemHeader target will be returned.
 */
-Target *Builder::get_header(const Msp::Path::Path &fn)
+Target *Builder::get_header(const Msp::Path &fn)
 {
        Target *tgt=get_target(fn.str());
        if(tgt) return tgt;
 
-       if(Path::exists(fn))
+       if(exists(fn))
        {
                tgt=new SystemHeader(*this, fn.str());
                return tgt;
@@ -572,7 +574,7 @@ Target *Builder::get_header(const Msp::Path::Path &fn)
        return 0;
 }
 
-Target *Builder::get_library(const string &lib, const string &arch, const Path::Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const string &arch, const Path &path, LibMode mode)
 {
        // Populate a list of candidate filenames
        StringList candidates;
@@ -609,7 +611,7 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path::
                        else if(tgt)
                                return tgt;
                }
-               else if(Path::exists(full))
+               else if(exists(full))
                {
                        tgt=new SystemLibrary(*this, full);
                        return tgt;
@@ -646,8 +648,6 @@ int Builder::do_build()
 
        vector<Action *> actions;
 
-       if(chrome)
-               cout<<"0 targets built\n";
        unsigned count=0;
 
        bool fail=false;
@@ -663,6 +663,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 +682,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 +695,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;
 }
@@ -769,7 +769,7 @@ void Builder::package_help()
 Application::RegApp<Builder> Builder::reg;
 
 
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
+Builder::Loader::Loader(Builder &b, const Path &s):
        bld(b),
        src(s)
 {