]> git.tdb.fi Git - builder.git/blobdiff - source/builder.cpp
Add DependencyCache to speed up build preparation
[builder.git] / source / builder.cpp
index 5a1d624390fa45250bab4451b3196693d5d46dc9..353bc29a74588945142b29b536bfa17e201ec1e7 100644 (file)
@@ -1,26 +1,32 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <fstream>
 #include <iostream>
-#include <msp/progress.h>
-#include <msp/strconv.h>
-#include <msp/strutils.h>
+#include <set>
 #include <msp/core/error.h>
-#include <msp/getopt++/getopt++.h>
-#include <msp/parser/parser.h>
+#include <msp/core/getopt.h>
+#include <msp/datafile/parser.h>
 #include <msp/path/utils.h>
+#include <msp/strings/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 "tarball.h"
+#include "unlink.h"
 #include "virtualtarget.h"
 
 using namespace std;
@@ -28,84 +34,112 @@ using namespace Msp;
 
 Builder::Builder(int argc, char **argv):
        analyzer(0),
-       do_build(true),
+       build(false),
+       clean(0),
+       dry_run(false),
+       help(false),
        verbose(1),
        chrome(false),
        build_file("Build"),
-       jobs(1)
+       jobs(1),
+       conf_all(false),
+       conf_only(false),
+       build_all(false),
+       create_makefile(false)
 {
+       string   analyze_mode;
+       string   work_dir;
+       bool     full_paths=false;
+       unsigned max_depth=5;
+
        GetOpt getopt;
-       getopt.add_option(GetOpt::Option('a', "analyze", GetOpt::REQUIRED));
-       getopt.add_option(GetOpt::Option('b', "build", 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('h', "help", GetOpt::NONE));
-       getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED, "1"));
-       getopt.add_option(GetOpt::Option('n', "dry-run", GetOpt::NONE));
-       getopt.add_option(GetOpt::Option('v', "verbose", GetOpt::NONE));
-       getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE));
-       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("chrome", GetOpt::NONE));
-       getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
-       getopt.add_option(GetOpt::Option("max-depth", GetOpt::REQUIRED));
-       int index=getopt(argc, argv);
-
-       verbose+=getopt['v'].count();
-
-       if(getopt['a'])
+       getopt.add_option('a', "analyze",    analyze_mode, GetOpt::REQUIRED_ARG);
+       getopt.add_option('b', "build",      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(     "makefile",   create_makefile, GetOpt::NO_ARG);
+       getopt.add_option(     "max-depth",  max_depth,    GetOpt::REQUIRED_ARG);
+       getopt(argc, argv);
+
+       if(!analyze_mode.empty())
        {
                analyzer=new Analyzer(*this);
 
-               string mode=getopt['a'].arg();
-               if(mode=="deps")
+               if(analyze_mode=="deps")
                        analyzer->set_mode(Analyzer::DEPS);
-               else if(mode=="alldeps")
+               else if(analyze_mode=="alldeps")
                        analyzer->set_mode(Analyzer::ALLDEPS);
-               else if(mode=="rebuild")
+               else if(analyze_mode=="rebuild")
                        analyzer->set_mode(Analyzer::REBUILD);
-               else if(mode=="rdeps")
+               else if(analyze_mode=="rdeps")
                        analyzer->set_mode(Analyzer::RDEPS);
                else
-                       throw UsageError("Invalid analysis mode");
-
-               if(getopt["max-depth"])
-                       analyzer->set_max_depth(strtol(getopt["max-depth"].arg()));
-               analyzer->set_full_paths(getopt["full-paths"]);
+                       throw UsageError("Invalid analyze mode");
 
-               if(!getopt['b'])
-                       do_build=false;
+               analyzer->set_max_depth(max_depth);
+               analyzer->set_full_paths(full_paths);
        }
+       else if(!clean && !create_makefile)
+               build=true;
 
-       dry_run=getopt['n'];
-       jobs=max(strtol(getopt['j'].arg()), 1L);
-       chrome=getopt["chrome"];
-       conf_all=getopt['A'];
-       build_file=getopt['f'].arg();
-       build_all=getopt['B'];
-       help=getopt['h'];
-
-       if(getopt['C'])
-               chdir(getopt['C'].arg().c_str());
-
-       for(int i=index; i<argc; ++i)
+       const list<string> &args=getopt.get_args();
+       for(list<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
        {
-               string v(argv[i]);
-               unsigned equal=v.find('=');
+               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(StringMap::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(getopt['W'])
-               what_if.push_back(getopt['W'].arg());
+       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"));
+
+       StringMap &native_tools=tools.insert(ToolMap::value_type("native", StringMap())).first->second;
+       native_tools.insert(StringMap::value_type("CC",   "gcc"));
+       native_tools.insert(StringMap::value_type("CXX",  "g++"));
+       native_tools.insert(StringMap::value_type("LD",   "gcc"));
+       native_tools.insert(StringMap::value_type("LDXX", "g++"));
+       native_tools.insert(StringMap::value_type("AR",   "ar"));
+
+       StringMap &release_profile=profile_tmpl.insert(ProfileTemplateMap::value_type("release", StringMap())).first->second;
+       release_profile.insert(StringMap::value_type("optimize", "3"));
+       release_profile.insert(StringMap::value_type("outdir",   "$profile"));
+
+       StringMap &debug_profile=profile_tmpl.insert(ProfileTemplateMap::value_type("debug", StringMap())).first->second;
+       debug_profile.insert(StringMap::value_type("debug",  "1"));
+       debug_profile.insert(StringMap::value_type("outdir", "$profile"));
+
+       for(StringMap::iterator i=archs.begin(); i!=archs.end(); ++i)
+       {
+               if(i->first=="native")
+                       continue;
+
+               StringMap &arch_profile=profile_tmpl.insert(ProfileTemplateMap::value_type(i->first, StringMap())).first->second;
+               arch_profile.insert(StringMap::value_type("arch",   i->first));
+               arch_profile.insert(StringMap::value_type("prefix", "$HOME/local/$arch"));
+               arch_profile.insert(StringMap::value_type("outdir", "$profile"));
+       }
 }
 
 /**
@@ -127,7 +161,7 @@ Package *Builder::get_package(const string &n)
        argv.push_back("--variable=source");
        argv.push_back(n);
        string srcdir=strip(run_command(argv));
-       
+
        PathList dirs;
        if(!srcdir.empty())
                dirs.push_back(srcdir);
@@ -161,9 +195,9 @@ Package *Builder::get_package(const string &n)
 /**
 Returns the target with the given name, or 0 if no such target exists.
 */
-Target *Builder::get_target(const string &n)
+Target *Builder::get_target(const string &n) const
 {
-       TargetMap::iterator i=targets.find(n);
+       TargetMap::const_iterator i=targets.find(n);
        if(i!=targets.end())
                return i->second;
        return 0;
@@ -171,9 +205,11 @@ Target *Builder::get_target(const string &n)
 
 /**
 Tries to locate a header included from a given location and with a given include
-path.  Considers known targets as well as existing files.
+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)
+Target *Builder::get_header(const string &include, const string &, const string &from, const list<string> &path)
 {
        string hash(8, 0);
        update_hash(hash, from);
@@ -187,46 +223,117 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 
        string fn=include.substr(1);
        Target *tgt=0;
-       if(include[0]=='"' && (tgt=check_header(Path::Path(from)/fn)))
-               return tgt;
-       if((tgt=check_header(Path::Path("/usr/include")/fn)))
-               return tgt;
+       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
-       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(cwd/ *j/fn)))
-                       return tgt;
-       
-       return 0;
+       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 tgt;
 }
 
-Target *Builder::get_library(const string &lib, const list<string> &path)
+/**
+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 string &arch, 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;
 
-       string basename="lib"+lib+".so";
-       for(list<string>::const_iterator j=path.begin(); j!=path.end(); ++j)
+       StringList syspath;
+       if(arch=="native")
        {
-               string full=(cwd/ *j/basename).str();
-               Target *tgt=get_target(full);
-               if(tgt) return tgt;
-               
-               if(Path::exists(full))
-               {
-                       add_target(tgt=new SystemLibrary(*this, full));
-                       return tgt;
-               }
+               syspath.push_back("/lib");
+               syspath.push_back("/usr/lib");
        }
+       else
+               syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib");
 
-       return 0;
+       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);
+
+       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;
+}
+
+string Builder::get_tool(const std::string &tool, const std::string &arch)
+{
+       ToolMap::iterator i=tools.find(arch);
+       if(i!=tools.end())
+       {
+               StringMap::iterator j=i->second.find(tool);
+               if(j!=i->second.end())
+                       return j->second;
+       }
+
+       // Either the arch, or the tool within the arch was not found
+       i=tools.find("native");
+       StringMap::iterator j=i->second.find(tool);
+       if(j==i->second.end())
+               throw InvalidParameterValue("Unknown tool");
+
+       return get_arch_prefix(arch)+"-"+j->second;
+}
+
+void Builder::apply_profile_template(Config &config, const string &pt) const
+{
+       vector<string> parts=split(pt, '-');
+
+       for(vector<string>::iterator i=parts.begin(); i!=parts.end(); ++i)
+       {
+               ProfileTemplateMap::const_iterator j=profile_tmpl.find(*i);
+               if(j==profile_tmpl.end())
+                       continue;
+
+               config.update(j->second);
+       }
+}
+
+/**
+Adds a target to both the target map and the new target queue.  Called from
+Target constructor.
+*/
+void Builder::add_target(Target *t)
+{
+       targets.insert(TargetMap::value_type(t->get_name(), t));
+       new_tgts.push_back(t);
 }
 
 int Builder::main()
@@ -242,36 +349,43 @@ int Builder::main()
        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();
        }
 
+       default_pkg->configure(cmdline_options, conf_all?2:1);
+
        if(help)
        {
-               usage("builder", false);
+               usage(0, "builder", false);
                cout<<'\n';
                package_help();
                return 0;
        }
 
-       StringList missing;
+       StringMap problems;
        for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+       {
+               string prob;
                if(!i->second)
-                       missing.push_back(i->first);
+                       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));
+       }
 
-       if(!missing.empty())
+       if(!problems.empty())
        {
-               missing.sort();
-               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";
+               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;
        }
 
-       default_pkg->create_build_info();
+       if(conf_only)
+               return 0;
 
        if(create_targets())
                return 1;
@@ -307,8 +421,12 @@ int Builder::main()
        if(analyzer)
                analyzer->analyze();
 
-       if(do_build)
-               build();
+       //if(create_makefile
+
+       if(clean)
+               exit_code=do_clean();
+       else if(build)
+               exit_code=do_build();
 
        return exit_code;
 }
