Adapt to adding hxx extension for headers and lib prefix for library dir in libbutl

22 files changed, 47 insertions, 47 deletions

diff --git a/bpkg/archive.cxx b/bpkg/archive.cxx
index 4ad996f..ce62fab 100644
--- a/bpkg/archive.cxx
+++ b/bpkg/archive.cxx
@@ -4,8 +4,8 @@
 
 #include <bpkg/archive.hxx>
 
-#include <butl/process>
-#include <butl/fdstream>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
 
 #include <bpkg/diagnostics.hxx>
 
diff --git a/bpkg/archive.hxx b/bpkg/archive.hxx
index 44f7a7b..281827d 100644
--- a/bpkg/archive.hxx
+++ b/bpkg/archive.hxx
@@ -5,7 +5,7 @@
 #ifndef BPKG_ARCHIVE_HXX
 #define BPKG_ARCHIVE_HXX
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
diff --git a/bpkg/auth.cxx b/bpkg/auth.cxx
index 7cba934..b60e998 100644
--- a/bpkg/auth.cxx
+++ b/bpkg/auth.cxx
@@ -9,11 +9,11 @@
 #include <cstring>   // strlen(), strcmp()
 #include <iterator>  // ostreambuf_iterator, istreambuf_iterator
 
-#include <butl/sha256>
-#include <butl/base64>
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/filesystem>
+#include <libbutl/sha256.hxx>
+#include <libbutl/base64.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
 
 #include <bpkg/openssl.hxx>
 #include <bpkg/package.hxx>
diff --git a/bpkg/cfg-create.cxx b/bpkg/cfg-create.cxx
index 6f12d55..df7d779 100644
--- a/bpkg/cfg-create.cxx
+++ b/bpkg/cfg-create.cxx
@@ -4,7 +4,7 @@
 
 #include <bpkg/cfg-create.hxx>
 
-#include <butl/fdstream>
+#include <libbutl/fdstream.hxx>
 
 #include <bpkg/package.hxx>
 #include <bpkg/package-odb.hxx>
diff --git a/bpkg/checksum.cxx b/bpkg/checksum.cxx
index d70446b..2e639ef 100644
--- a/bpkg/checksum.cxx
+++ b/bpkg/checksum.cxx
@@ -6,9 +6,9 @@
 
 #include <streambuf>
 
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/filesystem>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
 
 #include <bpkg/diagnostics.hxx>
 
diff --git a/bpkg/diagnostics.cxx b/bpkg/diagnostics.cxx
index 9eaf118..16dcc46 100644
--- a/bpkg/diagnostics.cxx
+++ b/bpkg/diagnostics.cxx
@@ -9,7 +9,7 @@
 
 #include <odb/statement.hxx>
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/diagnostics.hxx b/bpkg/diagnostics.hxx
index 64eecd9..8edf606 100644
--- a/bpkg/diagnostics.hxx
+++ b/bpkg/diagnostics.hxx
@@ -7,7 +7,7 @@
 
 #include <odb/tracer.hxx>
 
-#include <butl/diagnostics>
+#include <libbutl/diagnostics.hxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
diff --git a/bpkg/fetch.cxx b/bpkg/fetch.cxx
index 71be02b..a0c3b9c 100644
--- a/bpkg/fetch.cxx
+++ b/bpkg/fetch.cxx
@@ -6,10 +6,10 @@
 
 #include <sstream>
 
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/filesystem>
-#include <butl/manifest-parser>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
+#include <libbutl/manifest-parser.hxx>
 
 #include <bpkg/checksum.hxx>
 #include <bpkg/diagnostics.hxx>
diff --git a/bpkg/help.cxx b/bpkg/help.cxx
index 61152b3..16a743c 100644
--- a/bpkg/help.cxx
+++ b/bpkg/help.cxx
@@ -4,7 +4,7 @@
 
 #include <bpkg/help.hxx>
 
-#include <butl/pager>
+#include <libbutl/pager.hxx>
 
 #include <bpkg/diagnostics.hxx>
 #include <bpkg/bpkg-options.hxx>
diff --git a/bpkg/openssl.cxx b/bpkg/openssl.cxx
index e8de30b..5a1e29c 100644
--- a/bpkg/openssl.cxx
+++ b/bpkg/openssl.cxx
@@ -4,7 +4,7 @@
 
 #include <bpkg/openssl.hxx>
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 #include <bpkg/diagnostics.hxx>
 
diff --git a/bpkg/openssl.hxx b/bpkg/openssl.hxx
index 30671ae..8023db6 100644
--- a/bpkg/openssl.hxx
+++ b/bpkg/openssl.hxx
@@ -5,7 +5,7 @@
 #ifndef BPKG_OPENSSL_HXX
 #define BPKG_OPENSSL_HXX
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
diff --git a/bpkg/package.hxx b/bpkg/package.hxx
index 2a68d7c..1236357 100644
--- a/bpkg/package.hxx
+++ b/bpkg/package.hxx
@@ -14,7 +14,7 @@
 #include <odb/core.hxx>
 #include <odb/nested-container.hxx>
 
-#include <butl/timestamp>
+#include <libbutl/timestamp.hxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
@@ -68,8 +68,8 @@ namespace bpkg
                              std::chrono::nanoseconds::period>::value,
     "The following timestamp ODB mapping is invalid");
 
