/* $Id$
This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
-#include <fstream>
-#include <iostream>
#include <set>
-#include <msp/core/error.h>
+#include <sys/utsname.h>
+#include <msp/core/except.h>
#include <msp/core/getopt.h>
#include <msp/datafile/parser.h>
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/io/buffered.h>
+#include <msp/io/except.h>
+#include <msp/io/file.h>
+#include <msp/io/print.h>
#include <msp/strings/formatter.h>
#include <msp/strings/regex.h>
#include <msp/strings/utils.h>
#include "sharedlibrary.h"
#include "sourcepackage.h"
#include "systemlibrary.h"
-#include "tarball.h"
#include "unlink.h"
#include "virtualtarget.h"
using namespace std;
using namespace Msp;
+namespace {
+
+void update_hash(string &hash, const string &value)
+{
+ for(unsigned i=0; i<value.size(); ++i)
+ hash[i%hash.size()]^=value[i];
+}
+
+}
+
+
Builder::Builder(int argc, char **argv):
main_pkg(0),
analyzer(0),
build_all(false),
create_makefile(false)
{
- string analyze_mode;
- string work_dir;
- bool full_paths=false;
+ string analyze_mode;
+ string work_dir;
+ bool full_paths=false;
unsigned max_depth=5;
+ StringList cmdline_warn;
+ string prfx;
+ string arch;
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('P', "progress", show_progress, GetOpt::NO_ARG);
- getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_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('n', "dry-run", dry_run, GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done.");
+ getopt.add_option('v', "verbose", verbose, GetOpt::NO_ARG).set_help("Print more information about what's going on.");
+ 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(!analyze_mode.empty())
cmdline_targets.push_back("default");
if(!work_dir.empty())
- chdir(work_dir.c_str());
+ FS::chdir(work_dir);
- cwd=getcwd();
+ cwd=FS::getcwd();
- Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
- native_arch.set_tool("CC", "gcc");
- native_arch.set_tool("CXX", "g++");
- native_arch.set_tool("LD", "gcc");
- native_arch.set_tool("LXX", "g++");
- native_arch.set_tool("AR", "ar");
+ utsname un;
+ string sysname="native";
+ if(uname(&un)==0)
+ sysname=tolower(un.sysname);
- const char *home=getenv("HOME");
- if(home)
- load_build_file((Path(home)/".builderrc").str());
-}
+ native_arch=&archs.insert(ArchMap::value_type(sysname, Architecture(*this, sysname, true))).first->second;
+ native_arch->set_tool("CC", "gcc");
+ native_arch->set_tool("CXX", "g++");
+ native_arch->set_tool("LD", "gcc");
+ native_arch->set_tool("LXX", "g++");
+ native_arch->set_tool("AR", "ar");
-/**
-Gets a package with the specified name, possibly creating it.
+ load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
+ load_build_file((FS::get_home_dir()/".builderrc").str());
-@param n Package name
+ if(arch.empty())
+ current_arch=native_arch;
+ else
+ current_arch=&get_architecture(arch);
-@return Pointer to the package, or 0 if the package could not be located
-*/
-Package *Builder::get_package(const string &n)
+ if(prfx.empty())
+ {
+ 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
+ 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)
+ {
+ vector<string> warns=split(*i, ',');
+ warnings.insert(warnings.end(), warns.begin(), warns.end());
+ }
+
+ pkg_path.push_back(cwd/".");
+ pkg_path.push_back(cwd/"..");
+}
+
+Builder::~Builder()
{
- PackageMap::iterator i=packages.find(n);
- if(i!=packages.end())
- return i->second;
+ 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;
+}
- // Try to get source directory with pkgconfig
- list<string> argv;
- argv.push_back("pkg-config");
- argv.push_back("--variable=source");
- argv.push_back(n);
- if(verbose>=4)
- cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
- string srcdir=strip(run_command(argv));
+int Builder::main()
+{
+ if(load_build_file(cwd/build_file))
+ {
+ if(help)
+ {
+ usage(0, "builder", false);
+ return 0;
+ }
+ else
+ {
+ IO::print(IO::cerr, "No build info here.\n");
+ return 1;
+ }
+ }
- 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"))
+ main_pkg->configure(cmdline_options, conf_all?2:1);
+
+ if(help)
+ {
+ usage(0, "builder", false);
+ IO::print("\n");
+ package_help();
+ return 0;
+ }
+
+ if(!conf_only && create_targets())
+ return 1;
+
+ PackageList all_reqs=main_pkg->collect_requires();
+
+ if(conf_only)
+ return 0;
+
+ if(verbose>=2)
+ IO::print("Building on %s, for %s\n", native_arch->get_name(), current_arch->get_name());
+ if(verbose>=1)
+ IO::print("%d active packages, %d targets\n", all_reqs.size(), targets.size());
+ if(verbose>=2)
+ {
+ for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
- i=packages.find(n);
- if(i!=packages.end())
- return i->second;
- break;
+ IO::print(" %s", (*i)->get_name());
+ if(dynamic_cast<SourcePackage *>(*i))
+ IO::print("*");
+ unsigned count=0;
+ unsigned ood_count=0;
+ for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
+ if(j->second->get_package()==*i)
+ {
+ ++count;
+ if(j->second->get_rebuild())
+ ++ood_count;
+ }
+ if(count)
+ {
+ IO::print(" (%d targets", count);
+ if(ood_count)
+ IO::print(", %d out-of-date", ood_count);
+ IO::print(")");
+ }
+ IO::print("\n");
}
+ }
+
+ if(analyzer)
+ analyzer->analyze();
+
+ 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);
+ IO::print(IO::cerr, "Please fix them and try again.\n");
+ return 1;
+ }
+
+ //if(create_makefile
+
+ if(clean)
+ exit_code=do_clean();
+ else if(build)
+ exit_code=do_build();
+
+ return exit_code;
+}
+
+Package *Builder::get_package(const string &name)
+{
+ PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch->get_name()));
+ if(i==packages.end())
+ i=packages.find(name);
+ if(i!=packages.end())
+ return i->second;
+
+ FS::Path path=get_package_location(name);
+ if(!path.empty() && !load_build_file(path/"Build"))
+ {
+ i=packages.find(name);
+ if(i!=packages.end())
+ return i->second;
+ }
// Package source not found - create a binary package
- Package *pkg=BinaryPackage::from_pkgconfig(*this, n);
+ Package *pkg=BinaryPackage::from_pkgconfig(*this, name);
- packages.insert(PackageMap::value_type(n, pkg));
+ packages.insert(PackageMap::value_type(name, pkg));
if(!pkg)
- problem(n, "not found");
+ problem(name, "not found");
return pkg;
}
-/**
-Returns the target with the given name, or 0 if no such target exists.
-*/
Target *Builder::get_target(const string &n) const
{
+ // XXX Used for getting targets by path. get_target(const FS::Path &)?
TargetMap::const_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 &arch, const string &from, const list<string> &path)
+Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
{
string hash(8, 0);
- update_hash(hash, from);
+ if(include[0]=='\"')
+ update_hash(hash, from.str());
for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
update_hash(hash, *i);
if(cxx_ver.empty())
{
StringList argv;
- argv.push_back(get_architecture(arch).get_tool("CXX"));
+ argv.push_back(current_arch->get_tool("CXX"));
argv.push_back("--version");
- cxx_ver=Regex(" ([0-9.]+) ").match(run_command(argv))[1].str;
- while(!cxx_ver.empty() && !exists(Path("/usr/include/c++")/cxx_ver))
+ cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
+ while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
{
unsigned dot=cxx_ver.rfind('.');
if(dot==string::npos)
cxx_ver.erase(dot);
}
if(verbose>=5)
- cout<<"C++ version is "<<cxx_ver<<'\n';
+ IO::print("C++ version is %s\n", cxx_ver);
}
string fn=include.substr(1);
if(verbose>=5)
- cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
+ IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end()));
StringList syspath;
- if(include[0]=='\"')
- syspath.push_back(from);
- if(arch=="native")
+ if(current_arch->is_native())
syspath.push_back("/usr/include");
else
- syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
- syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
+ syspath.push_back("/usr/"+current_arch->get_prefix()+"/include");
+ syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
Target *tgt=0;
- for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
- tgt=get_header(Path(*j)/fn);
+ if(include[0]=='\"')
+ tgt=get_header(FS::Path(from)/fn);
for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
tgt=get_header(cwd/ *j/fn);
+ for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_header(FS::Path(*j)/fn);
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)
+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;
+ string id=hash+string(1, mode)+lib;
TargetMap::iterator i=libraries.find(id);
if(i!=libraries.end())
return i->second;
StringList syspath;
- if(arch=="native")
+ if(current_arch->is_native())
{
syspath.push_back("/lib");
syspath.push_back("/usr/lib");
}
else
- syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
+ syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib");
if(verbose>=5)
- cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
+ IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
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);
+ tgt=get_library(lib, cwd/ *j, mode);
+ for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_library(lib, *j, mode);
libraries.insert(TargetMap::value_type(id, tgt));
{
ArchMap::const_iterator i=archs.find(arch);
if(i==archs.end())
- throw InvalidParameterValue("Unknown architecture");
+ throw KeyError("Unknown architecture", arch);
return i->second;
}
problems.push_back(Problem(p, d));
}
-/**
-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()
+void Builder::usage(const char *reason, const char *argv0, bool brief)
{
- if(load_build_file(cwd/build_file))
- {
- cerr<<"No build info here.\n";
- return 1;
- }
-
- main_pkg->configure(cmdline_options, conf_all?2:1);
+ if(reason)
+ IO::print(IO::cerr, "%s\n", reason);
- if(help)
+ if(brief)
+ IO::print(IO::cerr, "Usage: %s\n", usagemsg);
+ else
{
- usage(0, "builder", false);
- cout<<'\n';
- package_help();
- return 0;
+ IO::print(IO::cerr, "Usage: %s [options] [<target> ...]\n\n", argv0);
+ IO::print(IO::cerr, "Options:\n");
+ IO::print(IO::cerr, helpmsg);
}
+}
- if(!conf_only && create_targets())
- return 1;
-
- PackageList all_reqs=main_pkg->collect_requires();
-
- for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
- {
- SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
- string prob;
- if(spkg && spkg->get_arch()!=main_pkg->get_arch())
- problem(spkg->get_name(), format("wrong architecture (%s)", spkg->get_arch()));
- }
+FS::Path Builder::get_package_location(const string &name)
+{
+ if(verbose>=3)
+ IO::print("Looking for package %s\n", name);
- if(conf_only)
- return 0;
+ // Try to get source directory with pkgconfig
+ list<string> argv;
+ argv.push_back("pkg-config");
+ argv.push_back("--variable=source");
+ argv.push_back(name);
+ if(verbose>=4)
+ IO::print("Running %s\n", join(argv.begin(), argv.end()));
+ string srcdir=strip(run_command(argv));
+ if(!srcdir.empty())
+ return srcdir;
- cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
- if(verbose>=2)
+ if(pkg_dirs.empty())
{
- for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
{
- cout<<' '<<(*i)->get_name();
- if(dynamic_cast<SourcePackage *>(*i))
- cout<<'*';
- unsigned count=0;
- unsigned ood_count=0;
- for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
- if(j->second->get_package()==*i)
- {
- ++count;
- if(j->second->get_rebuild())
- ++ood_count;
- }
- if(count)
+ list<string> files=list_files(*i);
+ for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
{
- cout<<" ("<<count<<" targets";
- if(ood_count)
- cout<<", "<<ood_count<<" out-of-date";
- cout<<')';
+ FS::Path full=*i / *j;
+ if(FS::exists(full/"Build"))
+ pkg_dirs.push_back(full);
}
- cout<<'\n';
}
+ if(verbose>=3)
+ IO::print("%d packages found in path\n", pkg_dirs.size());
}
- if(analyzer)
- analyzer->analyze();
-
- if(!problems.empty())
+ bool msp=!name.compare(0, 3, "msp");
+ for(list<FS::Path>::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
{
- cerr<<"The following problems were detected:\n";
- for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
- cerr<<" "<<i->package<<": "<<i->descr<<'\n';
- cerr<<"Please fix them and try again.\n";
- return 1;
- }
+ string base=basename(*i);
+ unsigned dash=base.rfind('-');
- //if(create_makefile
-
- if(clean)
- exit_code=do_clean();
- else if(build)
- exit_code=do_build();
+ if(!base.compare(0, dash, name))
+ return *i;
+ else if(msp && !base.compare(0, dash-3, name, 3, string::npos))
+ return *i;
+ }
- return exit_code;
+ return FS::Path();
}
-Builder::~Builder()
+int Builder::load_build_file(const FS::Path &fn)
{
- 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
+ try
{
- 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"
- " -P, --progress Display progress while building.\n"
- " -W, --what-if FILE Pretend that FILE has changed.\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.
+ IO::BufferedFile in(fn.str());
-@param fn Path to the file
+ if(verbose>=3)
+ IO::print("Reading %s\n", fn);
-@return 0 on success, -1 if the file could not be opened
-*/
-int Builder::load_build_file(const Path &fn)
-{
- ifstream in(fn.str().c_str());
- if(!in)
+ DataFile::Parser parser(in, fn.str());
+ Loader loader(*this, fn.subpath(0, fn.size()-1));
+ loader.load(parser);
+ }
+ catch(const IO::FileNotFound &)
+ {
return -1;
-
- if(verbose>=3)
- cout<<"Reading "<<fn<<'\n';
-
- 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");
PkgConfig *pc=new PkgConfig(*this, *spkg);
install->add_depend(new Install(*this, *spkg, *pc));
}
-
- tarballs->add_depend(new TarBall(*this, *spkg));
}
// Find dependencies until no new targets are created
Target *tgt=get_target((cwd/ *i).str());
if(!tgt)
{
- cerr<<"Unknown what-if target "<<*i<<'\n';
+ IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
return -1;
}
tgt->touch();
tgt=get_target((cwd/ *i).str());
if(!tgt)
{
- cerr<<"I don't know anything about "<<*i<<'\n';
+ IO::print("I don't know anything about %s\n", *i);
return -1;
}
if(tgt==world)
}
/* 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. */
+ and prepare world. I don't really like this, but it keeps the graph
+ acyclic.
+
+ XXX Could we skip preparing targets we are not interested in? */
if(build_world)
cmdline->prepare();
else
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 &fn)
+Target *Builder::get_header(const Msp::FS::Path &fn)
{
Target *tgt=get_target(fn.str());
if(tgt) return tgt;
- if(exists(fn))
+ if(FS::is_reg(fn))
{
tgt=new SystemHeader(*this, fn.str());
return tgt;
return 0;
}
-Target *Builder::get_library(const string &lib, const string &arch, const Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode)
{
// Populate a list of candidate filenames
StringList candidates;
if(mode!=ALL_STATIC)
{
- if(arch=="win32")
+ if(current_arch->get_name()=="win32")
+ {
candidates.push_back("lib"+lib+".dll");
+ candidates.push_back(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")
+ if(current_arch->get_name()=="win32")
candidates.push_back("lib"+lib+".dll.a");
for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
if(tgt)
{
Target *real_tgt=tgt;
- if(dynamic_cast<Install *>(tgt))
- real_tgt=real_tgt->get_depends().front();
+ if(Install *inst=dynamic_cast<Install *>(tgt))
+ real_tgt=&inst->get_source();
/* Ignore dynamic libraries from local packages unless library mode is
DYNAMIC */
else if(tgt)
return tgt;
}
- else if(exists(full))
+ else if(FS::is_reg(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)
- 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");
unsigned total=cmdline->count_rebuild();
if(!total)
{
- cout<<"Already up to date\n";
+ IO::print("Already up to date\n");
return 0;
}
- cout<<"Will build "<<total<<" target(s)\n";
+ if(verbose>=1)
+ IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : ""));
vector<Action *> actions;
actions.push_back(action);
if(show_progress)
- {
- cout<<count<<" of "<<total<<" targets built\033[1G";
- cout.flush();
- }
+ IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
}
else if(actions.empty())
finish=true;
}
if(show_progress)
- cout<<"\033[K";
+ IO::print("\033[K");
if(fail)
- cout<<"Build failed\n";
+ IO::print("Build failed\n");
else if(show_progress)
- cout<<"Build complete\n";
+ IO::print("Build complete\n");
- 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
}
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))
+ {
+ Action *action=new Unlink(*this, *ft);
+ while(action->check()<0) ;
+ delete action;
+ }
return 0;
}
-/**
-Prints out information about the default package.
-*/
void Builder::package_help()
{
const Config &config=main_pkg->get_config();
const Config::OptionMap &options=config.get_options();
- cout<<"Required packages:\n ";
+ 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";
+ 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 &s):
+Builder::Loader::Loader(Builder &b, const FS::Path &s):
bld(b),
src(s)
{
void Builder::Loader::profile(const string &n)
{
StringMap prf;
- load_sub<ProfileLoader>(prf);
+ ProfileLoader ldr(prf);
+ load_sub_with(ldr);
bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
}
projects / builder.git / blobdiff