-#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 <msp/strings/format.h>
#include "builder.h"
#include "component.h"
-#include "datafile.h"
-#include "executable.h"
-#include "file.h"
-#include "header.h"
-#include "install.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
#include "sourcepackage.h"
-#include "staticlibrary.h"
-#include "tarball.h"
-#include "target.h"
using namespace std;
using namespace Msp;
-Component::Component(SourcePackage &p, Type t, const string &n):
- pkg(p),
- type(t),
- name(n),
- install(false),
- deflt(true)
-{ }
-
-void Component::configure(const StringMap &opts, unsigned flag)
+void Component::prepare()
{
- for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i)
- *i = (pkg.get_source()/pkg.expand_string(*i)).str();
-
- for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
- (*i)->configure(opts, flag&2);
+ for(Package *r: requires)
+ r->prepare();
}
void Component::create_build_info()
{
- const PackageList &pkg_reqs = pkg.get_requires();
- PackageList direct_reqs = requires;
+ BuildInfo final_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);
- PackageList all_reqs = direct_reqs;
- for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ Package::Requirements all_reqs = direct_reqs;
+ deque<Package *> queue(direct_reqs.begin(), direct_reqs.end());
+ while(!queue.empty())
{
- if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
- build_info.add((*i)->get_exported_binfo());
- else
- {
- const BuildInfo &ebi = (*i)->get_exported_binfo();
- build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
- build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
- build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end());
- }
+ Package *req = queue.front();
+ queue.pop_front();
- const PackageList &reqs = (*i)->get_requires();
- for(PackageList::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);
+ }
}
- build_info.add(pkg.get_build_info());
+ final_build_info.update_from(package.get_build_info());
+ final_build_info.update_from(build_info);
+ build_info = final_build_info;
- for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
- *i = (pkg.get_source() / *i).str();
- for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
- *i = (pkg.get_source() / *i).str();
+ 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();
+}
- if(pkg.get_library_mode()!=DYNAMIC)
- {
- for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
- {
- const BuildInfo &ebi = (*i)->get_exported_binfo();
- build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
- }
- }
+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(type==PROGRAM)
+ FS::Path gen_dir = package.get_temp_directory()/"generated";
+ if(FS::descendant_depth(path, gen_dir)>=0)
{
- string strip = pkg.get_config().get_option("strip").value;
- if(lexical_cast<bool>(strip))
- build_info.ldflags.push_back("-s");
+ FS::Path subdir = FS::dirname(FS::relative(path, gen_dir));
+ binfo.local_incpath.push_back(package.get_source_directory()/subdir);
}
- else if(type==LIBRARY)
+ else
{
- build_info.cflags.push_back("-fPIC");
+ FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory()));
+ binfo.local_incpath.push_back(gen_dir/subdir);
}
- build_info.unique();
-}
-
-void Component::create_targets() const
-{
- Builder &builder = pkg.get_builder();
- Target *world = builder.get_target("world");
- Target *def_tgt = builder.get_target("default");
-
- PathList files = collect_source_files();
- list<FileTarget *> inst_list;
-
- string inst_loc;
- if(type==TARBALL)
+ if(!overlays.empty())
{
- string tarname = name;
- if(name=="@src")
- tarname = pkg.get_name()+"-"+pkg.get_version();
- TarBall *result = new TarBall(builder, pkg, tarname);
+ FS::Path dir = FS::dirname(path);
+ string last = FS::basename(dir);
+ if(any_equals(overlays, last))
+ dir = FS::dirname(dir);
- if(name=="@src")
+ if(any_equals(sources, dir))
{
- const Builder::TargetMap &targets = builder.get_targets();
- for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
- if(i->second->get_package()==&pkg && !i->second->is_buildable())
- result->add_depend(i->second);
- files.push_back(pkg.get_source()/"Build");
+ binfo.local_incpath.push_back(dir);
+ for(const string &o: overlays)
+ binfo.local_incpath.push_back(dir/o);
}
-
- for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
- {
- FileTarget *ft;
- if(Target *tgt = builder.get_target_by_path(*i))
- ft = dynamic_cast<FileTarget *>(tgt);
- else
- ft = new File(builder, *i);
- result->add_depend(ft);
- }
-
- Target *tarbls_tgt = builder.get_target("tarballs");
- tarbls_tgt->add_depend(result);
-
- return;
}
- else if(type==INSTALL)
- {
- inst_loc = name;
- for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
- {
- FileTarget *ft;
- if(Target *tgt = builder.get_target_by_path(*i))
- ft = dynamic_cast<FileTarget *>(tgt);
- else
- ft = new File(builder, pkg, *i);
- inst_list.push_back(ft);
- }
- }
- else if(type==DATAFILE)
- {
- File *source;
- if(Target *tgt = builder.get_target_by_path(files.front()))
- source = dynamic_cast<File *>(tgt);
- else
- source = new File(builder, pkg, files.front());
- ::DataFile *result = new ::DataFile(builder, *this, *source);
+ return binfo;
+}
- if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(result);
- else
- world->add_depend(result);
- if(install)
- inst_list.push_back(result);
- }
- else
+vector<FS::Path> Component::collect_source_files() const
+{
+ vector<FS::Path> files;
+ for(const FS::Path &p: sources)
{
- for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+ if(FS::is_dir(p))
{
- string ext = FS::extpart(FS::basename(*i));
- if(ext==".h")
+ vector<FS::Path> dirs;
+ dirs.reserve(1+overlays.size());
+ dirs.push_back(p);
+ for(const string &o: overlays)
{
- FileTarget *hdr = builder.get_target_by_path(*i);
- if(!hdr)
- hdr = new Header(builder, *this, i->str());
-
- // Install headers if requested
- if(type==HEADERS && install)
- inst_list.push_back(hdr);
+ FS::Path opath = p/o;
+ if(FS::is_dir(opath))
+ dirs.push_back(opath);
}
- }
- }
-
- if(type==PROGRAM || type==LIBRARY || type==MODULE)
- {
- list<ObjectFile *> objs;
- for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
- {
- string ext = FS::extpart(FS::basename(*i));
- if((ext==".cpp" || ext==".cc" || ext==".c"))
+ set<string> overlay_files;
+ for(auto j=dirs.begin(); j!=dirs.end(); ++j)
{
- SourceFile *src = new SourceFile(builder, *this, i->str());
- ObjectFile *obj = new ObjectFile(builder, *this, *src);
- objs.push_back(obj);
+ 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);
+ }
}
}
-
- list<FileTarget *> results;
- if(type==LIBRARY)
- {
- results.push_back(new SharedLibrary(builder, *this, objs));
- results.push_back(new StaticLibrary(builder, *this, objs));
- }
else
- results.push_back(new Executable(builder, *this, objs));
-
- for(list<FileTarget *>::const_iterator i=results.begin(); i!=results.end(); ++i)
{
- if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(*i);
- else
- world->add_depend(*i);
- if(install)
- inst_list.push_back(*i);
- }
- }
-
- Target *inst_tgt = builder.get_target("install");
- for(list<FileTarget *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
- {
- Install *inst = new Install(builder, pkg, **i, inst_loc);
- inst_tgt->add_depend(inst);
- }
-}
-
-PathList Component::collect_source_files() const
-{
- PathList files;
- for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
- {
- FS::Path path(*i);
- if(FS::is_dir(path))
- {
- list<string> sfiles = list_files(path);
- for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
- files.push_back(path / *j);
+ files.push_back(p);
+ for(const string &o: overlays)
+ {
+ FS::Path opath = FS::dirname(p)/o/FS::basename(p);
+ if(FS::is_reg(opath))
+ files.push_back(opath);
+ }
}
- else
- files.push_back(path);
}
return files;
Component::Loader::Loader(Component &c):
- comp(c)
+ DataFile::ObjectLoader<Component>(c),
+ ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name))
{
+ add("overlay", &Loader::overlay);
add("source", &Loader::source);
add("install", &Component::install);
- add("install_headers", &Loader::install_headers);
+ add("install_map", &Loader::install_map);
add("build_info", &Loader::build_info);
add("require", &Loader::require);
- add("modular", &Loader::modular);
- add("host", &Loader::host);
add("default", &Component::deflt);
}
-void Component::Loader::finish()
-{
- if(!inst_hdr.empty())
- {
- Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
- hdrcomp.sources = comp.sources;
- hdrcomp.install = true;
- const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
- }
-}
-
-void Component::Loader::source(const string &s)
-{
- comp.sources.push_back(s);
-}
-
-void Component::Loader::require(const string &n)
+void Component::Loader::build_info()
{
- Package *req = comp.pkg.get_builder().get_package(n);
- if(req)
- comp.requires.push_back(req);
+ load_sub(obj.build_info);
}
-void Component::Loader::modular()
+void Component::Loader::install_map()
{
- IO::print("%s: Note: modular is deprecated\n", get_source());
- comp.build_info.ldflags.push_back("-rdynamic");
- comp.build_info.libs.push_back("dl");
+ load_sub(obj.install_map, obj.package.get_source_directory());
}
-void Component::Loader::host(const string &)
+void Component::Loader::overlay(const string &o)
{
- IO::print("%s: Note: host is deprecated\n", get_source());
+ obj.overlays.push_back(o);
}
-void Component::Loader::install_headers(const string &p)
+void Component::Loader::require(const string &n)
{
- IO::print("%s: Note: install_headers is deprecated\n", get_source());
- if(comp.type==HEADERS)
- {
- comp.name = p;
- comp.install = true;
- }
+ Package *req = obj.package.get_builder().get_package_manager().find_package(n);
+ if(req)
+ obj.requires.push_back(req);
else
- inst_hdr = p;
+ obj.problems.push_back(format("Required package %s not found", n));
}
-void Component::Loader::build_info()
+void Component::Loader::source(const string &s)
{
- load_sub(comp.build_info);
+ obj.sources.push_back((obj.package.get_source_directory()/s).str());
}
projects / builder.git / blobdiff