diff options
Diffstat (limited to 'libbpkg/manifest.hxx')
| -rw-r--r-- | libbpkg/manifest.hxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libbpkg/manifest.hxx b/libbpkg/manifest.hxx index 2faf104..cad3c1e 100644 --- a/libbpkg/manifest.hxx +++ b/libbpkg/manifest.hxx @@ -1130,7 +1130,8 @@ namespace bpkg // Additional buildfiles which are potentially included by root.build. // - std::vector<buildfile> buildfiles; + std::vector<buildfile> buildfiles; // Buildfiles content. + std::vector<butl::path> buildfile_paths; // The following values are only valid in the manifest list (and only for // certain repository types). @@ -1274,17 +1275,19 @@ namespace bpkg // Load the *-file manifest values using the specified load function that // returns the file contents passing through any exception it may throw. - // Set the potentially absent description type value to the effective - // description type. If the effective type is nullopt then assign a - // synthetic unknown type. + // If nullopt is returned, then the respective *-file value is left + // unexpanded. Set the potentially absent description type value to the + // effective description type. If the effective type is nullopt then + // assign a synthetic unknown type. // // Note that if the returned file contents is empty, load_files() makes // sure that this is allowed by the value's semantics throwing // manifest_parsing otherwise. However, the load function may want to // recognize such cases itself in order to issue more precise diagnostics. // - using load_function = std::string (const std::string& name, - const butl::path& value); + using load_function = + butl::optional<std::string> (const std::string& name, + const butl::path& value); void load_files (const std::function<load_function>&, |