From 8f3d3956b1e837c726859eb8bbe19dad79c54a42 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 29 Apr 2017 23:55:46 +0300
Subject: Add hxx extension for headers and lib prefix for library dirs

---
 load/buildfile         |  8 ++++----
 load/load.cli          |  2 +-
 load/load.cxx          | 12 ++++++------
 load/types-parsers     | 28 ----------------------------
 load/types-parsers.cxx |  4 ++--
 load/types-parsers.hxx | 28 ++++++++++++++++++++++++++++
 6 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 load/types-parsers
 create mode 100644 load/types-parsers.hxx

(limited to 'load')

diff --git a/load/buildfile b/load/buildfile
index 530dc72..e377a8e 100644
--- a/load/buildfile
+++ b/load/buildfile
@@ -7,13 +7,13 @@ import libs += libodb-pgsql%lib{odb-pgsql}
 import libs += libbutl%lib{butl}
 import libs += libbpkg%lib{bpkg}
 
-include ../brep/
+include ../libbrep/
 
 exe{brep-load}:                    \
 {            cxx}{ load          } \
 {hxx ixx     cxx}{ load-options  } \
 {hxx         cxx}{ types-parsers } \
-../brep/lib{brep} $libs
+../libbrep/lib{brep} $libs
 
 # Generated options parser.
 #
@@ -22,8 +22,8 @@ if $cli.configured
   cli.cxx{load-options}: cli{load}
 
   cli.options += -I $src_root --include-with-brackets --include-prefix load \
---guard-prefix LOAD --generate-specifier --page-usage print_ --ansi-color \
---cxx-prologue "#include <load/types-parsers>" \
+--guard-prefix LOAD --generate-specifier --page-usage print_ --ansi-color   \
+--cxx-prologue "#include <load/types-parsers.hxx>"                          \
 --long-usage
 
   # Include generated cli files into the distribution.
diff --git a/load/load.cli b/load/load.cli
index fe05ad2..51a34c3 100644
--- a/load/load.cli
+++ b/load/load.cli
@@ -6,7 +6,7 @@ include <vector>;
 include <string>;
 include <cstdint>; // uint16_t
 
-include <brep/types>;
+include <libbrep/types.hxx>;
 
 "\section=1"
 "\name=brep-load"
diff --git a/load/load.cxx b/load/load.cxx
index 3e9526f..3888c0f 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -27,14 +27,14 @@
 
 #include <bpkg/manifest>
 
-#include <brep/types>
-#include <brep/utility>
+#include <libbrep/types.hxx>
+#include <libbrep/utility.hxx>
 
-#include <brep/package>
-#include <brep/package-odb>
-#include <brep/database-lock>
+#include <libbrep/package.hxx>
+#include <libbrep/package-odb.hxx>
+#include <libbrep/database-lock.hxx>
 
-#include <load/load-options>
+#include <load/load-options.hxx>
 
 using namespace std;
 using namespace odb::core;
diff --git a/load/types-parsers b/load/types-parsers
deleted file mode 100644
index 96acc07..0000000
--- a/load/types-parsers
+++ /dev/null
@@ -1,28 +0,0 @@
-// file      : load/types-parsers -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-// CLI parsers, included into the generated source files.
-//
-
-#ifndef BREP_LOAD_TYPES_PARSERS
-#define BREP_LOAD_TYPES_PARSERS
-
-#include <brep/types>
-
-namespace cli
-{
-  class scanner;
-
-  template <typename T>
-  struct parser;
-
-  template <>
-  struct parser<brep::path>
-  {
-    static void
-    parse (brep::path&, bool&, scanner&);
-  };
-}
-
-#endif // BREP_LOAD_TYPES_PARSERS
diff --git a/load/types-parsers.cxx b/load/types-parsers.cxx
index c388bda..c3d895f 100644
--- a/load/types-parsers.cxx
+++ b/load/types-parsers.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <load/types-parsers>
+#include <load/types-parsers.hxx>
 
-#include <load/load-options> // cli namespace
+#include <load/load-options.hxx> // cli namespace
 
 using namespace brep;
 
diff --git a/load/types-parsers.hxx b/load/types-parsers.hxx
new file mode 100644
index 0000000..b52c107
--- /dev/null
+++ b/load/types-parsers.hxx
@@ -0,0 +1,28 @@
+// file      : load/types-parsers.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+// CLI parsers, included into the generated source files.
+//
+
+#ifndef BREP_LOAD_TYPES_PARSERS_HXX
+#define BREP_LOAD_TYPES_PARSERS_HXX
+
+#include <libbrep/types.hxx>
+
+namespace cli
+{
+  class scanner;
+
+  template <typename T>
+  struct parser;
+
+  template <>
+  struct parser<brep::path>
+  {
+    static void
+    parse (brep::path&, bool&, scanner&);
+  };
+}
+
+#endif // BREP_LOAD_TYPES_PARSERS_HXX
-- 
cgit v1.1