-  // As pointed out in butl/timestamp we will overflow in year 2262, but by
-  // that time some larger basic type will be available for mapping.
+  // As pointed out in libbutl/timestamp.hxx we will overflow in year 2262, but
+  // by that time some larger basic type will be available for mapping.
   //
   #pragma db map type(timestamp) as(uint64_t)                 \
     to(std::chrono::duration_cast<std::chrono::nanoseconds> ( \
diff --git a/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx
index 21883d9..56e8619 100644
--- a/bpkg/pkg-unpack.cxx
+++ b/bpkg/pkg-unpack.cxx
@@ -4,7 +4,7 @@
 
 #include <bpkg/pkg-unpack.hxx>
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx
index e4535f3..fca6e6d 100644
--- a/bpkg/pkg-verify.cxx
+++ b/bpkg/pkg-verify.cxx
@@ -4,9 +4,9 @@
 
 #include <bpkg/pkg-verify.hxx>
 
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/manifest-parser>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/manifest-parser.hxx>
 
 #include <bpkg/archive.hxx>
 #include <bpkg/diagnostics.hxx>
diff --git a/bpkg/rep-create.cxx b/bpkg/rep-create.cxx
index b38d418..49d49f4 100644
--- a/bpkg/rep-create.cxx
+++ b/bpkg/rep-create.cxx
@@ -6,9 +6,9 @@
 
 #include <map>
 
-#include <butl/fdstream>
-#include <butl/filesystem> // dir_iterator
-#include <butl/manifest-serializer>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>          // dir_iterator
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bpkg/rep-info.cxx b/bpkg/rep-info.cxx
index 7dbb0f9..50dd146 100644
--- a/bpkg/rep-info.cxx
+++ b/bpkg/rep-info.cxx
@@ -6,8 +6,8 @@
 
 #include <iostream>  // cout
 
-#include <butl/sha256>              // sha256_to_fingerprint()
-#include <butl/manifest-serializer>
+#include <libbutl/sha256.hxx>              // sha256_to_fingerprint()
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bpkg/satisfaction.cxx b/bpkg/satisfaction.cxx
index 7bcf1fd..ca83f51 100644
--- a/bpkg/satisfaction.cxx
+++ b/bpkg/satisfaction.cxx
@@ -4,8 +4,8 @@
 
 #include <bpkg/satisfaction.hxx>
 
-#include <butl/process>
-#include <butl/fdstream>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
 
 #include <bpkg/utility.hxx>
 #include <bpkg/package-odb.hxx>
diff --git a/bpkg/types.hxx b/bpkg/types.hxx
index 37c38e5..31c325c 100644
--- a/bpkg/types.hxx
+++ b/bpkg/types.hxx
@@ -22,8 +22,8 @@
 
 #include <odb/lazy-ptr.hxx>
 
-#include <butl/path>
-#include <butl/optional>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
 
 namespace bpkg
 {
@@ -63,7 +63,7 @@ namespace bpkg
   using std::system_error;
   using io_error = std::ios_base::failure;
 
-  // <butl/optional>
+  // <libbutl/optional.hxx>
   //
   using butl::optional;
   using butl::nullopt;
@@ -73,7 +73,7 @@ namespace bpkg
   using odb::lazy_shared_ptr;
   using odb::lazy_weak_ptr;
 
-  // <butl/path>
+  // <libbutl/path.hxx>
   //
   using butl::path;
   using butl::dir_path;
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx
index c538035..842a311 100644
--- a/bpkg/utility.cxx
+++ b/bpkg/utility.cxx
@@ -6,8 +6,8 @@
 
 #include <iostream>     // cout, cin
 
-#include <butl/process>
-#include <butl/fdstream>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
 
 #include <bpkg/diagnostics.hxx>
 #include <bpkg/common-options.hxx>
diff --git a/bpkg/utility.hxx b/bpkg/utility.hxx
index c84b466..3314393 100644
--- a/bpkg/utility.hxx
+++ b/bpkg/utility.hxx
@@ -11,11 +11,11 @@
 #include <cassert>  // assert()
 #include <iterator> // make_move_iterator()
 
-#include <butl/ft/lang>
+#include <libbutl/ft/lang.hxx>
 
-#include <butl/utility> // casecmp(), reverse_iterate(), etc
+#include <libbutl/utility.hxx> // casecmp(), reverse_iterate(), etc
 
-#include <butl/filesystem>
+#include <libbutl/filesystem.hxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/version.hxx>
@@ -31,7 +31,7 @@ namespace bpkg
   using std::make_move_iterator;
   using std::to_string;
 
-  // <butl/utility>
+  // <libbutl/utility.hxx>
   //
   using butl::casecmp;
   using butl::reverse_iterate;
diff --git a/bpkg/version.hxx.in b/bpkg/version.hxx.in
index b51b69e..f6ca7c3 100644
--- a/bpkg/version.hxx.in
+++ b/bpkg/version.hxx.in
@@ -37,7 +37,7 @@
 #define BPKG_SNAPSHOT      $bpkg.version.snapshot_sn$ULL
 #define BPKG_SNAPSHOT_ID   "$bpkg.version.snapshot_id$"
 
-#include <butl/version>
+#include <libbutl/version.hxx>
 
 $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
 
diff --git a/bpkg/wrapper-traits.hxx b/bpkg/wrapper-traits.hxx
index bdd0861..1aed8ae 100644
--- a/bpkg/wrapper-traits.hxx
+++ b/bpkg/wrapper-traits.hxx
@@ -5,7 +5,7 @@
 #ifndef BPKG_WRAPPER_TRAITS_HXX
 #define BPKG_WRAPPER_TRAITS_HXX
 
-#include <butl/optional>
+#include <libbutl/optional.hxx>
 
 #include <odb/wrapper-traits.hxx>