From a8758228f4737b9b930986ed7be1c7148aae9810 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 1 May 2017 19:33:47 +0300
Subject: Adapt to adding hxx extension for headers and lib prefix for library
 dir in libbutl

---
 bbot/agent.cxx                           |  4 ++--
 bbot/bootstrap-manifest.cxx              |  4 ++--
 bbot/bootstrap-manifest.hxx              |  4 ++--
 bbot/diagnostics.hxx                     |  2 +-
 bbot/machine-manifest.cxx                |  6 +++---
 bbot/machine-manifest.hxx                |  2 +-
 bbot/types.hxx                           | 16 ++++++++--------
 bbot/utility.hxx                         | 20 ++++++++++----------
 bbot/utility.txx                         |  6 +++---
 bbot/version.hxx.in                      |  2 +-
 bbot/worker.cxx                          |  4 ++--
 unit-tests/bootstrap-manifest/driver.cxx |  4 ++--
 12 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/bbot/agent.cxx b/bbot/agent.cxx
index bb0ccb7..3ebbd2d 100644
--- a/bbot/agent.cxx
+++ b/bbot/agent.cxx
@@ -19,8 +19,8 @@
 #include <chrono>
 #include <iostream>
 
-#include <butl/pager>
-#include <butl/filesystem> // dir_iterator
+#include <libbutl/pager.hxx>
+#include <libbutl/filesystem.hxx> // dir_iterator
 
 #include <libbbot/manifest.hxx>
 
diff --git a/bbot/bootstrap-manifest.cxx b/bbot/bootstrap-manifest.cxx
index ebbc7ce..e9697bd 100644
--- a/bbot/bootstrap-manifest.cxx
+++ b/bbot/bootstrap-manifest.cxx
@@ -4,8 +4,8 @@
 
 #include <bbot/bootstrap-manifest.hxx>
 
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 using namespace butl;
 
diff --git a/bbot/bootstrap-manifest.hxx b/bbot/bootstrap-manifest.hxx
index 69fb358..6b56785 100644
--- a/bbot/bootstrap-manifest.hxx
+++ b/bbot/bootstrap-manifest.hxx
@@ -7,8 +7,8 @@
 
 #include <map>
 
-#include <butl/manifest-forward>
-#include <butl/standard-version>
+#include <libbutl/manifest-forward.hxx>
+#include <libbutl/standard-version.hxx>
 
 #include <bbot/types.hxx>
 #include <bbot/utility.hxx>
diff --git a/bbot/diagnostics.hxx b/bbot/diagnostics.hxx
index 07052a0..bfeeb2a 100644
--- a/bbot/diagnostics.hxx
+++ b/bbot/diagnostics.hxx
@@ -5,7 +5,7 @@
 #ifndef BBOT_DIAGNOSTICS_HXX
 #define BBOT_DIAGNOSTICS_HXX
 
-#include <butl/diagnostics>
+#include <libbutl/diagnostics.hxx>
 
 #include <bbot/types.hxx> // Note: not <bbot/utility>.
 
diff --git a/bbot/machine-manifest.cxx b/bbot/machine-manifest.cxx
index 54ed43f..dd3b7de 100644
--- a/bbot/machine-manifest.cxx
+++ b/bbot/machine-manifest.cxx
@@ -4,9 +4,9 @@
 
 #include <bbot/machine-manifest.hxx>
 
-#include <butl/string-parser>
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/string-parser.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 using namespace butl;
 
diff --git a/bbot/machine-manifest.hxx b/bbot/machine-manifest.hxx
index fa6139f..efcdda4 100644
--- a/bbot/machine-manifest.hxx
+++ b/bbot/machine-manifest.hxx
@@ -7,7 +7,7 @@
 
 #include <map>
 
-#include <butl/manifest-forward>
+#include <libbutl/manifest-forward.hxx>
 
 #include <libbbot/manifest.hxx> // machine_header
 
diff --git a/bbot/types.hxx b/bbot/types.hxx
index 20f9f23..0ab6377 100644
--- a/bbot/types.hxx
+++ b/bbot/types.hxx
@@ -20,10 +20,10 @@
 #include <stdexcept>     // logic_error, invalid_argument, runtime_error
 #include <system_error>
 
