X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=7825a20c85dbd091a845e232ac3a1a7764e6c08f;hb=57bdb055acb0453c75b22cb64f35cc0e817a2827;hp=05ecf877c7f47265131491fa50f0e00189015c1d;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 05ecf87..7825a20 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,77 +1,161 @@
 #include <fstream>
+#include <iostream>
+#include <msp/progress.h>
+#include <msp/strconv.h>
 #include <msp/strutils.h>
+#include <msp/core/error.h>
+#include <msp/getopt++/getopt++.h>
 #include <msp/parser/parser.h>
 #include <msp/path/utils.h>
 #include <msp/time/units.h>
+#include <msp/time/utils.h>
 #include "action.h"
+#include "analyzer.h"
 #include "builder.h"
 #include "executable.h"
 #include "header.h"
+#include "install.h"
 #include "misc.h"
 #include "objectfile.h"
 #include "package.h"
+#include "pkgconfig.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
+#include "systemlibrary.h"
 #include "virtualtarget.h"
 
 using namespace std;
 using namespace Msp;
 
 Builder::Builder(int argc, char **argv):
+	analyzer(0),
+	do_build(false),
 	verbose(1),
-	cwd(Path::getcwd())
+	chrome(false),
+	build_file("Build"),
+	jobs(1)
 {
-	for(int i=1; i<argc; ++i)
+	string   analyze_mode;
+	string   work_dir;
+	bool     full_paths=false;
+	unsigned max_depth=5;
+	
+	GetOpt getopt;
+	getopt.add_option('a', "analyze",    analyze_mode, GetOpt::REQUIRED_ARG);
+	getopt.add_option('b', "build",      do_build,     GetOpt::NO_ARG);
+//	getopt.add_option('c', "clean",      clean,        GetOpt::NO_ARG);
+	getopt.add_option('f', "file",       build_file,   GetOpt::REQUIRED_ARG);
+	getopt.add_option('h', "help",       help,         GetOpt::NO_ARG);
+	getopt.add_option('j', "jobs",       jobs,         GetOpt::REQUIRED_ARG);
+	getopt.add_option('n', "dry-run",    dry_run,      GetOpt::NO_ARG);
+	getopt.add_option('v', "verbose",    verbose,      GetOpt::NO_ARG);
+	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('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(     "max-depth",  max_depth,    GetOpt::REQUIRED_ARG);
+	getopt(argc, argv);
+
+	if(!analyze_mode.empty())
 	{
-		string v(argv[i]);
-		unsigned equal=v.find('=');
+		analyzer=new Analyzer(*this);
+
+		if(analyze_mode=="deps")
+			analyzer->set_mode(Analyzer::DEPS);
+		else if(analyze_mode=="alldeps")
+			analyzer->set_mode(Analyzer::ALLDEPS);
+		else if(analyze_mode=="rebuild")
+			analyzer->set_mode(Analyzer::REBUILD);
+		else if(analyze_mode=="rdeps")
+			analyzer->set_mode(Analyzer::RDEPS);
+		else
+			throw UsageError("Invalid analyze mode");
+
+		analyzer->set_max_depth(max_depth);
+		analyzer->set_full_paths(full_paths);
+	}
+	else
+		do_build=true;
+
+	const list<string> &args=getopt.get_args();
+	for(list<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
+	{
+		unsigned equal=i->find('=');
 		if(equal!=string::npos)
-			cmdline_options.insert(RawOptionMap::value_type(v.substr(0, equal), v.substr(equal+1)));
+			cmdline_options.insert(RawOptionMap::value_type(i->substr(0, equal), i->substr(equal+1)));
 		else
-			cmdline_targets.push_back(argv[i]);
+			cmdline_targets.push_back(*i);
 	}
 
 	if(cmdline_targets.empty())
 		cmdline_targets.push_back("default");
+
+	if(!work_dir.empty())
+		chdir(work_dir.c_str());
+
+	cwd=Path::getcwd();
+
+	archs.insert(StringMap::value_type("native", ""));
+	archs.insert(StringMap::value_type("arm", "arm-linux-gnu-"));
+	archs.insert(StringMap::value_type("win32", "i586-mingw32msvc-"));
 }
 
+/**
+Gets a package with the specified name, possibly creating it.
+
+@param   n  Package name
+
+@return  Pointer to the package, or 0 if the package could not be located
+*/
 Package *Builder::get_package(const string &n)
 {
 	PackageMap::iterator i=packages.find(n);
 	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");
 	argv.push_back(n);
 	string srcdir=strip(run_command(argv));
-	cout<<srcdir;
 	
-	list<Path::Path> dirs;
+	PathList dirs;
 	if(!srcdir.empty())
 		dirs.push_back(srcdir);
 
+	// Make some other guesses about the source directory
 	string dirname=n;
-	if(dirname.compare(0, 3, "msp"))
+	if(!dirname.compare(0, 3, "msp"))
 		dirname.erase(0, 3);
 	dirs.push_back(cwd/dirname);
 	dirs.push_back(cwd/".."/dirname);
 
-	for(list<Path::Path>::iterator j=dirs.begin(); j!=dirs.end(); ++j)
+	// 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"))
 		{
 			i=packages.find(n);
 			if(i!=packages.end())
 				return i->second;
-			return 0;
+			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;
 }
 
+/**
+Returns the target with the given name, or 0 if no such target exists.
+*/
 Target *Builder::get_target(const string &n)
 {
 	TargetMap::iterator i=targets.find(n);
@@ -80,31 +164,95 @@ Target *Builder::get_target(const string &n)
 	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.  If a matching target
+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 &from, const list<string> &path)
 {
-	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;
 
 	string fn=include.substr(1);
-	Target *tgt;
-	if(include[0]=='"' && (tgt=check_header(Path::Path(from)/fn)))
-		return tgt;
-	if((tgt=check_header(Path::Path("/usr/include")/fn)))
-		return tgt;
-	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(*j)/fn)))
-			return tgt;
+	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
+	{
+		for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
+			tgt=get_header(cwd/ *j/fn);
+	}
+
+	includes.insert(TargetMap::value_type(id, tgt));
 	
-	return 0;
+	return tgt;
+}
+
+/**
+Tries to locate a library with the given library path.  Considers known targets
+as well as existing files.  If a matching target is not found but a file exists,
+a new SystemLibrary target will be created and returned.
+
+@param   lib   Name of the library to get (without "lib" prefix or extension)
+@param   path  List of paths to search for the library
+@param   mode  Shared / static mode
+
+@return  Some kind of library target, if a match was found
+*/
+Target *Builder::get_library(const string &lib, const list<string> &path, LibMode mode)
+{
+	string hash(8, 0);
+	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
+		update_hash(hash, *i);
+
+	//XXX Incorporate mode into id
+	string id=hash+lib;
+	TargetMap::iterator i=libraries.find(id);
+	if(i!=libraries.end())
+		return i->second;
+
+	Target *tgt=0;
+	if((tgt=get_library(lib, "/lib", mode)))
+		;
+	else if((tgt=get_library(lib, "/usr/lib", mode)))
+		;
+	else
+	{
+		for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
+			tgt=get_library(lib, cwd/ *j, mode);
+	}
+
+	libraries.insert(TargetMap::value_type(id, tgt));
+
+	return tgt;
+}
+
+const string &Builder::get_arch_prefix(const string &arch) const
+{
+	StringMap::const_iterator i=archs.find(arch);
+	if(i==archs.end())
+		throw InvalidParameterValue("Unknown architecture");
+
+	return i->second;
 }
 
 int Builder::main()
 {
-	if(load_build_file("Build"))
+	if(load_build_file(cwd/build_file))
 	{
 		cerr<<"No build info here.\n";
 		return 1;
@@ -119,49 +267,128 @@ int Builder::main()
 		pkg->resolve_refs();
 	}
 
-	std::list<std::string> missing;
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+	default_pkg->configure(cmdline_options, conf_all?2:1);
+
+	if(help)
 	{
-		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());
+		usage(0, "builder", false);
+		cout<<'\n';
+		package_help();
+		return 0;
 	}
 
