void Component::prepare()
{
- for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+ for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
(*i)->prepare();
}
void Component::create_build_info()
{
- const PackageList &pkg_reqs = package.get_required_packages();
- 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());
- PackageList all_reqs = direct_reqs;
- for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ Package::Requirements all_reqs = direct_reqs;
+ for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
level = BuildInfo::DEPENDENCY;
- build_info.update_from((*i)->get_exported_build_info(), level);
+ final_build_info.update_from((*i)->get_exported_build_info(), level);
- const PackageList &reqs = (*i)->get_required_packages();
- for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
+ 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);
}
- build_info.update_from(package.get_build_info());
+ final_build_info.update_from(package.get_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();
+ final_build_info.update_from(build_info);
+ build_info = final_build_info;
+
+ 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;
if(build_info.libmode<BuildInfo::DYNAMIC)
{
- for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
const BuildInfo &ebi = (*i)->get_exported_build_info();
build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
void Component::create_targets() const
{
Builder &builder = package.get_builder();
+ BuildGraph &build_graph = builder.get_build_graph();
const Toolchain &toolchain = builder.get_toolchain();
- Target *world = builder.get_target("world");
- Target *def_tgt = builder.get_target("default");
- PathList source_filenames = collect_source_files();
- list<Target *> inst_list;
+ SourceList source_filenames = collect_source_files();
string inst_loc;
if(type==TARBALL)
{
- //const Tool &tar = toolchain.get_tool("TAR");
-
- string tarname = name;
- if(name=="@src")
- {
- tarname = package.get_name()+"-"+package.get_version();
- source_filenames.push_back(package.get_source_directory()/"Build");
- }
+ const Tool &tar = toolchain.get_tool("TAR");
list<Target *> files;
- for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+ 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, *i);
+ file = new File(builder, package, *i);
files.push_back(file);
}
+ string tarname = name;
if(name=="@src")
{
- const Builder::TargetMap &targets = builder.get_targets();
- for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+ 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())
- files.push_back(i->second);
+ if(find(files.begin(), files.end(), i->second)==files.end())
+ files.push_back(i->second);
}
- /* XXX The source files don't have a package at the moment, so we can't
- create the tarball target until things get fixed up a bit */
- /*Target *result = tar.create_target(files, tarname);
+ Target *result = tar.create_target(files, tarname);
- Target *tarballs_tgt = builder.get_target("tarballs");
- tarballs_tgt->add_dependency(*result);*/
+ build_graph.get_target("tarballs")->add_dependency(*result);
return;
}
else if(type==INSTALL)
{
- inst_loc = name;
- for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+ 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)
{
FileTarget *ft;
if(Target *tgt = builder.get_vfs().get_target(*i))
ft = dynamic_cast<FileTarget *>(tgt);
else
ft = new File(builder, package, *i);
- inst_list.push_back(ft);
+ inst->add_dependency(*copy.create_target(*ft, name));
}
}
else if(type==DATAFILE)
source = new File(builder, package, source_filenames.front());
Target *result = dcomp.create_target(*source);
- if(&package==builder.get_main_package() && deflt)
- def_tgt->add_dependency(*result);
- else
- world->add_dependency(*result);
+ build_graph.add_primary_target(*result);
if(install)
- inst_list.push_back(result);
+ build_graph.add_installed_target(*result);
}
if(type==PROGRAM || type==LIBRARY || type==MODULE)
{
list<Target *> objs;
- for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+ for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
{
string ext = FS::extpart(FS::basename(*i));
const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
if(tool)
{
Target *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 && !dynamic_cast<FileTarget *>(src)->get_install_location().empty())
- inst_list.push_back(src);
+ if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
+ build_graph.add_installed_target(*src);
}
}
for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
{
- if(&package==builder.get_main_package() && deflt)
- def_tgt->add_dependency(**i);
- else
- world->add_dependency(**i);
+ build_graph.add_primary_target(**i);
if(install)
- inst_list.push_back(*i);
+ build_graph.add_installed_target(**i);
}
}
-
- Target *inst_tgt = builder.get_target("install");
- const Tool © = toolchain.get_tool("CP");
- for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
- {
- Target *inst = copy.create_target(**i, inst_loc);
- inst_tgt->add_dependency(*inst);
- }
}
-PathList Component::collect_source_files() const
+Component::SourceList Component::collect_source_files() const
{
- PathList files;
- for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+ SourceList files;
+ for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
{
FS::Path path(*i);
if(FS::is_dir(path))
Component::Loader::Loader(Component &c):
DataFile::ObjectLoader<Component>(c)
{
+ add("if_arch", &Loader::if_arch);
+ add("if_feature", &Loader::if_feature);
add("source", &Loader::source);
add("install", &Component::install);
add("install_map", &Loader::install_map);
add("build_info", &Loader::build_info);
add("require", &Loader::require);
add("default", &Component::deflt);
+ add("use", &Loader::use);
+}
+
+void Component::Loader::if_arch(const string &cond)
+{
+ 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::if_feature(const string &cond)
+{
+ 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::source(const string &s)
{
load_sub(obj.install_map, obj.package.get_source_directory());
}
+
+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