@@ -322,10 +440,13 @@ Builder::~Builder()
        delete analyzer;
 }
 
-void Builder::usage(const char *argv0, bool brief)
+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] [--full-paths] [--max-depth NUM] [<target> ...]";
+               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<<
@@ -345,37 +466,52 @@ void Builder::usage(const char *argv0, bool brief)
                        "  -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"
+                       //"  --makefile          Create a makefile for this package.\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());
        if(!in)
                return -1;
 
-       Parser::Parser parser(in, fn.str());
+       DataFile::Parser parser(in, fn.str());
        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");
-       add_target(world);
 
        Target *def_tgt=new VirtualTarget(*this, "default");
-       add_target(def_tgt);
        world->add_depend(def_tgt);
 
        Target *install=new VirtualTarget(*this, "install");
-       add_target(install);
        world->add_depend(install);
 
+       Target *tarballs=new VirtualTarget(*this, "tarballs");
+       world->add_depend(tarballs);
+
        for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
        {
                if(!i->second)
@@ -383,116 +519,20 @@ int Builder::create_targets()
                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)
-               {
-                       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(PathList::iterator k=files.begin(); k!=files.end(); ++k)
-                       {
-                               string basename=(*k)[-1];
-                               string ext=Path::splitext(basename).ext;
-                               if(ext==".cpp" || ext==".c")
-                               {
-                                       if(build_exe)
-                                       {
-                                               SourceFile *src=new SourceFile(*this, &*j, k->str());
-                                               add_target(src);
-                                               
-                                               ObjectFile *obj=new ObjectFile(*this, *j, *src);
-                                               add_target(obj);
-                                               objs.push_back(obj);
-                                       }
-                               }
-                               else if(ext==".h")
-                               {
-                                       Target *hdr=get_target(k->str());
-                                       if(!hdr)
-                                       {
-                                               hdr=new Header(*this, &*j, k->str());
-                                               add_target(hdr);
-                                       }
-                                       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);
-                                       }
-                               }
-                       }
+                       j->create_targets();
 
