aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/install/operation.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-04-04 14:10:27 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-04-04 14:10:27 +0200
commit8b9701d2ad76a9a571c445b318557261a4922758 (patch)
tree1de11ba8c7e1d465f4a95005d7115774696a2a87 /libbuild2/install/operation.hxx
parent7b06ee81ab0e8a2199c4dce07ec67282c4f52f62 (diff)
Remove global override restriction from config.install.filter
Diffstat (limited to 'libbuild2/install/operation.hxx')
-rw-r--r--libbuild2/install/operation.hxx18
1 files changed, 2 insertions, 16 deletions
diff --git a/libbuild2/install/operation.hxx b/libbuild2/install/operation.hxx
index d71d8f3..bd818b4 100644
--- a/libbuild2/install/operation.hxx
+++ b/libbuild2/install/operation.hxx
@@ -12,7 +12,7 @@
#include <libbuild2/utility.hxx>
#include <libbuild2/operation.hxx>
-#include <libbuild2/filesystem.hxx> // auto_rmfile, entry_type
+#include <libbuild2/filesystem.hxx> // auto_rmfile
namespace build2
{
@@ -22,25 +22,11 @@ namespace build2
extern const operation_info op_uninstall;
extern const operation_info op_update_for_install;
- using filters = vector<pair<string, string>>;
-
// Set as context::current_inner_odata during the install/uninstall inner
// operations.
//
struct context_data
{
- // Filters.
- //
- const install::filters* filters;
-
- // If entry type is a directory, then leaf must be empty.
- //
- static bool
- filter (const scope& rs,
- const dir_path& base,
- const path& leaf,
- entry_type);
-
// Manifest.
//
#ifndef BUILD2_BOOTSTRAP
@@ -92,7 +78,7 @@ namespace build2
// Constructor.
//
explicit
- context_data (const install::filters*, const path* manifest);
+ context_data (const path* manifest);
};
}
}