-	if(!missing.empty())
+	StringMap problems;
+	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
 	{
-		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';
-		cerr<<"Please install them and try again.\n";
+		string prob;
+		if(!i->second)
+			prob="missing";
+		else if(i->second->get_buildable() && i->second->get_arch()!=default_pkg->get_arch())
+			prob="wrong architecture ("+i->second->get_arch()+")";
+		if(!prob.empty())
+			problems.insert(StringMap::value_type(i->first, prob));
 	}
 
-	default_pkg->create_build_info();
-
-	cout<<"Active packages:";
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+	if(!problems.empty())
 	{
-		cout<<' '<<i->second->get_name();
-		if(i->second->get_buildable())
-			cout<<'*';
+		cerr<<"The following problems were detected:\n";
+		for(StringMap::iterator i=problems.begin(); i!=problems.end(); ++i)
+			cerr<<"  "<<i->first<<": "<<i->second<<'\n';
+		cerr<<"Please fix them and try again.\n";
+		return 1;
 	}
-	cout<<'\n';
-	
+
+	if(conf_only)
+		return 0;
+
 	if(create_targets())
 		return 1;
 
-	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-		cout<<i->second->get_name()<<' '<<i->second->get_type()<<' '<<i->second->get_rebuild()<<' '<<i->second->get_rebuild_reason()<<'\n';
+	cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
+	if(verbose>=2)
+	{
+		for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+		{
+			cout<<' '<<i->second->get_name();
+			if(i->second->get_buildable())
+				cout<<'*';
+			unsigned count=0;
+			unsigned ood_count=0;
+			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
+				if(j->second->get_package()==i->second)
+				{
+					++count;
+					if(j->second->get_rebuild())
+						++ood_count;
+				}
+			if(count)
+			{
+				cout<<" ("<<count<<" targets";
+				if(ood_count)
+					cout<<", "<<ood_count<<" out-of-date";
+				cout<<')';
+			}
+			cout<<'\n';
+		}
+	}
 
-	cout<<"Active targets: "<<targets.size()<<'\n';
+	if(analyzer)
+		analyzer->analyze();
 
-	build();
+	if(do_build)
+		build();
 
 	return exit_code;
 }
 
+Builder::~Builder()
+{
+	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+		delete i->second;
+	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+		delete i->second;
+	delete analyzer;
+}
+
+void Builder::usage(const char *reason, const char *argv0, bool brief)
+{
+	if(reason)
+		cerr<<reason<<'\n';
+	
+	if(brief)
+		cerr<<"Usage: "<<argv0<<" [-a|--analyze MODE] [-b|--build] [-c|--clean] [-f|--file FILE] [-h|--help] [-j|--jobs NUM] [-n||--dry-run] [-v|--verbose] [-A|--conf-all] [-B|--build-all] [-C|--chdir DIRECTORY] [-W|--what-if FILE] [--chrome] [--conf-only] [--full-paths] [--max-depth NUM] [<target> ...]";
+	else
+	{
+		cerr<<
+			"Usage: "<<argv0<<" [options] [<target> ...]\n"
+			"\n"
+			"Options:\n"
+			"  -a, --analyze MODE  Perform analysis.  MODE can be deps, alldeps or rebuild.\n"
+			"  -b, --build         Perform build even if doing analysis.\n"
+			"  -c, --clean         Clean buildable targets.\n"
+			"  -f, --file FILE     Read info from FILE instead of Build.\n"
+			"  -h, --help          Print this message.\n"
+			"  -j, --jobs NUM      Run NUM commands at once, whenever possible.\n"
+			"  -n, --dry-run       Don't actually do anything, only show what would be done.\n"
+			"  -v, --verbose       Print more information about what's going on.\n"
+			"  -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"
+			"  -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"
+			"  --max-depth NUM     Maximum depth to show in analysis.\n";
+	}
+}
+
+/**
+Loads the given build file.
+
+@param   fn  Path to the file
+
+@return  0 on success, -1 if the file could not be opened
+*/
 int Builder::load_build_file(const Path::Path &fn)
 {
 	ifstream in(fn.str().c_str());
@@ -169,12 +396,18 @@ int Builder::load_build_file(const Path::Path &fn)
 		return -1;
 
 	Parser::Parser parser(in, fn.str());
-	Loader loader(*this, cwd/fn.subpath(0, fn.size()-1));
+	Loader loader(*this, fn.subpath(0, fn.size()-1));
 	loader.load(parser);
 
 	return 0;
 }
 
