aboutsummaryrefslogtreecommitdiff
path: root/build/context
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-06-18 14:41:45 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-06-18 14:41:45 +0200
commit63e7a4a77cb8ceed7b42561fe3202b0b48d86db6 (patch)
treebde5a79522225f32ec188ba46d0834486c30f00f /build/context
parent28c82c861e38fe05a25e916563e0551ed8fce91e (diff)
Move path and filesystem from build2 to libbutl
Diffstat (limited to 'build/context')
-rw-r--r--build/context17
1 files changed, 9 insertions, 8 deletions
diff --git a/build/context b/build/context
index 3a99014..dc865d2 100644
--- a/build/context
+++ b/build/context
@@ -8,10 +8,11 @@
#include <string>
#include <ostream>
-#include <build/path>
+#include <butl/filesystem>
+
+#include <build/types>
#include <build/rule>
#include <build/operation>
-#include <build/filesystem>
namespace build
{
@@ -37,7 +38,7 @@ namespace build
// The dual interface wrapper for the {mk,rm}{file,dir}() functions
// below that allows you to use it as a true/false return or a more
- // detailed enum from <filesystem>
+ // detailed enum from <butl/filesystem>
//
template <typename T>
struct fs_status
@@ -53,7 +54,7 @@ namespace build
// directory will exist in the majority of case and performance is
// important. See the fsdir{} rule for details.
//
- fs_status<mkdir_status>
+ fs_status<butl::mkdir_status>
mkdir (const dir_path&);
// Remove the file and print the standard diagnostics. The second
@@ -62,19 +63,19 @@ namespace build
// being printed.
//
template <typename T>
- fs_status<rmfile_status>
+ fs_status<butl::rmfile_status>
rmfile (const path&, const T& target);
- inline fs_status<rmfile_status>
+ inline fs_status<butl::rmfile_status>
rmfile (const path& f) {return rmfile (f, f);}
// Similar to rmfile() but for directories.
//
template <typename T>
- fs_status<rmdir_status>
+ fs_status<butl::rmdir_status>
rmdir (const dir_path&, const T& target);
- inline fs_status<rmdir_status>
+ inline fs_status<butl::rmdir_status>
rmdir (const dir_path& d) {return rmdir (d, d);}
// Return the src/out directory corresponding to the given out/src. The