-#include <algorithm>
+#include <deque>
+#include <msp/core/algorithm.h>
#include <msp/fs/dir.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
-#include "booleanevaluator.h"
+#include <msp/strings/format.h>
#include "builder.h"
#include "component.h"
-#include "csourcefile.h"
-#include "datapack.h"
-#include "executable.h"
-#include "file.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
#include "sourcepackage.h"
-#include "staticlibrary.h"
-#include "tarball.h"
-#include "target.h"
-#include "tool.h"
-#include "toolchain.h"
using namespace std;
using namespace Msp;
-Component::Component(SourcePackage &p, Type t, const string &n):
+Component::Component(SourcePackage &p, const string &n):
package(p),
- type(t),
name(n),
install(false),
deflt(true)
void Component::prepare()
{
- for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
- (*i)->prepare();
+ for(Package *r: requires)
+ r->prepare();
}
void Component::create_build_info()
const Package::Requirements &pkg_reqs = package.get_required_packages();
Package::Requirements direct_reqs = requires;
direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
+ for(Package *r: direct_reqs)
+ final_build_info.update_from(r->get_exported_build_info(), BuildInfo::DEPENDENCY);
Package::Requirements all_reqs = direct_reqs;
- for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ deque<Package *> queue(direct_reqs.begin(), direct_reqs.end());
+ while(!queue.empty())
{
- BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
- if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
- level = BuildInfo::DEPENDENCY;
- final_build_info.update_from((*i)->get_exported_build_info(), level);
+ Package *req = queue.front();
+ queue.pop_front();
- const Package::Requirements &reqs = (*i)->get_required_packages();
- for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
- if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end())
- all_reqs.push_back(*j);
+ for(Package *r: req->get_required_packages())
+ if(!any_equals(all_reqs, r))
+ {
+ final_build_info.update_from(r->get_exported_build_info(), BuildInfo::CHAINED);
+ all_reqs.push_back(r);
+ queue.push_back(r);
+ }
}
final_build_info.update_from(package.get_build_info());
final_build_info.update_from(build_info);
build_info = final_build_info;
- for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
- *i = (package.get_source_directory() / *i).str();
- for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
- *i = (package.get_source_directory() / *i).str();
-
- for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
- {
- /* Select an include path that contains all the sources for this and the
- used component. This should produce a sensible result in most cases. */
- FS::Path base;
- for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
- base = base.empty() ? *j : FS::common_ancestor(base, *j);
- const SourceList &use_sources = (*i)->get_sources();
- for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j)
- base = FS::common_ancestor(base, *j);
- build_info.incpath.push_back(base);
- build_info.libs.push_back((*i)->get_name());
- if(!(*i)->get_install())
- {
- build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
- build_info.libpath.push_back((*i)->get_package().get_source_directory());
- }
- }
-
- if(type==LIBRARY || type==MODULE)
- if(build_info.libmode<BuildInfo::DYNAMIC)
- build_info.libmode = BuildInfo::DYNAMIC;
+ for(FS::Path &p: build_info.incpath)
+ p = (package.get_source_directory()/p).str();
+ for(FS::Path &p: build_info.libpath)
+ p = (package.get_source_directory()/p).str();
}
BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
{
// XXX Cache these and check that the directories actually exist before adding them
BuildInfo binfo = build_info;
- if(!overlays.empty())
- {
- FS::Path dir = FS::dirname(path);
- string last = FS::basename(dir);
- for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i)
- if(last==*i)
- {
- dir = FS::dirname(dir);
- break;
- }
-
- for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
- if(dir==*i)
- {
- binfo.local_incpath.push_back(dir);
- for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
- binfo.local_incpath.push_back(*i/ *j);
- }
- }
- return binfo;
-}
-
-void Component::create_targets() const
-{
- Builder &builder = package.get_builder();
- BuildGraph &build_graph = builder.get_build_graph();
- const Toolchain &toolchain = builder.get_toolchain();
-
- SourceList source_filenames = collect_source_files();
- string inst_loc;
- if(type==TARBALL)
+ FS::Path gen_dir = package.get_temp_directory()/"generated";
+ if(FS::descendant_depth(path, gen_dir)>=0)
{
- Tool &tar = toolchain.get_tool("TAR");
-
- list<Target *> files;
- for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
- {
- FileTarget *file = builder.get_vfs().get_target(*i);
- if(!file)
- file = new File(builder, package, *i);
- files.push_back(file);
- }
-
- string tarname = name;
- if(name=="@src")
- {
- tarname = package.get_name()+"-"+package.get_version();
- files.insert(files.begin(), &package.get_build_file());
-
- const BuildGraph::TargetMap &targets = build_graph.get_targets();
- for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
- if(i->second->get_package()==&package && !i->second->is_buildable())
- if(find(files.begin(), files.end(), i->second)==files.end())
- files.push_back(i->second);
- }
-
- Target *result = tar.create_target(files, tarname);
-
- build_graph.get_target("tarballs")->add_dependency(*result);
-
- return;
- }
- else if(type==INSTALL)
- {
- Target *inst = build_graph.get_target("install");
- Tool © = toolchain.get_tool("CP");
- for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
- {
- FileTarget *ft;
- if(Target *tgt = builder.get_vfs().get_target(*i))
- ft = dynamic_cast<FileTarget *>(tgt);
- else
- ft = new File(builder, package, *i);
- inst->add_dependency(*copy.create_target(*ft, name));
- }
+ FS::Path subdir = FS::dirname(FS::relative(path, gen_dir));
+ binfo.local_incpath.push_back(package.get_source_directory()/subdir);
}
- else if(type==DATAPACK)
+ else
{
- Tool &dcomp = toolchain.get_tool("DATA");
-
- list<Target *> files;
- for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
- {
- string ext = FS::extpart(FS::basename(*i));
- if(ext==".mdt")
- {
- Target *src = dcomp.create_source(*this, *i);
- files.push_back(dcomp.create_target(*src, "collection"));
- }
- else if(Target *tgt = builder.get_vfs().get_target(*i))
- files.push_back(tgt);
- else
- files.push_back(new File(builder, package, *i));
- }
-
- Target *result = dcomp.create_target(files, "pack");
-
- build_graph.add_primary_target(*result);
- if(install)
- build_graph.add_installed_target(*result);
+ FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory()));
+ binfo.local_incpath.push_back(gen_dir/subdir);
}
- if(type==PROGRAM || type==LIBRARY || type==MODULE)
+ if(!overlays.empty())
{
- list<Target *> objs;
- const Toolchain &pkg_tools = package.get_toolchain();
- for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
- {
- string ext = FS::extpart(FS::basename(*i));
- Target *src = 0;
-
- Tool *gen = pkg_tools.get_tool_for_suffix(ext);
- if(gen)
- {
- Target *tmpl = gen->create_source(*this, *i);
- if(tmpl)
- {
- src = gen->create_target(*tmpl);
- ext = FS::extpart(FS::basename(dynamic_cast<FileTarget &>(*src).get_path()));
- }
- }
-
- Tool *tool = toolchain.get_tool_for_suffix(ext, true);
- if(tool)
- {
- if(!src)
- src = tool->create_source(*this, *i);
- if(!src)
- continue;
-
- if(tool->accepts_suffix(ext))
- {
- Target *obj = tool->create_target(*src);
- objs.push_back(obj);
- }
-
- if(type==LIBRARY && install)
- {
- if(dynamic_cast<FileTarget *>(src)->is_installable())
- build_graph.add_installed_target(*src);
-
- const Target::Dependencies &side_effects = src->get_side_effects();
- for(Target::Dependencies::const_iterator j=side_effects.begin(); j!=side_effects.end(); ++j)
- if(dynamic_cast<FileTarget *>(*j)->is_installable())
- build_graph.add_installed_target(**j);
- }
- }
- }
-
- Tool &linker = toolchain.get_tool("LINK");
-
- list<Target *> results;
- if(type==LIBRARY)
- {
- Tool &archiver = toolchain.get_tool("AR");
- results.push_back(linker.create_target(objs, "shared"));
- results.push_back(archiver.create_target(objs));
- }
- else if(type==MODULE)
- results.push_back(linker.create_target(objs, "shared"));
- else
- results.push_back(linker.create_target(objs));
+ FS::Path dir = FS::dirname(path);
+ string last = FS::basename(dir);
+ if(any_equals(overlays, last))
+ dir = FS::dirname(dir);
- for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
+ if(any_equals(sources, dir))
{
- build_graph.add_primary_target(**i);
- if(install)
- build_graph.add_installed_target(**i);
+ binfo.local_incpath.push_back(dir);
+ for(const string &o: overlays)
+ binfo.local_incpath.push_back(dir/o);
}
}
+ return binfo;
}
-Component::SourceList Component::collect_source_files() const
+vector<FS::Path> Component::collect_source_files() const
{
- SourceList files;
- for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+ vector<FS::Path> files;
+ for(const FS::Path &p: sources)
{
- FS::Path path(*i);
- if(FS::is_dir(path))
+ if(FS::is_dir(p))
{
- SourceList dirs;
- dirs.push_back(path);
- for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ vector<FS::Path> dirs;
+ dirs.reserve(1+overlays.size());
+ dirs.push_back(p);
+ for(const string &o: overlays)
{
- FS::Path opath = path / *j;
+ FS::Path opath = p/o;
if(FS::is_dir(opath))
dirs.push_back(opath);
}
- for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
+ set<string> overlay_files;
+ for(auto j=dirs.begin(); j!=dirs.end(); ++j)
{
- package.get_builder().get_logger().log("files", format("Traversing %s", *j));
- list<string> sfiles = list_files(*j);
- for(list<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
- files.push_back(*j / *k);
+ package.get_builder().get_logger().log("files", "Traversing %s", *j);
+ for(const string &f: list_files(*j))
+ {
+ if(j!=dirs.begin())
+ {
+ if(overlay_files.count(f))
+ continue;
+ overlay_files.insert(f);
+ }
+ FS::Path fn = *j/f;
+ if(!FS::is_dir(fn))
+ files.push_back(fn);
+ }
}
}
else
{
- files.push_back(path);
- for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ files.push_back(p);
+ for(const string &o: overlays)
{
- FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+ FS::Path opath = FS::dirname(p)/o/FS::basename(p);
if(FS::is_reg(opath))
files.push_back(opath);
}
Component::Loader::Loader(Component &c):
- DataFile::ObjectLoader<Component>(c)
+ DataFile::ObjectLoader<Component>(c),
+ ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name))
{
- add("if_arch", &Loader::if_arch);
- add("if_feature", &Loader::if_feature);
add("overlay", &Loader::overlay);
add("source", &Loader::source);
add("install", &Component::install);
add("build_info", &Loader::build_info);
add("require", &Loader::require);
add("default", &Component::deflt);
- add("use", &Loader::use);
}
void Component::Loader::build_info()
load_sub(obj.build_info);
}
-void Component::Loader::if_arch(const string &cond)
-{
- BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.package.get_builder().get_current_arch(), &Architecture::match_name)), false);
- bool match = eval.evaluate(cond);
- obj.package.get_builder().get_logger().log("configure",
- format("%s/%s: arch %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
- if(match)
- load_sub_with(*this);
-}
-
-void Component::Loader::if_feature(const string &cond)
-{
- BooleanEvaluator eval(sigc::mem_fun(&obj.package, &SourcePackage::match_feature));
- bool match = eval.evaluate(cond);
- obj.package.get_builder().get_logger().log("configure",
- format("%s/%s: feature %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
- if(match)
- load_sub_with(*this);
-}
-
void Component::Loader::install_map()
{
load_sub(obj.install_map, obj.package.get_source_directory());
{
obj.sources.push_back((obj.package.get_source_directory()/s).str());
}
-
-void Component::Loader::use(const string &n)
-{
- const SourcePackage::ComponentList &components = obj.package.get_components();
- for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
- if(i->get_name()==n && i->get_type()==LIBRARY)
- {
- obj.uses.push_back(&*i);
- return;
- }
- throw invalid_argument("Component::Loader::use");
-}
projects / builder.git / blobdiff