+/**
+Creates targets for all packages and prepares them for building.
+
+@return  0 if everything went ok, -1 if something bad happened and a build
+         shouldn't be attempted
+*/
 int Builder::create_targets()
 {
 	Target *world=new VirtualTarget(*this, "world");
@@ -184,51 +417,160 @@ int Builder::create_targets()
 	add_target(def_tgt);
 	world->add_depend(def_tgt);
 
+	Target *install=new VirtualTarget(*this, "install");
+	add_target(install);
+	world->add_depend(install);
+
 	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
 	{
+		if(!i->second)
+			continue;
 		if(!i->second->get_buildable())
 			continue;
 
+		Path::Path inst_base;
+		if(i->second->get_buildable())
+			inst_base=i->second->get_prefix();
+
 		const ComponentList &components=i->second->get_components();
 		for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
 		{
-			Path::Path base=i->second->get_source()/j->get_source();
-			list<string> files=list_files(base);
+			// Collect all files belonging to the component
+			PathList files;
+			const PathList &sources=j->get_sources();
+			for(PathList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
+			{
+				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);
+			}
 
+			bool build_exe=j->get_type()!=Component::HEADERS;
+			
 			list<ObjectFile *> objs;
-			for(list<string>::iterator k=files.begin(); k!=files.end(); ++k)
+			for(PathList::iterator k=files.begin(); k!=files.end(); ++k)
 			{
-				Path::Path fn=base/ *k;
-				string ext=Path::splitext(*k).ext;
-				if(ext==".cpp" || ext==".c")
+				string basename=(*k)[-1];
+				string ext=Path::splitext(basename).ext;
+				if((ext==".cpp" || ext==".c") && build_exe)
 				{
-					SourceFile *src=new SourceFile(*this, &*j, fn.str());
+					SourceFile *src=new SourceFile(*this, &*j, k->str());
 					add_target(src);
-					
+
+					// Compile sources
 					ObjectFile *obj=new ObjectFile(*this, *j, *src);
 					add_target(obj);
 					objs.push_back(obj);
 				}
 				else if(ext==".h")
-					add_target(new Header(*this, &*j, fn.str()));
+				{
+					Target *hdr=get_target(k->str());
+					if(!hdr)
+					{
+						hdr=new Header(*this, &*j, k->str());
+						add_target(hdr);
+					}
+
+					// Install headers if requested
+					if(!j->get_install_headers().empty())
+					{
+						Path::Path inst_path=inst_base/"include"/j->get_install_headers()/basename;
+						Install *inst=new Install(*this, *i->second, *hdr, inst_path.str());
+						add_target(inst);
+						install->add_depend(inst);
+					}
+				}
 			}
 
-			Executable *exe=new Executable(*this, *j, objs);
-			add_target(exe);
-			if(i->second==default_pkg)
-				def_tgt->add_depend(exe);
-			else
-				world->add_depend(exe);
+			if(build_exe)
+			{
+				Executable    *exe=0;
+				StaticLibrary *slib=0;
+				if(j->get_type()==Component::LIBRARY)
+				{
+					exe=new SharedLibrary(*this, *j, objs);
+					slib=new StaticLibrary(*this, *j, objs);
+					add_target(slib);
+				}
+				else
+					exe=new Executable(*this, *j, objs);
+				
+				add_target(exe);
+				if(i->second==default_pkg)
+				{
+					def_tgt->add_depend(exe);
+					if(slib) def_tgt->add_depend(slib);
+				}
+				else
+				{
+					world->add_depend(exe);
+					if(slib) world->add_depend(slib);
+				}
+
+				if(j->get_install())
+				{
+					string inst_dir;
+					if(j->get_type()==Component::PROGRAM)
+						inst_dir="bin";
+					else if(j->get_type()==Component::LIBRARY)
+						inst_dir="lib";
+					if(!inst_dir.empty())
+					{
+						Install *inst=new Install(*this, *i->second, *exe, (inst_base/inst_dir/Path::basename(exe->get_name())).str());
+						add_target(inst);
+						install->add_depend(inst);
+
+						if(slib)
+						{
+							inst=new Install(*this, *i->second, *slib, (inst_base/inst_dir/Path::basename(slib->get_name())).str());
+							add_target(inst);
+							install->add_depend(inst);
+						}
+					}
+				}
+			}
+		}
+
+		if(i->second->get_install_flags()&(Package::LIB|Package::INCLUDE))
+		{
+			PkgConfig *pc=new PkgConfig(*this, *i->second);
+			add_target(pc);
+			Install *inst=new Install(*this, *i->second, *pc, (inst_base/"lib"/"pkgconfig"/Path::basename(pc->get_name())).str());
+			add_target(inst);
+			install->add_depend(inst);
 		}
 	}
 
+	// Find dependencies until no new targets are created
 	while(!new_tgts.empty())
 	{
 		Target *tgt=new_tgts.front();
 		new_tgts.erase(new_tgts.begin());
 		tgt->find_depends();
+		if(!tgt->get_depends_ready())
+			new_tgts.push_back(tgt);
+	}
+
+	// Apply what-ifs
+	for(StringList::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();
 	}
 
+	// Make the cmdline target depend on all targets mentioned on the command line
 	Target *cmdline=new VirtualTarget(*this, "cmdline");
 	add_target(cmdline);
 	world->add_depend(cmdline);
@@ -240,7 +582,7 @@ int Builder::create_targets()
 		if(!tgt)
 		{
 			cerr<<"I don't know anything about "<<*i<<'\n';
-			return 1;
+			return -1;
 		}
 		cmdline->add_depend(tgt);
 	}
