#include <set>
#include <msp/core/error.h>
#include <msp/core/getopt.h>
-#include <msp/parser/parser.h>
+#include <msp/datafile/parser.h>
#include <msp/path/utils.h>
+#include <msp/strings/formatter.h>
#include <msp/strings/utils.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
#include "action.h"
#include "analyzer.h"
+#include "binarypackage.h"
#include "builder.h"
#include "header.h"
#include "install.h"
#include "package.h"
#include "pkgconfig.h"
#include "sharedlibrary.h"
+#include "sourcepackage.h"
#include "systemlibrary.h"
+#include "tarball.h"
#include "unlink.h"
#include "virtualtarget.h"
using namespace Msp;
Builder::Builder(int argc, char **argv):
+ main_pkg(0),
analyzer(0),
build(false),
clean(0),
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"));
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());
}
/**
}
// 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;
}
}
}
+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.
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)
{
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<SourcePackage *>(*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<<" "<<i->first<<": "<<i->second<<'\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;
}
if(conf_only)
return 0;
- if(create_targets())
- return 1;
-
- cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
+ cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
if(verbose>=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<<' '<<i->second->get_name();
- if(i->second->get_buildable())
+ 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->second)
+ if(j->second->get_package()==*i)
{
++count;
if(j->second->get_rebuild())
if(!in)
return -1;
- Parser::Parser parser(in, fn.str());
+ 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);
Target *install=new VirtualTarget(*this, "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<SourcePackage *>(*i);
+ 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
world->prepare();
}
+ for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+ if(SourcePackage *spkg=dynamic_cast<SourcePackage *>(i->second))
+ spkg->get_deps_cache().save();
+
return 0;
}
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();
*/
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<<i->get_name();
+ cout<<(*i)->get_name();
}
cout<<"\n\n";
cout<<"Package configuration:\n";
Application::RegApp<Builder> 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<ProfileLoader>(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));
+}
projects / builder.git / blobdiff