X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=07007f61bd75c82ae9f80d5e35315e29b7374b23;hb=d9028dec3b81c84560c580008fa68490f049e723;hp=d598a9f5cb2caa8bc6e5f8d238bdaad9c0ddd86a;hpb=23477a725988c3c896c2853c2417054c1310dabc;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index d598a9f..07007f6 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -16,11 +16,13 @@ #include "binarypackage.h" #include "builder.h" #include "copy.h" +#include "datatool.h" #include "gnuarchiver.h" #include "gnuccompiler.h" #include "gnucxxcompiler.h" #include "gnulinker.h" #include "installedfile.h" +#include "mingwdlltool.h" #include "package.h" #include "pkgconfiggenerator.h" #include "sharedlibrary.h" @@ -34,10 +36,10 @@ using namespace Msp; Builder::Builder(int argc, char **argv): package_manager(*this), - main_pkg(0), native_arch(*this, string()), build_type(0), vfs(*this), + build_graph(*this), analyzer(0), build(false), clean(0), @@ -56,7 +58,6 @@ Builder::Builder(int argc, char **argv): string work_dir; bool full_paths = false; unsigned max_depth = 4; - StringList cmdline_warn; string prfx; string temp_str; string arch; @@ -145,19 +146,20 @@ Builder::Builder(int argc, char **argv): { string::size_type equal = i->find('='); if(equal!=string::npos) - cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1))); + cmdline_options.insert(Config::InputOptions::value_type(i->substr(0, equal), i->substr(equal+1))); else cmdline_targets.push_back(*i); } - if(cmdline_targets.empty()) - cmdline_targets.push_back("default"); - if(!work_dir.empty()) FS::chdir(work_dir); cwd = FS::getcwd(); + package_manager.append_package_path(cwd); + package_manager.append_package_path(cwd/".."); + package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder")); + package_manager.set_no_externals(no_externals); if(arch.empty()) @@ -200,12 +202,13 @@ Builder::Builder(int argc, char **argv): toolchain.add_tool(new Copy(*this)); toolchain.add_tool(new Tar(*this)); toolchain.add_tool(new PkgConfigGenerator(*this)); + if(current_arch->get_system()=="windows") + toolchain.add_tool(new MingwDllTool(*this, *current_arch)); + toolchain.add_tool(new DataTool(*this)); } Builder::~Builder() { - for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) - delete i->second; delete analyzer; } @@ -256,7 +259,7 @@ int Builder::main() list package_details; for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { - if(!i->second || !i->second->is_prepared()) + if(!i->second->is_prepared()) continue; string line = i->second->get_name(); @@ -266,7 +269,8 @@ int Builder::main() unsigned count = 0; unsigned to_be_built = 0; - for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j) + const BuildGraph::TargetMap &targets = build_graph.get_targets(); + for(BuildGraph::TargetMap::const_iterator j=targets.begin(); j!=targets.end(); ++j) if(j->second->get_package()==i->second) { ++count; @@ -285,7 +289,7 @@ int Builder::main() package_details.push_back(line); } - logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size())); + logger.log("summary", format("%d active packages, %d targets", package_details.size(), build_graph.get_targets().size())); for(list::const_iterator i=package_details.begin(); i!=package_details.end(); ++i) logger.log("packages", *i); @@ -310,32 +314,11 @@ int Builder::main() return exit_code; } -Target *Builder::get_target(const string &n) const -{ - TargetMap::const_iterator i = targets.find(n); - if(i!=targets.end()) - return i->second; - return 0; -} - 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::add_primary_target(Target &t) -{ - get_target("world")->add_dependency(t); - - if(t.get_package()==main_pkg && t.get_component() && t.get_component()->is_default()) - get_target("default")->add_dependency(t); -} - void Builder::usage(const char *reason, const char *argv0, bool brief) { if(reason) @@ -365,24 +348,12 @@ void Builder::load_build_file(const FS::Path &fn) bool Builder::prepare_build() { - Target *world = new VirtualTarget(*this, "world"); - - Target *def_tgt = new VirtualTarget(*this, "default"); - world->add_dependency(*def_tgt); - - Target *install = new VirtualTarget(*this, "install"); - world->add_dependency(*install); + package_manager.get_main_package().prepare(); - Target *tarballs = new VirtualTarget(*this, "tarballs"); - world->add_dependency(*tarballs); - - main_pkg->prepare(); - - // Make the cmdline target depend on all targets mentioned on the command line - Target *cmdline = new VirtualTarget(*this, "cmdline"); - for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) + // Add targets from command line as goals + for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) { - Target *tgt = get_target(*i); + Target *tgt = build_graph.get_target(*i); if(!tgt) tgt = vfs.get_target(*i); if(!tgt) @@ -393,13 +364,13 @@ bool Builder::prepare_build() return false; } - cmdline->add_dependency(*tgt); + build_graph.add_goal(*tgt); } - cmdline->prepare(); + build_graph.prepare(); // Apply what-ifs - for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i) + for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i) { FileTarget *tgt = vfs.get_target(cwd/ *i); if(!tgt) @@ -411,11 +382,7 @@ bool Builder::prepare_build() } if(build_all) - { - for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) - if(i->second->is_buildable() && !i->second->needs_rebuild()) - i->second->force_rebuild(); - } + build_graph.force_full_rebuild(); if(!dry_run) { @@ -429,12 +396,7 @@ bool Builder::prepare_build() int Builder::do_build() { - Target *cmdline = get_target("cmdline"); - - unsigned total = 0; - for(map::const_iterator i=targets.begin(); i!=targets.end(); ++i) - if(i->second->is_buildable() && i->second->needs_rebuild()) - ++total; + unsigned total = build_graph.count_rebuild_targets(); if(!total) { @@ -455,7 +417,7 @@ int Builder::do_build() { if(tasks.size()get_buildable_target(); + Target *tgt = build_graph.get_buildable_target(); if(tgt) { if(tgt->get_tool()) @@ -535,14 +497,14 @@ int Builder::do_clean() set clean_tgts; list queue; - queue.push_back(get_target("cmdline")); + queue.push_back(build_graph.get_target("cmdline")); while(!queue.empty()) { Target *tgt = queue.front(); queue.erase(queue.begin()); - if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2)) + if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || clean>=2)) clean_tgts.insert(tgt); const Target::Dependencies &deps = tgt->get_dependencies(); @@ -563,12 +525,13 @@ int Builder::do_clean() void Builder::package_help() { - const Config &config = main_pkg->get_config(); + SourcePackage &main_pkg = dynamic_cast(package_manager.get_main_package()); + 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_required_packages(); - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) + const Package::Requirements &requires = main_pkg.get_required_packages(); + for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) { if(i!=requires.begin()) IO::print(", "); @@ -628,10 +591,8 @@ void Builder::Loader::profile(const string &) void Builder::Loader::package(const string &n) { SourcePackage *pkg = new SourcePackage(obj, n, get_source()); - if(!obj.main_pkg) - obj.main_pkg = pkg; - if(obj.conf_all || pkg==obj.main_pkg) + if(obj.conf_all || pkg==&obj.package_manager.get_main_package()) load_sub(*pkg, obj.cmdline_options); else load_sub(*pkg);