aboutsummaryrefslogtreecommitdiff
path: root/libbuild2
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-09-30 14:21:05 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-01 12:15:10 +0300
commit6ce929cf4fc5059f37e06312a0ec3c241dbf88ed (patch)
treec7a6c6a9f0f79233beb0c42d6247423ee525e226 /libbuild2
parent59db6ff22d090f8b47e278e9ecbeaa049ba3ba55 (diff)
Adapt to moving path match to path-pattern.?xx
Diffstat (limited to 'libbuild2')
-rw-r--r--libbuild2/dist/operation.cxx2
-rw-r--r--libbuild2/functions-filesystem.cxx1
-rw-r--r--libbuild2/parser.cxx3
-rw-r--r--libbuild2/test/script/runner.cxx5
-rw-r--r--libbuild2/variable.cxx2
5 files changed, 8 insertions, 5 deletions
diff --git a/libbuild2/dist/operation.cxx b/libbuild2/dist/operation.cxx
index f1dd81c..391f7d8 100644
--- a/libbuild2/dist/operation.cxx
+++ b/libbuild2/dist/operation.cxx
@@ -7,7 +7,7 @@
#include <libbutl/sha1.mxx>
#include <libbutl/sha256.mxx>
-#include <libbutl/filesystem.mxx> // path_match()
+#include <libbutl/path-pattern.mxx>
#include <libbuild2/file.hxx>
#include <libbuild2/dump.hxx>
diff --git a/libbuild2/functions-filesystem.cxx b/libbuild2/functions-filesystem.cxx
index 752f73a..701fa74 100644
--- a/libbuild2/functions-filesystem.cxx
+++ b/libbuild2/functions-filesystem.cxx
@@ -3,6 +3,7 @@
// license : MIT; see accompanying LICENSE file
#include <libbutl/filesystem.mxx>
+#include <libbutl/path-pattern.mxx>
#include <libbuild2/function.hxx>
#include <libbuild2/variable.hxx>
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx
index 33da1b5..b33ba78 100644
--- a/libbuild2/parser.cxx
+++ b/libbuild2/parser.cxx
@@ -7,7 +7,8 @@
#include <sstream>
#include <iostream> // cout
-#include <libbutl/filesystem.mxx> // path_{search,match,pattern}()
+#include <libbutl/filesystem.mxx> // path_search
+#include <libbutl/path-pattern.mxx>
#include <libbuild2/dump.hxx>
#include <libbuild2/file.hxx>
diff --git a/libbuild2/test/script/runner.cxx b/libbuild2/test/script/runner.cxx
index 56e29b1..520be43 100644
--- a/libbuild2/test/script/runner.cxx
+++ b/libbuild2/test/script/runner.cxx
@@ -8,8 +8,9 @@
#include <libbutl/regex.mxx>
#include <libbutl/builtin.mxx>
-#include <libbutl/fdstream.mxx> // fdopen_mode, fdnull(), fddup()
-#include <libbutl/filesystem.mxx> // path_search(), path_pattern()
+#include <libbutl/fdstream.mxx> // fdopen_mode, fdnull(), fddup()
+#include <libbutl/filesystem.mxx> // path_search()
+#include <libbutl/path-pattern.mxx>
#include <libbuild2/variable.hxx>
#include <libbuild2/filesystem.hxx>
diff --git a/libbuild2/variable.cxx b/libbuild2/variable.cxx
index c84a89c..22ea69d 100644
--- a/libbuild2/variable.cxx
+++ b/libbuild2/variable.cxx
@@ -6,7 +6,7 @@
#include <cstring> // memcmp()
-#include <libbutl/filesystem.mxx> // path_match()
+#include <libbutl/path-pattern.mxx>
#include <libbuild2/diagnostics.hxx>