-                       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);
+                       install->add_depend(new Install(*this, *i->second, *pc));
                }
+
+               tarballs->add_depend(new TarBall(*this, *i->second));
        }
 
+       // Find dependencies until no new targets are created
        while(!new_tgts.empty())
        {
                Target *tgt=new_tgts.front();
@@ -502,7 +542,8 @@ int Builder::create_targets()
                        new_tgts.push_back(tgt);
        }
 
-       for(list<string>::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+       // Apply what-ifs
+       for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
        {
                Target *tgt=get_target((cwd/ *i).str());
                if(!tgt)
@@ -513,9 +554,9 @@ int Builder::create_targets()
                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);
+       bool build_world=false;
        for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
        {
                Target *tgt=get_target(*i);
@@ -526,33 +567,95 @@ int Builder::create_targets()
                        cerr<<"I don't know anything about "<<*i<<'\n';
                        return -1;
                }
+               if(tgt==world)
+                       build_world=true;
                cmdline->add_depend(tgt);
        }
 
-       world->prepare();
+       /* If world is to be built, prepare cmdline.  If not, add cmdline to world
+          and prepare world.  I don't really like this, but it keeps the graph
+          acyclic. */
+       if(build_world)
+               cmdline->prepare();
+       else
+       {
+               world->add_depend(cmdline);
+               world->prepare();
+       }
+
+       for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+               i->second->get_deps_cache().save();
 
        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;
 
        if(Path::exists(fn))
        {
-               add_target(tgt=new SystemHeader(*this, fn.str()));
+               tgt=new SystemHeader(*this, fn.str());
                return tgt;
        }
        return 0;
 }
 
