#include <fstream>
#include <iostream>
#include <set>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
#include <msp/core/getopt.h>
#include <msp/datafile/parser.h>
#include <msp/path/utils.h>
#include <msp/strings/formatter.h>
+#include <msp/strings/regex.h>
#include <msp/strings/utils.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
dry_run(false),
help(false),
verbose(1),
- chrome(false),
+ show_progress(false),
build_file("Build"),
jobs(1),
conf_all(false),
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);
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)
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");
const char *home=getenv("HOME");
if(home)
- load_build_file((Path::Path(home)/".builderrc").str());
+ load_build_file((Path(home)/".builderrc").str());
}
/**
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;
is not found but a file exists, a new SystemHeader target will be created and
returned.
*/
-Target *Builder::get_header(const string &include, const string &, const string &from, const list<string> &path)
+Target *Builder::get_header(const string &include, const string &arch, const string &from, const list<string> &path)
{
string hash(8, 0);
update_hash(hash, from);
if(i!=includes.end())
return i->second;
- string fn=include.substr(1);
- Target *tgt=0;
- if(include[0]=='"' && (tgt=get_header(Path::Path(from)/fn)))
- ;
- else if((tgt=get_header(Path::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
+ static string cxx_ver;
+ if(cxx_ver.empty())
{
- for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
- tgt=get_header(cwd/ *j/fn);
+ StringList argv;
+ argv.push_back(get_architecture(arch).get_tool("CXX"));
+ argv.push_back("--version");
+ cxx_ver=Regex(" ([0-9.]+) ").match(run_command(argv))[1].str;
+ while(!cxx_ver.empty() && !exists(Path("/usr/include/c++")/cxx_ver))
+ {
+ unsigned dot=cxx_ver.rfind('.');
+ if(dot==string::npos)
+ break;
+ cxx_ver.erase(dot);
+ }
+ if(verbose>=5)
+ cout<<"C++ version is "<<cxx_ver<<'\n';
}
+ string fn=include.substr(1);
+ if(verbose>=5)
+ cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
+
+ StringList syspath;
+ if(include[0]=='\"')
+ syspath.push_back(from);
+ if(arch=="native")
+ syspath.push_back("/usr/include");
+ else
+ syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/include");
+ syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
+
+ Target *tgt=0;
+ for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
+ tgt=get_header(cwd/ *j/fn);
+ for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_header(Path(*j)/fn);
+
includes.insert(TargetMap::value_type(id, tgt));
return tgt;
else
syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
+ if(verbose>=5)
+ cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
+
Target *tgt=0;
- for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
- tgt=get_library(lib, arch, *j, mode);
for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
tgt=get_library(lib, arch, cwd/ *j, mode);
+ for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_library(lib, arch, *j, mode);
libraries.insert(TargetMap::value_type(id, tgt));
problem(spkg->get_name(), format("wrong architecture (%s)", spkg->get_arch()));
}
- if(!problems.empty())
- {
- cerr<<"The following problems were detected:\n";
- for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
- cerr<<" "<<i->package<<": "<<i->descr<<'\n';
- cerr<<"Please fix them and try again.\n";
- return 1;
- }
-
if(conf_only)
return 0;
if(analyzer)
analyzer->analyze();
+ if(!problems.empty())
+ {
+ cerr<<"The following problems were detected:\n";
+ for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
+ cerr<<" "<<i->package<<": "<<i->descr<<'\n';
+ cerr<<"Please fix them and try again.\n";
+ return 1;
+ }
+
//if(create_makefile
if(clean)
" -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"
@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)
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;
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;
else if(tgt)
return tgt;
}
- else if(Path::exists(full))
+ else if(exists(full))
{
tgt=new SystemLibrary(*this, full);
return tgt;
vector<Action *> actions;
- if(chrome)
- cout<<"0 targets built\n";
unsigned count=0;
bool fail=false;
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;
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)
}
}
+ if(show_progress)
+ cout<<"\033[K";
if(fail)
cout<<"Build failed\n";
+ else if(show_progress)
+ cout<<"Build complete\n";
return fail?1:0;
}
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)
{
projects / builder.git / blobdiff