aboutsummaryrefslogtreecommitdiff
path: root/load
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-04-29 23:55:46 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-04-30 23:57:17 +0300
commit8f3d3956b1e837c726859eb8bbe19dad79c54a42 (patch)
tree81ded52db212b12c7f685165702cce90aa0233cf /load
parentea60a6df471706a0eeb5ff1f774d69abe89e4bc9 (diff)
Add hxx extension for headers and lib prefix for library dirs
Diffstat (limited to 'load')
-rw-r--r--load/buildfile8
-rw-r--r--load/load.cli2
-rw-r--r--load/load.cxx12
-rw-r--r--load/types-parsers.cxx4
-rw-r--r--load/types-parsers.hxx (renamed from load/types-parsers)10
5 files changed, 18 insertions, 18 deletions
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.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 b/load/types-parsers.hxx
index 96acc07..b52c107 100644
--- a/load/types-parsers
+++ b/load/types-parsers.hxx
@@ -1,14 +1,14 @@
-// file : load/types-parsers -*- C++ -*-
+// 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
-#define BREP_LOAD_TYPES_PARSERS
+#ifndef BREP_LOAD_TYPES_PARSERS_HXX
+#define BREP_LOAD_TYPES_PARSERS_HXX
-#include <brep/types>
+#include <libbrep/types.hxx>
namespace cli
{
@@ -25,4 +25,4 @@ namespace cli
};
}
-#endif // BREP_LOAD_TYPES_PARSERS
+#endif // BREP_LOAD_TYPES_PARSERS_HXX