@@ -250,7 +592,11 @@ int Builder::create_targets()
 	return 0;
 }
 
-Target *Builder::check_header(const Msp::Path::Path &fn)
+/**
+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 *tgt=get_target(fn.str());
 	if(tgt) return tgt;
@@ -263,48 +609,151 @@ Target *Builder::check_header(const Msp::Path::Path &fn)
 	return 0;
 }
 
+Target *Builder::get_library(const string &lib, const Path::Path &path, LibMode mode)
+{
+	string full;
+	if(mode!=DYNAMIC)
+	{
+		full=(path/("lib"+lib+".a")).str();
+		Target *tgt=get_target(full);
+		// Targets can only be associated with buildable packages (or no package at all)
+		if(tgt && (tgt->get_package() || mode==ALL_STATIC)) return tgt;
+	}
+	if(mode!=ALL_STATIC)
+	{
+		full=(path/("lib"+lib+".so")).str();
+		Target *tgt=get_target(full);
+		if(tgt) return tgt;
+	}
+
+	if(Path::exists(full))
+	{
+		Target *tgt=new SystemLibrary(*this, full);
+		add_target(tgt);
+		return tgt;
+	}
+
+	return 0;
+}
+
+/**
+Adds a target to both the target map and the new target queue.
+*/
 void Builder::add_target(Target *t)
 {
 	targets.insert(TargetMap::value_type(t->get_name(), t));
 	new_tgts.push_back(t);
 }
 
+/**
+Updates a hash with a string.  This is used from get_header and get_library.
+*/
+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");
-	list<Action *> actions;
+
+	unsigned total=cmdline->count_rebuild();
+	if(!total)
+	{
+		cout<<"Already up to date\n";
+		return 0;
+	}
+	cout<<"Will build "<<total<<" target(s)\n";
+
+	vector<Action *> actions;
+
+	if(chrome)
+		cout<<"0 targets built\n";
+	unsigned count=0;
+
 	bool fail=false;
+	bool finish=false;
 
-	while(cmdline->get_rebuild() && !fail)
+	while(!finish)
 	{
-		if(actions.empty() && !fail)
+		if(actions.size()<jobs && !fail)
 		{
 			Target *tgt=cmdline->get_buildable_target();
 			if(tgt)
 			{
-				cout<<"Build "<<tgt->get_name()<<'\n';
 				Action *action=tgt->build();
 				if(action)
 					actions.push_back(action);
 			}
+			else if(actions.empty())
+				finish=true;
 		}
 		else
-			sleep(10*Time::msec);
+			Time::sleep(10*Time::msec);
 
-		for(list<Action *>::iterator i=actions.begin(); i!=actions.end();)
+		for(unsigned i=0; i<actions.size();)
 		{
-			int status=(*i)->check();
+			int status=actions[i]->check();
 			if(status>=0)
 			{
-				delete *i;
-				i=actions.erase(i);
+				++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)
 					fail=true;
+				if(actions.empty() && fail)
+					finish=true;
 			}
+			else
+				++i;
 		}
 	}
 
-	return 0;
+	if(fail)
+		cout<<"Build failed\n";
+
+	return fail?-1:0;
+}
+
+/**
+Prints out information about the default package.
+*/
+void Builder::package_help()
+{
+	const Config &config=default_pkg->get_config();
+	const Config::OptionMap &options=config.get_options();
+
+	cout<<"Required packages:\n  ";
+	const PkgRefList &requires=default_pkg->get_requires();
+	for(PkgRefList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+	{
+		if(i!=requires.begin())
+			cout<<", ";
+		cout<<i->get_name();
+	}
+	cout<<"\n\n";
+	cout<<"Package configuration:\n";
+	for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
+	{
+		const Config::Option &opt=i->second;
+		cout<<"  "<<opt.name<<": "<<opt.descr<<" ("<<opt.value<<") ["<<opt.defv<<"]\n";
+	}
 }
 
 Application::RegApp<Builder> Builder::reg;
@@ -322,6 +771,5 @@ void Builder::Loader::package(const string &n)
 	load_sub(*pkg);
 	bld.packages.insert(PackageMap::value_type(n, pkg));
 	bld.new_pkgs.push_back(pkg);
-	//cout<<"loaded "<<pkg->get_name()<<'\n';
 }