-void Builder::add_target(Target *t)
+Target *Builder::get_library(const string &lib, const string &arch, const Path::Path &path, LibMode mode)
 {
-       targets.insert(TargetMap::value_type(t->get_name(), t));
-       new_tgts.push_back(t);
+       // Populate a list of candidate filenames
+       StringList candidates;
+
+       if(mode!=ALL_STATIC)
+       {
+               if(arch=="win32")
+                       candidates.push_back("lib"+lib+".dll");
+               else
+                       candidates.push_back("lib"+lib+".so");
+       }
+
+       /* Static libraries are always considered, since sometimes shared versions
+       may not be available */
+       candidates.push_back("lib"+lib+".a");
+       if(arch=="win32")
+               candidates.push_back("lib"+lib+".dll.a");
+
+       for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
+       {
+               string full=(path/ *i).str();
+               Target *tgt=get_target(full);
+
+               if(tgt)
+               {
+                       Target *real_tgt=tgt;
+                       if(dynamic_cast<Install *>(tgt))
+                               real_tgt=real_tgt->get_depends().front();
+
+                       /* Ignore dynamic libraries from local packages unless library mode is
+                       DYNAMIC */
+                       if(dynamic_cast<SharedLibrary *>(real_tgt) && mode!=DYNAMIC)
+                               continue;
+                       else if(tgt)
+                               return tgt;
+               }
+               else if(Path::exists(full))
+               {
+                       tgt=new SystemLibrary(*this, full);
+                       return tgt;
+               }
+       }
+
+       return 0;
 }
 
+/**
+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)
@@ -563,7 +666,7 @@ void Builder::update_hash(string &hash, const string &value)
 This function supervises the build process, starting new actions when slots
 become available.
 */
-int Builder::build()
+int Builder::do_build()
 {
        Target *cmdline=get_target("cmdline");
 
@@ -630,9 +733,51 @@ int Builder::build()
                }
        }
 
-       return fail?-1:0;
+       if(fail)
+               cout<<"Build failed\n";
+
+       return fail?1:0;
 }
 
+/**
+Cleans buildable targets.  If clean is 1, cleans only this package.  If
+clean is 2 or greater, cleans all buildable packages.
+*/
+int Builder::do_clean()
+{
+       // Cleaning doesn't care about ordering, so a simpler method can be used
+
+       set<Target *> clean_tgts;
+       TargetList queue;
+       queue.push_back(get_target("cmdline"));
+
+       while(!queue.empty())
+       {
+               Target *tgt=queue.front();
+               queue.erase(queue.begin());
+
+               if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2))
+                       clean_tgts.insert(tgt);
+
+               const TargetList &deps=tgt->get_depends();
+               for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+                       if(!clean_tgts.count(*i))
+                               queue.push_back(*i);
+       }
+
+       for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
+       {
+               Action *action=new Unlink(*this, **i);
+               while(action->check()<0);
+               delete action;
+       }
+
+       return 0;
+}
+
+/**
+Prints out information about the default package.
+*/
 void Builder::package_help()
 {
        const Config &config=default_pkg->get_config();