X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=63323310c5226d152b2e064b58c1df4ff099069f;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=ce82ba33351f191f1055eae0a053c915247a2053;hpb=a32de1c2e19b886050d73eb557bc8d0f4b892cff;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index ce82ba3..6332331 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,80 +1,71 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include #include -#include -#include #include #include #include #include #include #include -#include #include #include -#include +#include #include #include #include #include -#include "action.h" #include "analyzer.h" #include "binarypackage.h" #include "builder.h" -#include "header.h" -#include "install.h" -#include "misc.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 "sourcepackage.h" -#include "systemlibrary.h" -#include "unlink.h" +#include "tar.h" +#include "task.h" #include "virtualtarget.h" using namespace std; using namespace Msp; -namespace { - -void update_hash(string &hash, const string &value) -{ - for(unsigned i=0; i log_channels; + string build_type_name; GetOpt getopt; getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG).set_help("Perform analysis. MODE can be deps, alldeps or rebuild.", "MODE"); @@ -83,8 +74,12 @@ Builder::Builder(int argc, char **argv): 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('t', "build-type", build_type_name, GetOpt::REQUIRED_ARG).set_help("Set build type.", "TYPE"); 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"); @@ -95,14 +90,50 @@ Builder::Builder(int argc, char **argv): 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( "tempdir", temp_str, GetOpt::REQUIRED_ARG).set_help("Store temporary files in DIR.", "DIR"); getopt.add_option( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST"); - usagemsg=getopt.generate_usage(argv[0])+" [ ...]"; - helpmsg=getopt.generate_help(); + usagemsg = getopt.generate_usage(argv[0])+" [ ...]"; + 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("environment"); + 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::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i) + { + vector parts = split(*i, ','); + for(vector::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); @@ -113,18 +144,18 @@ Builder::Builder(int argc, char **argv): 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 vector &args=getopt.get_args(); + const vector &args = getopt.get_args(); for(vector::const_iterator i=args.begin(); i!=args.end(); ++i) { - string::size_type 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 @@ -137,37 +168,38 @@ Builder::Builder(int argc, char **argv): if(!work_dir.empty()) FS::chdir(work_dir); - cwd=FS::getcwd(); + cwd = FS::getcwd(); - utsname un; - string sysname="native"; - if(uname(&un)==0) - sysname=tolower(un.sysname); + package_manager.set_no_externals(no_externals); - 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"); + if(arch.empty()) + current_arch = &native_arch; + else + current_arch = new Architecture(*this, arch); load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str()); load_build_file((FS::get_user_data_dir("builder")/"rc").str()); - if(arch.empty()) - current_arch=native_arch; - else - current_arch=&get_architecture(arch); - if(prfx.empty()) { if(current_arch->is_native()) - prefix=(FS::get_home_dir()/"local").str(); + prefix = (FS::get_home_dir()/"local").str(); else - prefix=(FS::get_home_dir()/"local"/current_arch->get_name()).str(); + prefix = (FS::get_home_dir()/"local"/current_arch->get_name()).str(); } else - prefix=FS::getcwd()/prfx; + prefix = FS::getcwd()/prfx; + + if(!temp_str.empty()) + tempdir = temp_str; + + if(!build_type_name.empty()) + { + BuildTypeMap::iterator i = build_types.find(build_type_name); + if(i==build_types.end()) + throw usage_error("Unknown build type"); + build_type = &i->second; + } warnings.push_back("all"); warnings.push_back("extra"); @@ -176,18 +208,21 @@ Builder::Builder(int argc, char **argv): warnings.push_back("error"); for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i) { - vector warns=split(*i, ','); + vector warns = split(*i, ','); warnings.insert(warnings.end(), warns.begin(), warns.end()); } - pkg_path.push_back(cwd/"."); - pkg_path.push_back(cwd/".."); + 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)); } Builder::~Builder() { - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - delete i->second; for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) delete i->second; delete analyzer; @@ -197,13 +232,13 @@ int Builder::main() { if(prefix.str()!="/usr") { - FS::Path pcdir=prefix/"lib"/"pkgconfig"; - if(const char *pcp=getenv("PKG_CONFIG_PATH")) + FS::Path pcdir = prefix/"lib"/"pkgconfig"; + if(const char *pcp = getenv("PKG_CONFIG_PATH")) { - vector path=split(pcp, ':'); - bool found=false; + vector path = split(pcp, ':'); + bool found = false; for(vector::const_iterator i=path.begin(); (!found && i!=path.end()); ++i) - found=(*i==pcdir.str()); + found = (*i==pcdir.str()); if(!found) { path.push_back(pcdir.str()); @@ -238,45 +273,59 @@ int Builder::main() 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) + if(create_targets()) + return 1; + + 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)); + if(tempdir.is_absolute()) + logger.log("environment", format("Temporary directory is %s", tempdir)); + else + logger.log("environment", format("Using per-package temporary directory %s", tempdir)); + if(build_type) + logger.log("environment", format("Build type is %s", build_type->get_name())); + + const PackageManager::PackageMap &packages = package_manager.get_packages(); + list package_details; + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { - for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + if(!i->second || !i->second->is_configured()) + continue; + + string line = i->second->get_name(); + if(dynamic_cast(i->second)) { - IO::print(" %s", (*i)->get_name()); - if(dynamic_cast(*i)) - IO::print("*"); - unsigned count=0; - unsigned to_be_built=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) + if(j->second->get_package()==i->second) { ++count; - if(j->second->get_rebuild()) + if(j->second->needs_rebuild()) ++to_be_built; } if(count) { - IO::print(" (%d targets", count); + line += format(" (%d targets", count); if(to_be_built) - IO::print(", %d to be built", to_be_built); - IO::print(")"); + line += format(", %d to be built", to_be_built); + line += ')'; } - IO::print("\n"); } + + package_details.push_back(line); } + logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size())); + for(list::const_iterator i=package_details.begin(); i!=package_details.end(); ++i) + logger.log("packages", *i); + if(analyzer) analyzer->analyze(); @@ -291,198 +340,21 @@ int Builder::main() } if(clean) - exit_code=do_clean(); + exit_code = do_clean(); else if(build) - exit_code=do_build(); + exit_code = do_build(); return exit_code; } -string Builder::run_pkgconfig(const string &pkg, const string &what) -{ - list argv; - argv.push_back("pkg-config"); - if(what=="cflags" || what=="libs") - argv.push_back("--"+what); - else if(what=="flags") - { - argv.push_back("--cflags"); - argv.push_back("--libs"); - } - else - argv.push_back("--variable="+what); - argv.push_back(pkg); - - if(verbose>=4) - IO::print("Running %s\n", join(argv.begin(), argv.end())); - - int status; - string res=run_command(argv, &status); - if(status) - throw Exception(format("pkg-config for package %s failed", pkg)); - - return res; -} - -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 *pkg=0; - try - { - // Package source not found - create a binary package - pkg=BinaryPackage::from_pkgconfig(*this, name); - } - catch(...) - { - problem(name, "not found"); - } - - packages.insert(PackageMap::value_type(name, pkg)); - - return pkg; -} - 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); + TargetMap::const_iterator i = targets.find(n); if(i!=targets.end()) return i->second; return 0; } -Target *Builder::get_header(const string &include, const FS::Path &from, const list &path) -{ - string hash(8, 0); - if(include[0]=='\"') - update_hash(hash, from.str()); - for(list::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; - - static string cxx_ver; - if(cxx_ver.empty()) - { - StringList argv; - argv.push_back(current_arch->get_tool("CXX")); - argv.push_back("--version"); - if(RegMatch m=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))) - { - cxx_ver=m[0].str; - while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver)) - { - string::size_type dot=cxx_ver.rfind('.'); - if(dot==string::npos) - break; - cxx_ver.erase(dot); - } - if(verbose>=5) - IO::print("C++ version is %s\n", cxx_ver); - } - else - cxx_ver="-"; - } - - string fn=include.substr(1); - if(verbose>=5) - IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end())); - - StringList syspath; - if(current_arch->is_native()) - syspath.push_back("/usr/include"); - else - syspath.push_back("/usr/"+current_arch->get_prefix()+"/include"); - if(cxx_ver!="-") - syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str()); - - Target *tgt=0; - if(include[0]=='\"') - tgt=get_header(FS::Path(from)/fn); - for(list::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) - tgt=get_header(cwd/ *j/fn); - for(list::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; -} - -Target *Builder::get_library(const string &lib, const list &path, LibMode mode) -{ - string hash(8, 0); - for(list::const_iterator i=path.begin(); i!=path.end(); ++i) - update_hash(hash, *i); - - string id=hash+string(1, mode)+lib; - TargetMap::iterator i=libraries.find(id); - if(i!=libraries.end()) - return i->second; - - StringList syspath; - if(current_arch->is_native()) - { - syspath.push_back("/lib"); - syspath.push_back("/usr/lib"); - } - else - syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib"); - - if(verbose>=5) - IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end())); - - Target *tgt=0; - for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) - 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)); - - return tgt; -} - -const Architecture &Builder::get_architecture(const string &arch) const -{ - ArchMap::const_iterator i=archs.find(arch); - if(i==archs.end()) - throw KeyError("Unknown architecture", arch); - - return i->second; -} - -void Builder::apply_profile_template(Config &config, const string &pt) const -{ - vector parts=split(pt, '-'); - - for(vector::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)); @@ -491,7 +363,6 @@ void Builder::problem(const string &p, const string &d) void Builder::add_target(Target *t) { targets.insert(TargetMap::value_type(t->get_name(), t)); - new_tgts.push_back(t); } void Builder::usage(const char *reason, const char *argv0, bool brief) @@ -510,211 +381,83 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) } } -FS::Path Builder::get_package_location(const string &name) -{ - if(verbose>=3) - IO::print("Looking for package %s\n", name); - - try - { - // Try to get source directory with pkgconfig - string srcdir=strip(run_pkgconfig(name, "source")); - if(!srcdir.empty()) - return srcdir; - } - catch(...) - { } - - if(pkg_dirs.empty()) - { - for(list::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) - { - list files=list_files(*i); - for(list::const_iterator j=files.begin(); j!=files.end(); ++j) - { - FS::Path full=*i / *j; - if(FS::exists(full/"Build")) - pkg_dirs.push_back(full); - } - } - if(verbose>=3) - IO::print("%d packages found in path\n", pkg_dirs.size()); - } - - bool msp=!name.compare(0, 3, "msp"); - for(list::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i) - { - string base=basename(*i); - unsigned dash=base.rfind('-'); - - if(!base.compare(0, dash, name)) - return *i; - else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) - return *i; - } - - return FS::Path(); -} - int Builder::load_build_file(const FS::Path &fn) { - try - { - IO::BufferedFile in(fn.str()); + if(!FS::exists(fn)) + return -1; - if(verbose>=3) - IO::print("Reading %s\n", fn); + IO::BufferedFile in(fn.str()); - DataFile::Parser parser(in, fn.str()); - Loader loader(*this, fn.subpath(0, fn.size()-1)); - loader.load(parser); - } - catch(const IO::FileNotFound &) - { - return -1; - } + 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; } int Builder::create_targets() { - Target *world=new VirtualTarget(*this, "world"); - - Target *def_tgt=new VirtualTarget(*this, "default"); - world->add_depend(def_tgt); + Target *world = new VirtualTarget(*this, "world"); - Target *install=new VirtualTarget(*this, "install"); - world->add_depend(install); + Target *def_tgt = new VirtualTarget(*this, "default"); + world->add_depend(*def_tgt); - Target *tarballs=new VirtualTarget(*this, "tarballs"); - world->add_depend(tarballs); + Target *install = new VirtualTarget(*this, "install"); + world->add_depend(*install); - PackageList all_reqs=main_pkg->collect_requires(); - for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) - { - SourcePackage *spkg=dynamic_cast(*i); - if(!spkg) - continue; + Target *tarballs = new VirtualTarget(*this, "tarballs"); + world->add_depend(*tarballs); - const ComponentList &components=spkg->get_components(); - for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) - j->create_targets(); - - if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE)) - { - PkgConfig *pc=new PkgConfig(*this, *spkg); - install->add_depend(new Install(*this, *spkg, *pc)); - } - } - - // Find dependencies until no new targets are created - while(!new_tgts.empty()) - { - Target *tgt=new_tgts.front(); - new_tgts.erase(new_tgts.begin()); - tgt->find_depends(); - if(!tgt->get_depends_ready()) - new_tgts.push_back(tgt); - } - - // Apply what-ifs - for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i) - { - Target *tgt=get_target((cwd/ *i).str()); - if(!tgt) - { - IO::print(IO::cerr, "Unknown what-if target %s\n", *i); - return -1; - } - tgt->touch(); - } + 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(); // Make the cmdline target depend on all targets mentioned on the command line - Target *cmdline=new VirtualTarget(*this, "cmdline"); - bool build_world=false; + Target *cmdline = new VirtualTarget(*this, "cmdline"); for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) { - Target *tgt=get_target(*i); + Target *tgt = get_target(*i); + if(!tgt) + tgt = vfs.get_target(*i); if(!tgt) - tgt=get_target((cwd/ *i).str()); + tgt = vfs.get_target(cwd/ *i); if(!tgt) { IO::print("I don't know anything about %s\n", *i); return -1; } - if(tgt==world) - build_world=true; - cmdline->add_depend(tgt); - } - - cmdline->prepare(); - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - if(SourcePackage *spkg=dynamic_cast(i->second)) - spkg->get_deps_cache().save(); - - return 0; -} - -Target *Builder::get_header(const FS::Path &fn) -{ - Target *tgt=get_target(fn.str()); - if(tgt) return tgt; - - if(FS::is_reg(fn)) - { - tgt=new SystemHeader(*this, fn.str()); - return tgt; + cmdline->add_depend(*tgt); } - return 0; -} -Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode) -{ - // Populate a list of candidate filenames - StringList candidates; + cmdline->prepare(); - if(mode!=ALL_STATIC) + // Apply what-ifs + for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i) { - if(current_arch->get_name()=="win32") + FileTarget *tgt = vfs.get_target(cwd/ *i); + if(!tgt) { - candidates.push_back("lib"+lib+".dll"); - candidates.push_back(lib+".dll"); + IO::print(IO::cerr, "Unknown what-if target %s\n", *i); + return -1; } - else - candidates.push_back("lib"+lib+".so"); + tgt->touch(); } - /* Static libraries are always considered, since sometimes shared versions - may not be available */ - candidates.push_back("lib"+lib+".a"); - if(current_arch->get_name()=="win32") - candidates.push_back("lib"+lib+".dll.a"); - - for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i) + if(build_all) { - string full=(path/ *i).str(); - Target *tgt=get_target(full); + for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) + if(i->second->is_buildable() && !i->second->needs_rebuild()) + i->second->force_rebuild(); + } - if(tgt) - { - Target *real_tgt=tgt; - if(Install *inst=dynamic_cast(tgt)) - real_tgt=&inst->get_source(); - - /* Ignore dynamic libraries from local packages unless library mode is - DYNAMIC */ - if(dynamic_cast(real_tgt) && mode!=DYNAMIC) - continue; - else if(tgt) - return tgt; - } - else if(FS::is_reg(full)) - { - tgt=new SystemLibrary(*this, full); - return tgt; - } + if(!dry_run) + { + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + i->second->save_caches(); } return 0; @@ -722,61 +465,74 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo int Builder::do_build() { - Target *cmdline=get_target("cmdline"); + Target *cmdline = get_target("cmdline"); - unsigned total=0; + unsigned total = 0; for(map::const_iterator i=targets.begin(); i!=targets.end(); ++i) - if(i->second->is_buildable() && i->second->get_rebuild()) + if(i->second->is_buildable() && i->second->needs_rebuild()) ++total; if(!total) { - IO::print("Already up to date\n"); + logger.log("summary", "Already up to date"); return 0; } - if(verbose>=1) - IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : "")); + logger.log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : ""))); - vector actions; + vector tasks; - unsigned count=0; + unsigned count = 0; - bool fail=false; - bool finish=false; + bool fail = false; + bool finish = false; while(!finish) { - if(actions.size()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; icheck(); - if(status>=0) + Task::Status status = tasks[i]->check(); + if(status!=Task::RUNNING) { ++count; - 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; @@ -786,9 +542,9 @@ int Builder::do_build() if(show_progress) IO::print("\033[K"); if(fail) - IO::print("Build failed\n"); + logger.log("summary", "Build failed"); else if(show_progress) - IO::print("Build complete\n"); + logger.log("summary", "Build complete"); return fail; } @@ -798,41 +554,38 @@ int Builder::do_clean() // Cleaning doesn't care about ordering, so a simpler method can be used set clean_tgts; - TargetList queue; + list queue; queue.push_back(get_target("cmdline")); while(!queue.empty()) { - Target *tgt=queue.front(); + Target *tgt = queue.front(); queue.erase(queue.begin()); 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::const_iterator i=deps.begin(); i!=deps.end(); ++i) if(!clean_tgts.count(*i)) queue.push_back(*i); } for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) - if(FileTarget *ft=dynamic_cast(*i)) - { - Action *action=new Unlink(*this, *ft); - while(action->check()<0) ; - delete action; - } + if(FileTarget *ft = dynamic_cast(*i)) + if(ft->get_mtime()) + FS::unlink(ft->get_path()); return 0; } void Builder::package_help() { - const Config &config=main_pkg->get_config(); - const Config::OptionMap &options=config.get_options(); + const Config &config = main_pkg->get_config(); + const Config::OptionMap &options = config.get_options(); IO::print("Required packages:\n "); - const PackageList &requires=main_pkg->get_requires(); + const PackageList &requires = main_pkg->get_requires(); for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { if(i!=requires.begin()) @@ -842,7 +595,7 @@ void Builder::package_help() IO::print("\n\nPackage configuration:\n"); for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i) { - const Config::Option &opt=i->second; + 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); @@ -850,61 +603,58 @@ void Builder::package_help() } } -Application::RegApp Builder::reg; string Builder::usagemsg; string Builder::helpmsg; Builder::Loader::Loader(Builder &b, const FS::Path &s): - bld(b), + DataFile::ObjectLoader(b), src(s) { add("architecture", &Loader::architecture); add("binary_package", &Loader::binpkg); + add("build_type", &Loader::build_type); add("profile", &Loader::profile); add("package", &Loader::package); } void Builder::Loader::architecture(const string &n) { - Architecture arch(bld, n); - load_sub(arch); - bld.archs.insert(ArchMap::value_type(n, arch)); + if(obj.current_arch->match_name(n)) + load_sub(*obj.current_arch); } void Builder::Loader::binpkg(const string &n) { - BinaryPackage *pkg=new BinaryPackage(bld, n); + BinaryPackage *pkg = new BinaryPackage(obj, n); load_sub(*pkg); - bld.packages.insert(PackageMap::value_type(n, pkg)); } -void Builder::Loader::profile(const string &n) +void Builder::Loader::build_type(const string &n) { - StringMap prf; - ProfileLoader ldr(prf); - load_sub_with(ldr); - bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf)); + BuildType btype(n); + load_sub(btype); + BuildTypeMap::iterator i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first; + if(!obj.build_type) + obj.build_type = &i->second; } -void Builder::Loader::package(const string &n) +void Builder::Loader::profile(const string &) { - SourcePackage *pkg=new SourcePackage(bld, n, src); - if(!bld.main_pkg) - bld.main_pkg=pkg; - - load_sub(*pkg); - bld.packages.insert(PackageMap::value_type(n, pkg)); + IO::print("Profiles are deprecated\n"); } - -Builder::ProfileLoader::ProfileLoader(StringMap &p): - profile(p) +void Builder::Loader::package(const string &n) { - add("option", &ProfileLoader::option); -} + SourcePackage *pkg = new SourcePackage(obj, n, src); + if(!obj.main_pkg) + obj.main_pkg = pkg; -void Builder::ProfileLoader::option(const string &o, const string &v) -{ - profile.insert(StringMap::value_type(o, v)); + if(obj.conf_all || pkg==obj.main_pkg) + load_sub(*pkg, obj.cmdline_options); + else + load_sub(*pkg); + + if(obj.build_type) + pkg->set_build_type(*obj.build_type); }