ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-23 23:42:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

depot_query: inherit pkg rom content from deps

Browse Source 
This patch relaxes the need to specify the rom content of all pkg dependencies
in each runtime file. Whenever a dependency features a runtime file, the
contained <content> <rom/> ... </content> nodes are implicitely included.

Fixes #3981
This commit is contained in:
Norman Feske 2021-01-08 17:32:19 +01:00
parent 14d8627186
commit cae5d380c4
1 changed files with 103 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
repos/gems/src/app/depot_query/main.cc
View File

@ -362,6 +362,18 @@ struct Depot_query::Main : private Rom_query
Architecture _architecture { };
template <typename FN>
void _with_file_content(Directory::Path const &path, char const *name, FN const &fn)
{
try {
File_content const content(_heap, Directory(_depot_dir, path),
name, File_content::Limit{16*1024});
fn(content);
}
catch (File_content::Nonexistent_file) { }
catch (Directory::Nonexistent_directory) { }
}
/**
* Produce report that reflects the query version
*
@ -392,6 +404,10 @@ struct Depot_query::Main : private Rom_query
Archive::Path find_rom_in_pkg(Directory::Path const &, Rom_label const &,
Recursion_limit) override;
void _gen_rom_path_nodes(Xml_generator &, Xml_node const &,
Archive::Path const &, Xml_node const &);
void _gen_inherited_rom_path_nodes(Xml_generator &, Xml_node const &,
Archive::Path const &, Recursion_limit);
void _query_blueprint(Directory::Path const &, Xml_generator &);
void _collect_source_dependencies(Archive::Path const &, Dependencies &, Recursion_limit);
void _collect_binary_dependencies(Archive::Path const &, Dependencies &, Recursion_limit);
@ -577,27 +593,12 @@ Depot_query::Main::find_rom_in_pkg(Directory::Path const &pkg_path,
}
void Depot_query::Main::_query_blueprint(Directory::Path const &pkg_path, Xml_generator &xml)
void Depot_query::Main::_gen_rom_path_nodes(Xml_generator &xml,
Xml_node const &env_xml,
Archive::Path const &pkg_path,
Xml_node const &runtime)
{
Directory pkg_dir(_root, Directory::Path("depot/", pkg_path));
File_content runtime(_heap, pkg_dir, "runtime", File_content::Limit{16*1024});
runtime.xml([&] (Xml_node node) {
xml.node("pkg", [&] () {
xml.attribute("name", Archive::name(pkg_path));
xml.attribute("path", pkg_path);
Rom_label const config = node.attribute_value("config", Rom_label());
if (config.valid())
xml.attribute("config", config);
Xml_node env_xml = _config.xml().has_sub_node("env")
? _config.xml().sub_node("env") : "<env/>";
node.for_each_sub_node("content", [&] (Xml_node content) {
runtime.for_each_sub_node("content", [&] (Xml_node content) {
content.for_each_sub_node([&] (Xml_node node) {
/* skip non-rom nodes */
@ -636,6 +637,57 @@ void Depot_query::Main::_query_blueprint(Directory::Path const &pkg_path, Xml_ge
}
});
});
}
void Depot_query::Main::_gen_inherited_rom_path_nodes(Xml_generator &xml,
Xml_node const &env_xml,
Archive::Path const &pkg_path,
Recursion_limit recursion_limit)
{
_with_file_content(pkg_path, "archives", [&] (File_content const &archives) {
archives.for_each_line<Archive::Path>([&] (Archive::Path const &archive_path) {
/* early return if archive path is not a valid pkg path */
try {
if (Archive::type(archive_path) != Archive::PKG)
return;
}
catch (Archive::Unknown_archive_type) { return; }
_with_file_content(archive_path, "runtime" , [&] (File_content const &runtime) {
runtime.xml([&] (Xml_node node) {
_gen_rom_path_nodes(xml, env_xml, pkg_path, node); }); });
_gen_inherited_rom_path_nodes(xml, env_xml, archive_path, recursion_limit);
});
});
}
void Depot_query::Main::_query_blueprint(Directory::Path const &pkg_path, Xml_generator &xml)
{
Directory pkg_dir(_root, Directory::Path("depot/", pkg_path));
File_content runtime(_heap, pkg_dir, "runtime", File_content::Limit{16*1024});
runtime.xml([&] (Xml_node node) {
xml.node("pkg", [&] () {
xml.attribute("name", Archive::name(pkg_path));
xml.attribute("path", pkg_path);
Rom_label const config = node.attribute_value("config", Rom_label());
if (config.valid())
xml.attribute("config", config);
Xml_node const env_xml = _config.xml().has_sub_node("env")
? _config.xml().sub_node("env") : "<env/>";
_gen_rom_path_nodes(xml, env_xml, pkg_path, node);
_gen_inherited_rom_path_nodes(xml, env_xml, pkg_path, Recursion_limit{8});
String<160> comment("\n\n<!-- content of '", pkg_path, "/runtime' -->\n");
xml.append(comment.string());
@ -659,33 +711,26 @@ void Depot_query::Main::_collect_source_dependencies(Archive::Path const &path,
dependencies.record(path);
try { switch (Archive::type(path)) {
switch (Archive::type(path)) {
case Archive::PKG: {
File_content archives(_heap, Directory(_depot_dir, path),
"archives", File_content::Limit{16*1024});
_with_file_content(path, "archives", [&] (File_content const &archives) {
archives.for_each_line<Archive::Path>([&] (Archive::Path const &path) {
_collect_source_dependencies(path, dependencies, recursion_limit); });
_collect_source_dependencies(path, dependencies, recursion_limit); }); });
break;
}
case Archive::SRC: {
File_content used_apis(_heap, Directory(_depot_dir, path),
"used_apis", File_content::Limit{16*1024});
typedef String<160> Api;
_with_file_content(path, "used_apis", [&] (File_content const &used_apis) {
used_apis.for_each_line<Archive::Path>([&] (Api const &api) {
dependencies.record(Archive::Path(Archive::user(path), "/api/", api));
});
dependencies.record(Archive::Path(Archive::user(path), "/api/", api)); }); });
break;
}
case Archive::RAW:
break;
}; }
catch (File_content::Nonexistent_file) { }
catch (Directory::Nonexistent_directory) { }
};
}
@ -702,18 +747,11 @@ void Depot_query::Main::_collect_binary_dependencies(Archive::Path const &path,
switch (Archive::type(path)) {
case Archive::PKG:
try {
dependencies.record(path);
File_content archives(_heap, Directory(_depot_dir, path),
"archives", File_content::Limit{16*1024});
_with_file_content(path, "archives", [&] (File_content const &archives) {
archives.for_each_line<Archive::Path>([&] (Archive::Path const &archive_path) {
_collect_binary_dependencies(archive_path, dependencies, recursion_limit); });
}
catch (File_content::Nonexistent_file) { }
catch (Directory::Nonexistent_directory) { }
_collect_binary_dependencies(archive_path, dependencies, recursion_limit); }); });
break;
case Archive::SRC: