Builder::Builder(int argc, char **argv):
verbose(1),
cwd(Path::getcwd()),
+ build_file("Build"),
+ do_build(true),
analyzer(0),
jobs(1),
chrome(false)
getopt.add_option(GetOpt::Option('W', "what-if", GetOpt::REQUIRED));
getopt.add_option(GetOpt::Option('B', "build-all", GetOpt::NONE));
getopt.add_option(GetOpt::Option('C', "chdir", GetOpt::REQUIRED));
- getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED));
+ getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED, "1"));
getopt.add_option(GetOpt::Option('h', "help", GetOpt::NONE));
getopt.add_option(GetOpt::Option('c', "clean", GetOpt::NONE));
+ getopt.add_option(GetOpt::Option('f', "file", GetOpt::REQUIRED, "Build"));
getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE));
getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
+ getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE));
int index=getopt(argc, argv);
verbose+=getopt['v'].count();
if(getopt["max-depth"])
analyzer->set_max_depth(strtol(getopt["max-depth"].arg()));
analyzer->set_full_paths(getopt["full-paths"]);
+
+ if(!getopt['b'])
+ do_build=false;
}
- if(getopt['j'])
- jobs=max(strtol(getopt['j'].arg()), 1L);
+ dry_run=getopt['n'];
+
+ jobs=max(strtol(getopt['j'].arg()), 1L);
+
+ chrome=getopt["chrome"];
- if(getopt["chrome"])
- chrome=true;
+ conf_all=getopt['A'];
if(getopt['C'])
chdir(getopt['C'].arg().c_str());
+ build_file=getopt['f'].arg();
+
for(int i=index; i<argc; ++i)
{
string v(argv[i]);
if(cmdline_targets.empty())
cmdline_targets.push_back("default");
+
+ if(getopt['W'])
+ what_if.push_back(getopt['W'].arg());
}
/**
if(i!=packages.end())
return i->second;
+ // Try to get source directory with pkgconfig
list<string> argv;
argv.push_back("pkg-config");
argv.push_back("--variable=source");
if(!srcdir.empty())
dirs.push_back(srcdir);
+ // Make some other guesses about the source directory
string dirname=n;
if(!dirname.compare(0, 3, "msp"))
dirname.erase(0, 3);
dirs.push_back(cwd/dirname);
dirs.push_back(cwd/".."/dirname);
+ // Go through the candidate directories and look for a Build file
for(PathList::iterator j=dirs.begin(); j!=dirs.end(); ++j)
if(!load_build_file(*j/"Build"))
{
return i->second;
break;
}
-
+
+ // Package source not found - create a binary package
Package *pkg=Package::create(*this, n);
packages.insert(PackageMap::value_type(n, pkg));
- new_pkgs.push_back(pkg);
+ if(pkg)
+ new_pkgs.push_back(pkg);
return pkg;
}
return 0;
}
+/**
+Tries to locate a header included from a given location and with a given include
+path. Considers known targets as well as existing files.
+*/
Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
{
- //XXX Should really hash the include path here
- string id=from+":"+include;
+ string hash(8, 0);
+ update_hash(hash, from);
+ for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
+ update_hash(hash, *i);
+
+ string id=hash+include;
TargetMap::iterator i=includes.find(id);
if(i!=includes.end())
return i->second;
return tgt;
if((tgt=check_header(Path::Path("/usr/include")/fn)))
return tgt;
+ //XXX Determine the C++ header location dynamically
if((tgt=check_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
return tgt;
for(list<string>::const_iterator j=path.begin(); j!=path.end(); ++j)
{
string hash(8, 0);
for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
- for(unsigned j=0; j<i->size(); ++j)
- hash[j%8]^=(*i)[j];
+ update_hash(hash, *i);
+
+ string id=hash+lib;
+ TargetMap::iterator i=libraries.find(id);
+ if(i!=libraries.end())
+ return i->second;
string basename="lib"+lib+".so";
- for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
+ for(list<string>::const_iterator j=path.begin(); j!=path.end(); ++j)
{
- string full=(Path::Path(*i)/basename).str();
+ string full=(Path::Path(*j)/basename).str();
Target *tgt=get_target(full);
if(tgt) return tgt;
int Builder::main()
{
- if(load_build_file(cwd/"Build"))
+ if(load_build_file(cwd/build_file))
{
cerr<<"No build info here.\n";
return 1;
while(!new_pkgs.empty())
{
Package *pkg=new_pkgs.front();
- if(pkg==default_pkg)
+ if(pkg==default_pkg || conf_all)
pkg->process_options(cmdline_options);
new_pkgs.erase(new_pkgs.begin());
pkg->resolve_refs();
std::list<std::string> missing;
for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
- {
- const list<PackageRef> &requires=i->second->get_requires();
- for(list<PackageRef>::const_iterator j=requires.begin(); j!=requires.end(); ++j)
- if(!j->get_package())
- missing.push_back(j->get_name());
- }
+ if(!i->second)
+ missing.push_back(i->first);
if(!missing.empty())
{
missing.sort();
- missing.unique();
cerr<<"The following packages were not found on the system:\n";
for(list<string>::iterator i=missing.begin(); i!=missing.end(); ++i)
cerr<<" "<<*i<<'\n';
if(analyzer)
analyzer->analyze();
- build();
+ if(do_build)
+ build();
return exit_code;
}
if(!i->second->get_buildable())
continue;
+ Path::Path inst_base;
+ if(i->second->get_config().is_option("prefix"))
+ inst_base=i->second->get_config().get_option("prefix").value;
+
const ComponentList &components=i->second->get_components();
for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
{
const PathList &sources=j->get_sources();
for(PathList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
{
- list<string> sfiles=list_files(*k);
- for(list<string>::iterator l=sfiles.begin(); l!=sfiles.end(); ++l)
- files.push_back(*k / *l);
+ struct stat st;
+ stat(*k, st);
+ if(S_ISDIR(st.st_mode))
+ {
+ list<string> sfiles=list_files(*k);
+ for(list<string>::iterator l=sfiles.begin(); l!=sfiles.end(); ++l)
+ files.push_back(*k / *l);
+ }
+ else
+ files.push_back(*k);
}
- Path::Path inst_base=i->second->get_config().get_option("prefix").value;
-
bool build_exe=j->get_type()!=Component::HEADERS;
list<ObjectFile *> objs;
new_tgts.push_back(tgt);
}
+ for(list<string>::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+ {
+ Target *tgt=get_target((cwd/ *i).str());
+ if(!tgt)
+ {
+ cerr<<"Unknown what-if target "<<*i<<'\n';
+ return -1;
+ }
+ tgt->touch();
+ }
+
Target *cmdline=new VirtualTarget(*this, "cmdline");
add_target(cmdline);
world->add_depend(cmdline);
new_tgts.push_back(t);
}
+void Builder::update_hash(string &hash, const string &value)
+{
+ for(unsigned i=0; i<value.size(); ++i)
+ hash[i%hash.size()]^=value[i];
+}
+
+/**
+This function supervises the build process, starting new actions when slots
+become available.
+*/
int Builder::build()
{
Target *cmdline=get_target("cmdline");
vector<Action *> actions;
- //ProgressBar *progress=0;
if(chrome)
- {
- //progress=new ProgressBar(cout, total);
cout<<"0 targets built\n";
- }
unsigned count=0;
bool fail=false;
Target *tgt=cmdline->get_buildable_target();
if(tgt)
{
- /*if(chrome)
- {
- cout<<"\e["<<actions.size()+1<<'A';
- //progress->set(count);
- cout<<"\e["<<actions.size()+1<<'B';
- }*/
Action *action=tgt->build();
if(action)
actions.push_back(action);
}
}
- //delete progress;
-
return fail?-1:0;
}
projects / builder.git / blobdiff