X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=d4669520abd93fd7aabaf4b9b1ba7cf2bfc690ac;hb=1968c546cfb30214e8dc5afc722bec14aa8373f5;hp=ccfb407276ee1a619b1bf85e1869a7acd75eab0a;hpb=55b6c1dba6f02a399d98080c23a75098e8a080f7;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index ccfb407..d466952 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,26 +1,34 @@ +/* $Id$ + +This file is part of builder +Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Distributed under the LGPL +*/ + #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 "executable.h" #include "header.h" #include "install.h" #include "misc.h" -#include "objectfile.h" #include "package.h" #include "pkgconfig.h" #include "sharedlibrary.h" -#include "staticlibrary.h" +#include "sourcepackage.h" #include "systemlibrary.h" +#include "tarball.h" #include "unlink.h" #include "virtualtarget.h" @@ -28,6 +36,7 @@ using namespace std; using namespace Msp; Builder::Builder(int argc, char **argv): + main_pkg(0), analyzer(0), build(false), clean(0), @@ -107,8 +116,6 @@ Builder::Builder(int argc, char **argv): 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")); @@ -117,24 +124,9 @@ Builder::Builder(int argc, char **argv): 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")); - } + const char *home=getenv("HOME"); + if(home) + load_build_file((Path::Path(home)/".builderrc").str()); } /** @@ -179,10 +171,12 @@ Package *Builder::get_package(const string &n) } // Package source not found - create a binary package - Package *pkg=Package::create(*this, n); + Package *pkg=BinaryPackage::from_pkgconfig(*this, n); + packages.insert(PackageMap::value_type(n, pkg)); - if(pkg) - new_pkgs.push_back(pkg); + + if(!pkg) + problem(n, "not found"); return pkg; } @@ -190,9 +184,9 @@ Package *Builder::get_package(const string &n) /** Returns the target with the given name, or 0 if no such target exists. */ -Target *Builder::get_target(const string &n) +Target *Builder::get_target(const string &n) const { - TargetMap::iterator i=targets.find(n); + TargetMap::const_iterator i=targets.find(n); if(i!=targets.end()) return i->second; return 0; @@ -321,6 +315,21 @@ void Builder::apply_profile_template(Config &config, const string &pt) const } } +void Builder::problem(const string &p, const string &d) +{ + 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() { if(load_build_file(cwd/build_file)) @@ -329,16 +338,7 @@ int Builder::main() return 1; } - default_pkg=packages.begin()->second; - - while(!new_pkgs.empty()) - { - Package *pkg=new_pkgs.front(); - new_pkgs.erase(new_pkgs.begin()); - pkg->resolve_refs(); - } - - default_pkg->configure(cmdline_options, conf_all?2:1); + main_pkg->configure(cmdline_options, conf_all?2:1); if(help) { @@ -348,23 +348,24 @@ int Builder::main() return 0; } - StringMap problems; - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + 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(*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(spkg && spkg->get_arch()!=main_pkg->get_arch()) + problem(spkg->get_name(), format("wrong architecture (%s)", spkg->get_arch())); } if(!problems.empty()) { cerr<<"The following problems were detected:\n"; - for(StringMap::iterator i=problems.begin(); i!=problems.end(); ++i) - cerr<<" "<first<<": "<second<<'\n'; + for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i) + cerr<<" "<package<<": "<descr<<'\n'; cerr<<"Please fix them and try again.\n"; return 1; } @@ -372,21 +373,18 @@ int Builder::main() if(conf_only) return 0; - if(create_targets()) - return 1; - - cout<=2) { - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { - cout<<' '<second->get_name(); - if(i->second->get_buildable()) + cout<<' '<<(*i)->get_name(); + if(dynamic_cast(*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->second) + if(j->second->get_package()==*i) { ++count; if(j->second->get_rebuild()) @@ -471,7 +469,10 @@ int Builder::load_build_file(const Path::Path &fn) if(!in) return -1; - Parser::Parser parser(in, fn.str()); + if(verbose>=3) + cout<<"Reading "<add_depend(def_tgt); Target *install=new VirtualTarget(*this, "install"); - add_target(install); world->add_depend(install); - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + Target *tarballs=new VirtualTarget(*this, "tarballs"); + world->add_depend(tarballs); + + PackageList all_reqs=main_pkg->collect_requires(); + for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { - if(!i->second) - continue; - if(!i->second->get_buildable()) + SourcePackage *spkg=dynamic_cast(*i); + if(!spkg) continue; - Path::Path inst_base; - if(i->second->get_buildable() && i->second->get_install_flags()) - inst_base=i->second->get_prefix(); - - const ComponentList &components=i->second->get_components(); + const ComponentList &components=spkg->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) - { - // 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 sfiles=list_files(*k); - for(list::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 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); - } - } - } + j->create_targets(); - if(build_exe) - { - Executable *exe=0; - StaticLibrary *slib=0; - if(j->get_type()==Component::LIBRARY) - { - exe=new SharedLibrary(*this, *j, objs); - slib=new StaticLibrary(*this, *j, objs); - add_target(slib); - } - else - exe=new Executable(*this, *j, objs); - - add_target(exe); - if(i->second==default_pkg) - { - def_tgt->add_depend(exe); - if(slib) def_tgt->add_depend(slib); - } - else - { - world->add_depend(exe); - if(slib) world->add_depend(slib); - } - - if(j->get_install()) - { - string inst_dir; - if(j->get_type()==Component::PROGRAM) - inst_dir="bin"; - else if(j->get_type()==Component::LIBRARY) - inst_dir="lib"; - if(!inst_dir.empty()) - { - Install *inst=new Install(*this, *i->second, *exe, (inst_base/inst_dir/Path::basename(exe->get_name())).str()); - add_target(inst); - install->add_depend(inst); - - if(slib) - { - inst=new Install(*this, *i->second, *slib, (inst_base/inst_dir/Path::basename(slib->get_name())).str()); - add_target(inst); - install->add_depend(inst); - } - } - } - } - } - - if(i->second->get_install_flags()&(Package::LIB|Package::INCLUDE)) + if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::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); + 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 @@ -648,8 +542,7 @@ int Builder::create_targets() // Make the cmdline target depend on all targets mentioned on the command line Target *cmdline=new VirtualTarget(*this, "cmdline"); - add_target(cmdline); - world->add_depend(cmdline); + bool build_world=false; for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) { Target *tgt=get_target(*i); @@ -660,10 +553,25 @@ int Builder::create_targets() cerr<<"I don't know anything about "<<*i<<'\n'; return -1; } + if(tgt==world) + build_world=true; cmdline->add_depend(tgt); } - world->prepare(); + /* If world is to be built, prepare cmdline. If not, add cmdline to world + and prepare world. I don't really like this, but it keeps the graph + acyclic. */ + if(build_world) + cmdline->prepare(); + else + { + world->add_depend(cmdline); + world->prepare(); + } + + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + if(SourcePackage *spkg=dynamic_cast(i->second)) + spkg->get_deps_cache().save(); return 0; } @@ -679,7 +587,7 @@ Target *Builder::get_header(const Msp::Path::Path &fn) if(Path::exists(fn)) { - add_target(tgt=new SystemHeader(*this, fn.str())); + tgt=new SystemHeader(*this, fn.str()); return tgt; } return 0; @@ -725,7 +633,6 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path:: else if(Path::exists(full)) { tgt=new SystemLibrary(*this, full); - add_target(tgt); return tgt; } } @@ -733,15 +640,6 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path:: 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. */ @@ -845,7 +743,7 @@ int Builder::do_clean() Target *tgt=queue.front(); queue.erase(queue.begin()); - if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2)) + if(tgt->get_buildable() && (tgt->get_package()==main_pkg || clean>=2)) clean_tgts.insert(tgt); const TargetList &deps=tgt->get_depends(); @@ -869,16 +767,16 @@ Prints out information about the default package. */ void Builder::package_help() { - const Config &config=default_pkg->get_config(); + 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) + const PackageList &requires=main_pkg->get_requires(); + for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { if(i!=requires.begin()) cout<<", "; - cout<get_name(); + cout<<(*i)->get_name(); } cout<<"\n\n"; cout<<"Package configuration:\n"; @@ -891,18 +789,54 @@ void Builder::package_help() Application::RegApp Builder::reg; + Builder::Loader::Loader(Builder &b, const Path::Path &s): bld(b), src(s) { + add("architecture", &Loader::architecture); + add("binary_package", &Loader::binpkg); + add("profile", &Loader::profile); add("package", &Loader::package); } +void Builder::Loader::architecture(const string &a, const string &p) +{ + bld.archs.insert(StringMap::value_type(a, p)); +} + +void Builder::Loader::binpkg(const string &n) +{ + BinaryPackage *pkg=new BinaryPackage(bld, n); + load_sub(*pkg); + bld.packages.insert(PackageMap::value_type(n, pkg)); +} + +void Builder::Loader::profile(const string &n) +{ + StringMap prf; + load_sub(prf); + bld.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(bld, n, src); + if(!bld.main_pkg) + bld.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)); +}