#include "builder.h"
#include "component.h"
#include "csourcefile.h"
-#include "datafile.h"
+#include "datapack.h"
#include "executable.h"
#include "file.h"
#include "objectfile.h"
}
}
+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();
tarname = package.get_name()+"-"+package.get_version();
files.insert(files.begin(), &package.get_build_file());
- const Builder::TargetMap &targets = builder.get_targets();
- for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+ 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);
- builder.get_target("tarballs")->add_dependency(*result);
+ build_graph.get_target("tarballs")->add_dependency(*result);
return;
}
else if(type==INSTALL)
{
- Target *inst = builder.get_target("install");
+ Target *inst = build_graph.get_target("install");
const Tool © = toolchain.get_tool("CP");
for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
{
inst->add_dependency(*copy.create_target(*ft, name));
}
}
- else if(type==DATAFILE)
+ else if(type==DATAPACK)
{
const Tool &dcomp = toolchain.get_tool("DATA");
- File *source;
- if(Target *tgt = builder.get_vfs().get_target(source_filenames.front()))
- source = dynamic_cast<File *>(tgt);
- else
- source = new File(builder, package, source_filenames.front());
- Target *result = dcomp.create_target(*source);
+ 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");
- builder.add_primary_target(*result);
+ build_graph.add_primary_target(*result);
if(install)
- builder.add_installed_target(*result);
+ build_graph.add_installed_target(*result);
}
if(type==PROGRAM || type==LIBRARY || type==MODULE)
}
if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
- builder.add_installed_target(*src);
+ build_graph.add_installed_target(*src);
}
}
for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
{
- builder.add_primary_target(**i);
+ build_graph.add_primary_target(**i);
if(install)
- builder.add_installed_target(**i);
+ build_graph.add_installed_target(**i);
}
}
}
FS::Path path(*i);
if(FS::is_dir(path))
{
- package.get_builder().get_logger().log("files", format("Traversing %s", path));
- list<string> sfiles = list_files(path);
- for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
- files.push_back(path / *j);
+ SourceList dirs;
+ dirs.push_back(path);
+ for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ {
+ FS::Path opath = path / *j;
+ if(FS::is_dir(opath))
+ dirs.push_back(opath);
+ }
+ for(SourceList::const_iterator 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);
+ }
}
else
+ {
files.push_back(path);
+ for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ {
+ FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+ if(FS::is_reg(opath))
+ files.push_back(opath);
+ }
+ }
}
return files;
Component::Loader::Loader(Component &c):
DataFile::ObjectLoader<Component>(c)
{
+ 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("install_map", &Loader::install_map);
add("use", &Loader::use);
}
-void Component::Loader::source(const string &s)
+void Component::Loader::build_info()
{
- obj.sources.push_back((obj.package.get_source_directory()/s).str());
+ load_sub(obj.build_info);
}
-void Component::Loader::require(const string &n)
+void Component::Loader::if_arch(const string &cond)
{
- Package *req = obj.package.get_builder().get_package_manager().find_package(n);
- if(req)
- obj.requires.push_back(req);
+ bool match = obj.package.get_builder().get_current_arch().match_name(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::build_info()
+void Component::Loader::if_feature(const string &cond)
{
- load_sub(obj.build_info);
+ bool match = obj.package.match_feature(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());
}
+void Component::Loader::overlay(const string &o)
+{
+ obj.overlays.push_back(o);
+}
+
+void Component::Loader::require(const string &n)
+{
+ Package *req = obj.package.get_builder().get_package_manager().find_package(n);
+ if(req)
+ obj.requires.push_back(req);
+}
+
+void Component::Loader::source(const string &s)
+{
+ 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();
projects / builder.git / blobdiff