-#include <fstream>
-#include <iostream>
#include <set>
-#include <msp/core/error.h>
-#include <msp/getopt++/getopt++.h>
-#include <msp/parser/parser.h>
-#include <msp/path/utils.h>
+#include <cstdlib>
+#include <msp/core/getopt.h>
+#include <msp/datafile/parser.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/io/buffered.h>
+#include <msp/io/file.h>
+#include <msp/io/print.h>
+#include <msp/strings/format.h>
+#include <msp/strings/regex.h>
#include <msp/strings/utils.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
-#include "action.h"
#include "analyzer.h"
+#include "binarypackage.h"
#include "builder.h"
-#include "executable.h"
-#include "header.h"
-#include "install.h"
-#include "misc.h"
-#include "objectfile.h"
+#include "copy.h"
+#include "gnuarchiver.h"
+#include "gnuccompiler.h"
+#include "gnucxxcompiler.h"
+#include "gnulinker.h"
+#include "installedfile.h"
#include "package.h"
-#include "pkgconfig.h"
+#include "pkgconfiggenerator.h"
#include "sharedlibrary.h"
-#include "staticlibrary.h"
-#include "systemlibrary.h"
-#include "unlink.h"
+#include "sourcepackage.h"
+#include "tar.h"
+#include "task.h"
#include "virtualtarget.h"
using namespace std;
using namespace Msp;
Builder::Builder(int argc, char **argv):
+ package_manager(*this),
+ main_pkg(0),
+ native_arch(*this, string()),
+ vfs(*this),
analyzer(0),
build(false),
clean(0),
dry_run(false),
help(false),
- verbose(1),
- chrome(false),
+ show_progress(false),
build_file("Build"),
jobs(1),
conf_all(false),
build_all(false),
create_makefile(false)
{
- string analyze_mode;
- string work_dir;
- bool full_paths=false;
- unsigned max_depth=5;
+ string analyze_mode;
+ string work_dir;
+ bool full_paths = false;
+ unsigned max_depth = 5;
+ StringList cmdline_warn;
+ string prfx;
+ string arch;
+ bool no_externals = false;
+ unsigned verbose = 1;
+ bool silent = false;
+ list<string> log_channels;
GetOpt getopt;
- 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.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG).set_help("Perform analysis. MODE can be deps, alldeps or rebuild.", "MODE");
+ getopt.add_option('b', "build", build, GetOpt::NO_ARG).set_help("Perform build even if doing analysis.");
+ getopt.add_option('c', "clean", clean, GetOpt::NO_ARG).set_help("Clean buildable targets.");
+ getopt.add_option('f', "file", build_file, GetOpt::REQUIRED_ARG).set_help("Read info from FILE instead of Build.", "FILE");
+ getopt.add_option('h', "help", help, GetOpt::NO_ARG).set_help("Print this message.");
+ getopt.add_option('j', "jobs", jobs, GetOpt::REQUIRED_ARG).set_help("Run NUM commands at once, whenever possible.", "NUM");
+ getopt.add_option('l', "log", log_channels, GetOpt::REQUIRED_ARG).set_help("Set log channels to be displayed.", "LIST");
+ getopt.add_option('n', "dry-run", dry_run, GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done.");
+ getopt.add_option('s', "silent", silent, GetOpt::NO_ARG).set_help("Don't print any messages other than errors.");
+ getopt.add_option('v', "verbose", verbose, GetOpt::NO_ARG).set_help("Print more information about what's going on.");
+ getopt.add_option('x', "no-externals", no_externals, GetOpt::NO_ARG).set_help("Do not load external source packages.");
+ getopt.add_option('A', "conf-all", conf_all, GetOpt::NO_ARG).set_help("Apply configuration to all packages.");
+ getopt.add_option('B', "build-all", build_all, GetOpt::NO_ARG).set_help("Build all targets unconditionally.");
+ getopt.add_option('C', "chdir", work_dir, GetOpt::REQUIRED_ARG).set_help("Change to DIR before doing anything else.", "DIR");
+ getopt.add_option('P', "progress", show_progress, GetOpt::NO_ARG).set_help("Display progress while building.");
+ getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_ARG).set_help("Pretend that FILE has changed.", "FILE");
+ getopt.add_option( "arch", arch, GetOpt::REQUIRED_ARG).set_help("Architecture to build for.", "ARCH");
+ getopt.add_option( "conf-only", conf_only, GetOpt::NO_ARG).set_help("Stop after configuring packages.");
+ getopt.add_option( "full-paths", full_paths, GetOpt::NO_ARG).set_help("Output full paths in analysis.");
+ getopt.add_option( "max-depth", max_depth, GetOpt::REQUIRED_ARG).set_help("Maximum depth to show in analysis.", "NUM");
+ getopt.add_option( "prefix", prfx, GetOpt::REQUIRED_ARG).set_help("Directory to install things to.", "DIR");
+ getopt.add_option( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST");
+ usagemsg = getopt.generate_usage(argv[0])+" [<target> ...]";
+ helpmsg = getopt.generate_help();
getopt(argc, argv);
+ if(silent)
+ --verbose;
+ if(verbose>=1)
+ {
+ logger.enable_channel("summary");
+ logger.enable_channel("tasks");
+ }
+ if(verbose>=2)
+ {
+ logger.enable_channel("packages");
+ logger.enable_channel("commands");
+ }
+ if(verbose>=3)
+ {
+ logger.enable_channel("packagemgr");
+ logger.enable_channel("configure");
+ }
+ if(verbose>=4)
+ {
+ logger.enable_channel("files");
+ logger.enable_channel("auxcommands");
+ }
+ if(verbose>=5)
+ {
+ logger.enable_channel("tools");
+ logger.enable_channel("vfs");
+ }
+ for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
+ {
+ vector<string> parts = split(*i, ',');
+ for(vector<string>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
+ logger.enable_channel(*j);
+ }
+
if(!analyze_mode.empty())
{
- analyzer=new Analyzer(*this);
+ analyzer = new Analyzer(*this);
if(analyze_mode=="deps")
analyzer->set_mode(Analyzer::DEPS);
else if(analyze_mode=="rdeps")
analyzer->set_mode(Analyzer::RDEPS);
else
- throw UsageError("Invalid analyze mode");
+ throw usage_error("Invalid analyze mode");
analyzer->set_max_depth(max_depth);
analyzer->set_full_paths(full_paths);
}
else if(!clean && !create_makefile)
- build=true;
+ 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('=');
+ string::size_type equal = i->find('=');
if(equal!=string::npos)
cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1)));
else
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"));
-
- 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"));
- }
-}
-
-/**
-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));
-
- 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"))
- 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"))
- {
- i=packages.find(n);
- if(i!=packages.end())
- return i->second;
- break;
- }
+ FS::chdir(work_dir);
- // Package source not found - create a binary package
- Package *pkg=Package::create(*this, n);
- packages.insert(PackageMap::value_type(n, pkg));
- if(pkg)
- new_pkgs.push_back(pkg);
+ cwd = FS::getcwd();
- return pkg;
-}
+ package_manager.set_no_externals(no_externals);
-/**
-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);
- if(i!=targets.end())
- return i->second;
- 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 &, const string &from, const list<string> &path)
-{
- 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;
+ load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
+ load_build_file((FS::get_user_data_dir("builder")/"rc").str());
- 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)))
- ;
+ if(arch.empty())
+ current_arch = &native_arch;
else
+ current_arch = new Architecture(*this, arch);
+
+ if(!current_arch->is_native())
{
- for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
- tgt=get_header(cwd/ *j/fn);
+ for(StringMap::const_iterator i=cross_prefixes.begin(); i!=cross_prefixes.end(); ++i)
+ if(current_arch->match_name(i->first))
+ {
+ current_arch->set_cross_prefix(i->second);
+ break;
+ }
}
- includes.insert(TargetMap::value_type(id, tgt));
-
- 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 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;
-
- StringList syspath;
- if(arch=="native")
+ if(prfx.empty())
{
- syspath.push_back("/lib");
- syspath.push_back("/usr/lib");
+ if(current_arch->is_native())
+ prefix = (FS::get_home_dir()/"local").str();
+ else
+ prefix = (FS::get_home_dir()/"local"/current_arch->get_name()).str();
}
else
- syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib");
-
- 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())
+ prefix = FS::getcwd()/prfx;
+
+ warnings.push_back("all");
+ warnings.push_back("extra");
+ warnings.push_back("shadow");
+ warnings.push_back("pointer-arith");
+ warnings.push_back("error");
+ for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i)
{
- StringMap::iterator j=i->second.find(tool);
- if(j!=i->second.end())
- return j->second;
+ vector<string> warns = split(*i, ',');
+ warnings.insert(warnings.end(), warns.begin(), warns.end());
}
- // 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;
+ toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
+ toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
+ toolchain.add_tool(new GnuLinker(*this, *current_arch));
+ toolchain.add_tool(new GnuArchiver(*this, *current_arch));
+ toolchain.add_tool(new Copy(*this));
+ toolchain.add_tool(new Tar(*this));
+ toolchain.add_tool(new PkgConfigGenerator(*this));
}
-void Builder::apply_profile_template(Config &config, const string &pt) const
+Builder::~Builder()
{
- 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);
- }
+ for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+ delete i->second;
+ delete analyzer;
}
int Builder::main()
{
- if(load_build_file(cwd/build_file))
+ if(prefix.str()!="/usr")
{
- cerr<<"No build info here.\n";
- return 1;
+ FS::Path pcdir = prefix/"lib"/"pkgconfig";
+ if(const char *pcp = getenv("PKG_CONFIG_PATH"))
+ {
+ vector<string> path = split(pcp, ':');
+ bool found = false;
+ for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
+ found = (*i==pcdir.str());
+ if(!found)
+ {
+ path.push_back(pcdir.str());
+ setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
+ }
+ }
+ else
+ setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true);
}
- default_pkg=packages.begin()->second;
-
- while(!new_pkgs.empty())
+ if(load_build_file(cwd/build_file))
{
- Package *pkg=new_pkgs.front();
- new_pkgs.erase(new_pkgs.begin());
- pkg->resolve_refs();
+ if(help)
+ {
+ usage(0, "builder", false);
+ return 0;
+ }
+ else
+ {
+ IO::print(IO::cerr, "No build info here.\n");
+ return 1;
+ }
}
- default_pkg->configure(cmdline_options, conf_all?2:1);
+ main_pkg->configure(cmdline_options, conf_all?2:1);
if(help)
{
usage(0, "builder", false);
- cout<<'\n';
+ IO::print("\n");
package_help();
return 0;
}
- StringMap problems;
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
- {
- 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));
- }
-
- if(!problems.empty())
- {
- 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;
- }
-
if(conf_only)
return 0;
if(create_targets())
return 1;
- cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
- if(verbose>=2)
+ logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
+ current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")));
+ logger.log("environment", format("Prefix is %s", prefix));
+
+ const PackageManager::PackageMap &packages = package_manager.get_packages();
+ list<string> package_details;
+ for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
{
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+ if(!i->second || !i->second->is_configured())
+ continue;
+
+ string line = i->second->get_name();
+ if(dynamic_cast<SourcePackage *>(i->second))
{
- cout<<' '<<i->second->get_name();
- if(i->second->get_buildable())
- cout<<'*';
- unsigned count=0;
- unsigned ood_count=0;
+ line += '*';
+
+ unsigned count = 0;
+ unsigned to_be_built = 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(j->second->needs_rebuild())
+ ++to_be_built;
}
if(count)
{
- cout<<" ("<<count<<" targets";
- if(ood_count)
- cout<<", "<<ood_count<<" out-of-date";
- cout<<')';
+ line += format(" (%d targets", count);
+ if(to_be_built)
+ line += format(", %d to be built", to_be_built);
+ line += ')';
}
- cout<<'\n';
}
+
+ package_details.push_back(line);
}
+ logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size()));
+ for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
+ logger.log("packages", *i);
+
if(analyzer)
analyzer->analyze();
- //if(create_makefile
+ if(!problems.empty())
+ {
+ IO::print(IO::cerr, "The following problems were detected:\n");
+ for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
+ IO::print(IO::cerr, " %s: %s\n", i->package, i->descr);
+ if(!analyzer)
+ IO::print(IO::cerr, "Please fix them and try again.\n");
+ return 1;
+ }
if(clean)
- exit_code=do_clean();
+ exit_code = do_clean();
else if(build)
- exit_code=do_build();
+ exit_code = do_build();
return exit_code;
}
-Builder::~Builder()
+Target *Builder::get_target(const string &n) const
{
- 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;
+ TargetMap::const_iterator i = targets.find(n);
+ if(i!=targets.end())
+ return i->second;
+ return 0;
+}
+
+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);
+ }
+}
+
+void Builder::problem(const string &p, const string &d)
+{
+ problems.push_back(Problem(p, d));
+}
+
+void Builder::add_target(Target *t)
+{
+ targets.insert(TargetMap::value_type(t->get_name(), t));
}
void Builder::usage(const char *reason, const char *argv0, bool brief)
{
if(reason)
- cerr<<reason<<'\n';
+ IO::print(IO::cerr, "%s\n", reason);
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> ...]";
+ IO::print(IO::cerr, "Usage: %s\n", usagemsg);
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"
- //" --makefile Create a makefile for this package.\n"
- " --max-depth NUM Maximum depth to show in analysis.\n";
+ IO::print(IO::cerr, "Builder 1.0\n\n");
+ IO::print(IO::cerr, "Usage: %s [options] [<target> ...]\n\n", argv0);
+ IO::print(IO::cerr, "Options:\n");
+ IO::print(IO::cerr, helpmsg);
}
}
-/**
-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)
+int Builder::load_build_file(const FS::Path &fn)
{
- ifstream in(fn.str().c_str());
- if(!in)
+ if(!FS::exists(fn))
return -1;
- Parser::Parser parser(in, fn.str());
+ IO::BufferedFile in(fn.str());
+
+ logger.log("files", format("Reading %s", fn));
+
+ 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 *world = new VirtualTarget(*this, "world");
- Target *def_tgt=new VirtualTarget(*this, "default");
- add_target(def_tgt);
+ Target *def_tgt = new VirtualTarget(*this, "default");
world->add_depend(def_tgt);
- Target *install=new VirtualTarget(*this, "install");
- add_target(install);
+ Target *install = new VirtualTarget(*this, "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;
+ Target *tarballs = new VirtualTarget(*this, "tarballs");
+ world->add_depend(tarballs);
- Path::Path inst_base;
- if(i->second->get_buildable() && i->second->get_install_flags())
- inst_base=i->second->get_prefix();
+ const PackageManager::PackageMap &packages = package_manager.get_packages();
+ for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ if(i->second && i->second->is_configured())
+ i->second->create_targets();
- const ComponentList &components=i->second->get_components();
- for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
+ // Make the cmdline target depend on all targets mentioned on the command line
+ Target *cmdline = new VirtualTarget(*this, "cmdline");
+ for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
+ {
+ Target *tgt = get_target(*i);
+ if(!tgt)
+ tgt = vfs.get_target(*i);
+ if(!tgt)
+ tgt = vfs.get_target(cwd/ *i);
+ if(!tgt)
{
- // 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(PathList::iterator k=files.begin(); k!=files.end(); ++k)
- {
- string basename=(*k)[-1];
- string ext=Path::splitext(basename).ext;
- if((ext==".cpp" || ext==".c") && build_exe)
- {
- 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")
- {
- 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);
- }
- }
- }
-
- 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);
- }
- }
- }
- }
+ IO::print("I don't know anything about %s\n", *i);
+ return -1;
}
- 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);
- }
+ cmdline->add_depend(tgt);
}
- // 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);
- }
+ cmdline->prepare();
// Apply what-ifs
for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
{
- Target *tgt=get_target((cwd/ *i).str());
+ FileTarget *tgt = vfs.get_target(cwd/ *i);
if(!tgt)
{
- cerr<<"Unknown what-if target "<<*i<<'\n';
+ IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
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);
- for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
- {
- Target *tgt=get_target(*i);
- if(!tgt)
- tgt=get_target((cwd/ *i).str());
- if(!tgt)
- {
- cerr<<"I don't know anything about "<<*i<<'\n';
- return -1;
- }
- cmdline->add_depend(tgt);
- }
-
- world->prepare();
-
- return 0;
-}
-
-/**
-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))
+ if(build_all)
{
- add_target(tgt=new SystemHeader(*this, fn.str()));
- return tgt;
+ for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+ if(i->second->is_buildable() && !i->second->needs_rebuild())
+ i->second->force_rebuild();
}
- return 0;
-}
-Target *Builder::get_library(const string &lib, const string &arch, const Path::Path &path, LibMode mode)
-{
- // 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);
- add_target(tgt);
- return tgt;
- }
- }
+ for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ if(SourcePackage *spkg = dynamic_cast<SourcePackage *>(i->second))
+ spkg->get_deps_cache().save();
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::do_build()
{
- Target *cmdline=get_target("cmdline");
+ Target *cmdline = get_target("cmdline");
+
+ unsigned total = 0;
+ for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+ if(i->second->is_buildable() && i->second->needs_rebuild())
+ ++total;
- unsigned total=cmdline->count_rebuild();
if(!total)
{
- cout<<"Already up to date\n";
+ logger.log("summary", "Already up to date");
return 0;
}
- cout<<"Will build "<<total<<" target(s)\n";
+ logger.log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
- vector<Action *> actions;
+ vector<Task *> tasks;
- if(chrome)
- cout<<"0 targets built\n";
- unsigned count=0;
+ unsigned count = 0;
- bool fail=false;
- bool finish=false;
+ bool fail = false;
+ bool finish = false;
while(!finish)
{
- if(actions.size()<jobs && !fail)
+ if(tasks.size()<jobs && !fail)
{
- Target *tgt=cmdline->get_buildable_target();
+ Target *tgt = cmdline->get_buildable_target();
if(tgt)
{
- Action *action=tgt->build();
- if(action)
- actions.push_back(action);
+ if(tgt->get_tool())
+ logger.log("tasks", format("%-4s %s", tgt->get_tool()->get_tag(), tgt->get_name()));
+ Task *task = tgt->build();
+ if(task)
+ {
+ logger.log("commands", format("%s", task->get_command()));
+ if(dry_run)
+ {
+ task->signal_finished.emit(true);
+ delete task;
+ }
+ else
+ {
+ task->start();
+ tasks.push_back(task);
+ }
+ }
+
+ if(show_progress)
+ IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
}
- else if(actions.empty())
- finish=true;
+ else if(tasks.empty())
+ finish = true;
}
else
Time::sleep(10*Time::msec);
- for(unsigned i=0; i<actions.size();)
+ for(unsigned i=0; i<tasks.size();)
{
- int status=actions[i]->check();
- if(status>=0)
+ Task::Status status = tasks[i]->check();
+ if(status!=Task::RUNNING)
{
++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;
+
+ delete tasks[i];
+ tasks.erase(tasks.begin()+i);
+ if(status==Task::ERROR)
+ fail = true;
+ if(tasks.empty() && fail)
+ finish = true;
}
else
++i;
}
}
+ if(show_progress)
+ IO::print("\033[K");
if(fail)
- cout<<"Build failed\n";
+ logger.log("summary", "Build failed");
+ else if(show_progress)
+ logger.log("summary", "Build complete");
- return fail?1:0;
+ return fail;
}
-/**
-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;
+ list<Target *> queue;
queue.push_back(get_target("cmdline"));
while(!queue.empty())
{
- Target *tgt=queue.front();
+ Target *tgt = queue.front();
queue.erase(queue.begin());
- if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2))
+ if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
clean_tgts.insert(tgt);
- const TargetList &deps=tgt->get_depends();
- for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+ const Target::Dependencies &deps = tgt->get_depends();
+ for(list<Target *>::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;
- }
+ if(FileTarget *ft = dynamic_cast<FileTarget *>(*i))
+ if(ft->get_mtime())
+ FS::unlink(ft->get_path());
return 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();
+ const Config &config = main_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)
+ IO::print("Required packages:\n ");
+ const PackageList &requires = main_pkg->get_requires();
+ for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
{
if(i!=requires.begin())
- cout<<", ";
- cout<<i->get_name();
+ IO::print(", ");
+ IO::print((*i)->get_name());
}
- cout<<"\n\n";
- cout<<"Package configuration:\n";
+ IO::print("\n\nPackage 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";
+ const Config::Option &opt = i->second;
+ IO::print(" %s: %s (%s)", opt.name, opt.descr, opt.value);
+ if(opt.value!=opt.defv)
+ IO::print(" [%s]", opt.defv);
+ IO::print("\n");
}
}
-Application::RegApp<Builder> Builder::reg;
+string Builder::usagemsg;
+string Builder::helpmsg;
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
- bld(b),
+
+Builder::Loader::Loader(Builder &b, const FS::Path &s):
+ DataFile::ObjectLoader<Builder>(b),
src(s)
{
+ add("binary_package", &Loader::binpkg);
+ add("cross_prefix", &Loader::cross_prefix);
+ add("profile", &Loader::profile);
add("package", &Loader::package);
}
+void Builder::Loader::binpkg(const string &n)
+{
+ BinaryPackage *pkg = new BinaryPackage(obj, n);
+ load_sub(*pkg);
+}
+
+void Builder::Loader::cross_prefix(const string &a, const string &p)
+{
+ obj.cross_prefixes[a] = p;
+}
+
+void Builder::Loader::profile(const string &n)
+{
+ StringMap prf;
+ ProfileLoader ldr(prf);
+ load_sub_with(ldr);
+ obj.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
+}
+
void Builder::Loader::package(const string &n)
{
- Package *pkg=new Package(bld, n, src);
+ SourcePackage *pkg = new SourcePackage(obj, n, src);
+ if(!obj.main_pkg)
+ obj.main_pkg = pkg;
+
load_sub(*pkg);
- bld.packages.insert(PackageMap::value_type(n, pkg));
- bld.new_pkgs.push_back(pkg);
}
+
+Builder::ProfileLoader::ProfileLoader(StringMap &p):
+ profile(p)
+{
+ add("option", &ProfileLoader::option);
+}
+
+void Builder::ProfileLoader::option(const string &o, const string &v)
+{
+ profile.insert(StringMap::value_type(o, v));
+}
projects / builder.git / blobdiff