Implement --dry-run
Add support for alternate build files (--file)
Implement --what-if for a single target
Change default behavior to be no build when analyzing and implement --build to override this
Hash the search paths for get_header and get_library
Add conf_all option
Make bootstrap.sh canonicalize library path
13 files changed:
+LIBPATH=`readlink -f $LIBPATH`
+
mkdir -p include/msp
sources=source/*.cpp
mkdir -p include/msp
sources=source/*.cpp
Builder::Builder(int argc, char **argv):
verbose(1),
cwd(Path::getcwd()),
Builder::Builder(int argc, char **argv):
verbose(1),
cwd(Path::getcwd()),
+ build_file("Build"),
+ do_build(true),
analyzer(0),
jobs(1),
chrome(false)
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('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('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));
int index=getopt(argc, argv);
getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE));
getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
int index=getopt(argc, argv);
if(getopt["max-depth"])
analyzer->set_max_depth(strtol(getopt["max-depth"].arg()));
analyzer->set_full_paths(getopt["full-paths"]);
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);
- if(getopt["chrome"])
- chrome=true;
+ chrome=getopt["chrome"];
if(getopt['C'])
chdir(getopt['C'].arg().c_str());
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]);
for(int i=index; i<argc; ++i)
{
string v(argv[i]);
if(cmdline_targets.empty())
cmdline_targets.push_back("default");
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;
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");
list<string> argv;
argv.push_back("pkg-config");
argv.push_back("--variable=source");
if(!srcdir.empty())
dirs.push_back(srcdir);
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);
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"))
{
for(PathList::iterator j=dirs.begin(); j!=dirs.end(); ++j)
if(!load_build_file(*j/"Build"))
{
return i->second;
break;
}
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));
if(pkg)
Package *pkg=Package::create(*this, n);
packages.insert(PackageMap::value_type(n, pkg));
if(pkg)
+/**
+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)
{
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;
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;
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)
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)
{
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";
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;
Target *tgt=get_target(full);
if(tgt) return tgt;
- if(load_build_file(cwd/"Build"))
+ if(load_build_file(cwd/build_file))
{
cerr<<"No build info here.\n";
return 1;
{
cerr<<"No build info here.\n";
return 1;
default_pkg=packages.begin()->second;
default_pkg=packages.begin()->second;
+ bool conf_all=cmdline_options.count("conf_all");
while(!new_pkgs.empty())
{
Package *pkg=new_pkgs.front();
while(!new_pkgs.empty())
{
Package *pkg=new_pkgs.front();
+ if(pkg==default_pkg || conf_all)
pkg->process_options(cmdline_options);
new_pkgs.erase(new_pkgs.begin());
pkg->resolve_refs();
pkg->process_options(cmdline_options);
new_pkgs.erase(new_pkgs.begin());
pkg->resolve_refs();
if(analyzer)
analyzer->analyze();
if(analyzer)
analyzer->analyze();
+ if(do_build)
+ build();
new_tgts.push_back(tgt);
}
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);
Target *cmdline=new VirtualTarget(*this, "cmdline");
add_target(cmdline);
world->add_depend(cmdline);
+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");
int Builder::build()
{
Target *cmdline=get_target("cmdline");
public:
Builder(int, char **);
unsigned get_verbose() const { return verbose; }
public:
Builder(int, char **);
unsigned get_verbose() const { return verbose; }
+ bool get_dry_run() const { return dry_run; }
Package *get_package(const std::string &);
Target *get_target(const std::string &);
Target *get_header(const std::string &, const std::string &, const std::list<std::string> &);
Package *get_package(const std::string &);
Target *get_target(const std::string &);
Target *get_header(const std::string &, const std::string &, const std::list<std::string> &);
ToolMap tools;
unsigned verbose;
Msp::Path::Path cwd;
ToolMap tools;
unsigned verbose;
Msp::Path::Path cwd;
+ Msp::Path::Path build_file;
+ bool do_build;
+ bool dry_run;
Analyzer *analyzer;
unsigned jobs;
std::list<std::string> what_if;
Analyzer *analyzer;
unsigned jobs;
std::list<std::string> what_if;
int create_targets();
Target *check_header(const Msp::Path::Path &);
void add_target(Target *);
int create_targets();
Target *check_header(const Msp::Path::Path &);
void add_target(Target *);
+ void update_hash(std::string &, const std::string &);
int build();
static Msp::Application::RegApp<Builder> reg;
int build();
static Msp::Application::RegApp<Builder> reg;
#include <msp/path/utils.h>
#include <msp/path/utils.h>
#include "buildinfo.h"
#include "compile.h"
#include "component.h"
#include "buildinfo.h"
#include "compile.h"
#include "component.h"
argv.push_back(object.str());
argv.push_back(source.str());
argv.push_back(object.str());
argv.push_back(source.str());
- Path::mkpath(object.subpath(0, object.size()-1), 0755);
+ if(!builder.get_dry_run())
+ Path::mkpath(object.subpath(0, object.size()-1), 0755);
announce(comp.get_package().get_name(), tool, relative(object.str(), comp.get_package().get_source()).str());
announce(comp.get_package().get_name(), tool, relative(object.str(), comp.get_package().get_source()).str());
Action(b),
src(s),
dest(d),
Action(b),
src(s),
dest(d),
- announce(pkg.get_name(), "INST", dest[-1]);
+ announce(pkg.get_name(), "COPY", dest[-1]);
if(builder.get_verbose()>=2)
cout<<s<<" -> "<<d<<'\n';
if(builder.get_verbose()>=2)
cout<<s<<" -> "<<d<<'\n';
+
+ if(!builder.get_dry_run())
+ worker=new Worker(*this);
+ if(!worker)
+ return 0;
+
+ if(worker->get_done())
- worker.join();
- return worker.get_error()?1:0;
+ worker->join();
+ return worker->get_error()?1:0;
+Copy::~Copy()
+{
+ delete worker;
+}
+
void Copy::Worker::main()
{
Path::mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);
void Copy::Worker::main()
{
Path::mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);
public:
Copy(Builder &, const Package &, const Msp::Path::Path &, const Msp::Path::Path &);
int check();
public:
Copy(Builder &, const Package &, const Msp::Path::Path &, const Msp::Path::Path &);
int check();
private:
class Worker: public Msp::Thread
{
private:
class Worker: public Msp::Thread
{
Msp::Path::Path src;
Msp::Path::Path dest;
Msp::Path::Path src;
Msp::Path::Path dest;
int ExternalAction::check()
{
int ExternalAction::check()
{
+ if(builder.get_dry_run())
+ {
+ signal_done.emit();
+ return 0;
+ }
+
{
signal_done.emit();
if(WIFEXITED(status))
{
signal_done.emit();
if(WIFEXITED(status))
- return WEXITSTATUS(status);
+ exit_code=WEXITSTATUS(status);
+ exit_code=254;
+ return exit_code;
- pid=fork();
- if(pid==0)
+ if(builder.get_dry_run())
+ pid=-1;
+ else
- char *argv_[argv.size()+1];
- for(CountingIterator<string, list<string>::iterator> i=argv.begin(); i!=argv.end(); ++i)
- argv_[i.count()]=strdup(i->c_str());
- argv_[argv.size()]=0;
- execvp(argv_[0], argv_);
- exit(1);
+ pid=fork();
+ if(pid==0)
+ {
+ char *argv_[argv.size()+1];
+ for(CountingIterator<string, list<string>::iterator> i=argv.begin(); i!=argv.end(); ++i)
+ argv_[i.count()]=strdup(i->c_str());
+ argv_[argv.size()]=0;
+ execvp(argv_[0], argv_);
+ exit(1);
+ }
+ else if(pid<0)
+ pid=0;
- else if(pid<0)
- pid=0;
protected:
std::list<std::string> argv;
int pid;
protected:
std::list<std::string> argv;
int pid;
- ExternalAction(Builder &b): Action(b) { }
+ ExternalAction(Builder &b): Action(b), pid(0), exit_code(0) { }
#include <msp/path/utils.h>
#include <msp/path/utils.h>
#include "component.h"
#include "executable.h"
#include "link.h"
#include "component.h"
#include "executable.h"
#include "link.h"
#include "package.h"
using namespace std;
#include "package.h"
using namespace std;
argv.push_back(exe.get_name());
const list<Target *> &deps=exe.get_depends();
for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
argv.push_back(exe.get_name());
const list<Target *> &deps=exe.get_depends();
for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
- argv.push_back((*i)->get_name());
+ if(dynamic_cast<ObjectFile *>(*i))
+ argv.push_back((*i)->get_name());
Path::Path epath=exe.get_name();
Path::Path epath=exe.get_name();
- Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
+ if(!builder.get_dry_run())
+ Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
announce(comp.get_package().get_name(), "LINK", relative(epath, comp.get_package().get_source()).str());
announce(comp.get_package().get_name(), "LINK", relative(epath, comp.get_package().get_source()).str());
using namespace std;
using namespace Msp;
using namespace std;
using namespace Msp;
-PackageRef::PackageRef(Builder &b, const string &n):
- builder(b),
- name(n),
- package(0)
-{ }
-
-Package *PackageRef::resolve()
-{
- if(!package)
- package=builder.get_package(name);
- return package;
-}
-
Package::Package(Builder &b, const string &n, const Path::Path &s):
builder(b),
name(n),
Package::Package(Builder &b, const string &n, const Path::Path &s):
builder(b),
name(n),
#include "buildinfo.h"
#include "component.h"
#include "config.h"
#include "buildinfo.h"
#include "component.h"
#include "config.h"
-class Package;
-
-class PackageRef
-{
-public:
- PackageRef(Builder &, const std::string &);
- const std::string &get_name() const { return name; }
- Package *get_package() const { return package; }
- Package *resolve();
-private:
- Builder &builder;
- std::string name;
- Package *package;
-};
--- /dev/null
+#include "builder.h"
+#include "package.h"
+#include "packageref.h"
+
+using namespace std;
+
+PackageRef::PackageRef(Builder &b, const string &n):
+ builder(b),
+ name(n),
+ package(0)
+{ }
+
+Package *PackageRef::resolve()
+{
+ if(!package)
+ package=builder.get_package(name);
+ return package;
+}
--- /dev/null
+#ifndef PACKAGEREF_H_
+#define PACKAGEREF_H_
+
+#include <string>
+
+class Builder;
+class Package;
+
+class PackageRef
+{
+public:
+ PackageRef(Builder &, const std::string &);
+ const std::string &get_name() const { return name; }
+ Package *get_package() const { return package; }
+ Package *resolve();
+private:
+ Builder &builder;
+ std::string name;
+ Package *package;
+};
+
+#endif