X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=6ee210177f32a077935223d17203d924da9d45dd;hb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;hp=553a3e159afbe01e7487ad35b6cf337ae909974c;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 553a3e1..6ee2101 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -10,13 +10,14 @@ Distributed under the LGPL #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" @@ -24,7 +25,9 @@ Distributed under the LGPL #include "package.h" #include "pkgconfig.h" #include "sharedlibrary.h" +#include "sourcepackage.h" #include "systemlibrary.h" +#include "tarball.h" #include "unlink.h" #include "virtualtarget.h" @@ -32,6 +35,7 @@ using namespace std; using namespace Msp; Builder::Builder(int argc, char **argv): + default_pkg(0), analyzer(0), build(false), clean(0), @@ -111,8 +115,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")); @@ -121,24 +123,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()); } /** @@ -183,10 +170,9 @@ 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); return pkg; } @@ -343,15 +329,6 @@ 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); if(help) @@ -365,11 +342,12 @@ int Builder::main() StringMap problems; for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) { + SourcePackage *spkg=dynamic_cast(i->second); 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()+")"; + else if(spkg && spkg->get_arch()!=default_pkg->get_arch()) + prob="wrong architecture ("+spkg->get_arch()+")"; if(!prob.empty()) problems.insert(StringMap::value_type(i->first, prob)); } @@ -395,7 +373,7 @@ int Builder::main() for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) { cout<<' '<second->get_name(); - if(i->second->get_buildable()) + if(dynamic_cast(i->second)) cout<<'*'; unsigned count=0; unsigned ood_count=0; @@ -485,7 +463,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(install); + Target *tarballs=new VirtualTarget(*this, "tarballs"); + world->add_depend(tarballs); + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) { - if(!i->second) - continue; - if(!i->second->get_buildable()) + SourcePackage *spkg=dynamic_cast(i->second); + if(!spkg) continue; - const ComponentList &components=i->second->get_components(); + const ComponentList &components=spkg->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) j->create_targets(); - 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); - install->add_depend(new Install(*this, *i->second, *pc)); + 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 @@ -577,6 +562,10 @@ int Builder::create_targets() 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; } @@ -775,12 +764,12 @@ void Builder::package_help() 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=default_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"; @@ -793,18 +782,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.default_pkg) + bld.default_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)); +}