-#include <butl/path>
-#include <butl/optional>
-#include <butl/vector-view>
-#include <butl/small-vector>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/vector-view.hxx>
+#include <libbutl/small-vector.hxx>
 
 namespace bbot
 {
@@ -63,20 +63,20 @@ namespace bbot
   using std::system_error;
   using io_error = std::ios_base::failure;
 
-  // <butl/optional>
+  // <libbutl/optional.hxx>
   //
   using butl::optional;
   using butl::nullopt;
 
-  // <butl/vector-view>
+  // <libbutl/vector-view.hxx>
   //
   using butl::vector_view;
 
-  // <butl/small-vector>
+  // <libbutl/small-vector.hxx>
   //
   using butl::small_vector;
 
-  // <butl/path>
+  // <libbutl/path.hxx>
   //
   using butl::path;
   using butl::dir_path;
diff --git a/bbot/utility.hxx b/bbot/utility.hxx
index f6f0349..73804a4 100644
--- a/bbot/utility.hxx
+++ b/bbot/utility.hxx
@@ -11,14 +11,14 @@
 #include <cassert>  // assert()
 #include <iterator> // make_move_iterator()
 
-#include <butl/ft/lang>
+#include <libbutl/ft/lang.hxx>
 
-#include <butl/curl>
-#include <butl/process>
-#include <butl/process-io>
-#include <butl/utility>    // casecmp(), reverse_iterate(), etc
-#include <butl/fdstream>
-#include <butl/filesystem>
+#include <libbutl/curl.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/process-io.hxx>
+#include <libbutl/utility.hxx>    // casecmp(), reverse_iterate(), etc
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
 
 #include <bbot/types.hxx>
 #include <bbot/version.hxx>
@@ -35,7 +35,7 @@ namespace bbot
   using std::to_string;
   using std::stoull;
 
-  // <butl/utility>
+  // <libbutl/utility.hxx>
   //
   using butl::casecmp;
   using butl::reverse_iterate;
@@ -43,11 +43,11 @@ namespace bbot
   using butl::exception_guard;
   using butl::make_exception_guard;
 
-  // <butl/fdstream>
+  // <libbutl/fdstream.hxx>
   //
   using butl::auto_fd;
 
-  // <butl/filesystem>
+  // <libbutl/filesystem.hxx>
   //
   using butl::auto_rmdir;
   using butl::auto_rmfile;
diff --git a/bbot/utility.txx b/bbot/utility.txx
index 519762b..688eb9c 100644
--- a/bbot/utility.txx
+++ b/bbot/utility.txx
@@ -4,10 +4,10 @@
 
 #include <iostream> // cin
 
-#include <butl/fdstream>
+#include <libbutl/fdstream.hxx>
 
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <bbot/diagnostics.hxx>
 
diff --git a/bbot/version.hxx.in b/bbot/version.hxx.in
index 9f451e8..2b8ca54 100644
--- a/bbot/version.hxx.in
+++ b/bbot/version.hxx.in
@@ -37,7 +37,7 @@
 #define BBOT_SNAPSHOT      $bbot.version.snapshot_sn$ULL
 #define BBOT_SNAPSHOT_ID   "$bbot.version.snapshot_id$"
 
-#include <butl/version>
+#include <libbutl/version.hxx>
 
 $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
 
diff --git a/bbot/worker.cxx b/bbot/worker.cxx
index 70440b0..acfff29 100644
--- a/bbot/worker.cxx
+++ b/bbot/worker.cxx
@@ -10,8 +10,8 @@
 
 #include <iostream>
 
-#include <butl/pager>
-#include <butl/filesystem>
+#include <libbutl/pager.hxx>
+#include <libbutl/filesystem.hxx>
 
 #include <libbbot/manifest.hxx>
 
diff --git a/unit-tests/bootstrap-manifest/driver.cxx b/unit-tests/bootstrap-manifest/driver.cxx
index 1412c21..f08cbca 100644
--- a/unit-tests/bootstrap-manifest/driver.cxx
+++ b/unit-tests/bootstrap-manifest/driver.cxx
@@ -5,8 +5,8 @@
 #include <ios>      // ios_base::failbit, ios_base::badbit
 #include <iostream>
 
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <bbot/types.hxx>
 #include <bbot/utility.hxx>
-- 
cgit v1.1