diff options
| -rw-r--r-- | brep/.gitignore | 10 | ||||
| -rwxr-xr-x | brep/odb.sh | 37 | ||||
| -rw-r--r-- | build/export.build | 4 | ||||
| -rw-r--r-- | build/root.build | 2 | ||||
| -rw-r--r-- | buildfile | 2 | ||||
| -rw-r--r-- | libbrep/.gitignore | 10 | ||||
| -rw-r--r-- | libbrep/build.cxx (renamed from brep/build.cxx) | 4 | ||||
| -rw-r--r-- | libbrep/build.hxx (renamed from brep/build) | 16 | ||||
| -rw-r--r-- | libbrep/build.xml (renamed from brep/build.xml) | 0 | ||||
| -rw-r--r-- | libbrep/buildfile (renamed from brep/buildfile) | 6 | ||||
| -rw-r--r-- | libbrep/common.cxx (renamed from brep/common.cxx) | 4 | ||||
| -rw-r--r-- | libbrep/common.hxx (renamed from brep/common) | 12 | ||||
| -rw-r--r-- | libbrep/database-lock.cxx (renamed from brep/database-lock.cxx) | 4 | ||||
| -rw-r--r-- | libbrep/database-lock.hxx (renamed from brep/database-lock) | 12 | ||||
| -rwxr-xr-x | libbrep/odb.sh | 40 | ||||
| -rw-r--r-- | libbrep/package-extra.sql (renamed from brep/package-extra.sql) | 0 | ||||
| -rw-r--r-- | libbrep/package-traits.cxx (renamed from brep/package-traits.cxx) | 4 | ||||
| -rw-r--r-- | libbrep/package-traits.hxx (renamed from brep/package-traits) | 2 | ||||
| -rw-r--r-- | libbrep/package.cxx (renamed from brep/package.cxx) | 6 | ||||
| -rw-r--r-- | libbrep/package.hxx (renamed from brep/package) | 14 | ||||
| -rw-r--r-- | libbrep/package.xml (renamed from brep/package.xml) | 0 | ||||
| -rw-r--r-- | libbrep/types.hxx (renamed from brep/types) | 8 | ||||
| -rw-r--r-- | libbrep/utility.hxx (renamed from brep/utility) | 10 | ||||
| -rw-r--r-- | libbrep/version.hxx.in (renamed from brep/version.in) | 4 | ||||
| -rw-r--r-- | libbrep/wrapper-traits.hxx (renamed from brep/wrapper-traits) | 8 | ||||
| -rw-r--r-- | load/buildfile | 8 | ||||
| -rw-r--r-- | load/load.cli | 2 | ||||
| -rw-r--r-- | load/load.cxx | 12 | ||||
| -rw-r--r-- | load/types-parsers.cxx | 4 | ||||
| -rw-r--r-- | load/types-parsers.hxx (renamed from load/types-parsers) | 10 | ||||
| -rw-r--r-- | migrate/buildfile | 10 | ||||
| -rw-r--r-- | migrate/migrate.cxx | 10 | ||||
| -rw-r--r-- | mod/build-config.cxx | 2 | ||||
| -rw-r--r-- | mod/build-config.hxx (renamed from mod/build-config) | 14 | ||||
| -rw-r--r-- | mod/buildfile | 10 | ||||
| -rw-r--r-- | mod/database-module.cxx | 8 | ||||
| -rw-r--r-- | mod/database-module.hxx (renamed from mod/database-module) | 18 | ||||
| -rw-r--r-- | mod/database.cxx | 2 | ||||
| -rw-r--r-- | mod/database.hxx (renamed from mod/database) | 12 | ||||
| -rw-r--r-- | mod/diagnostics.cxx | 2 | ||||
| -rw-r--r-- | mod/diagnostics.hxx (renamed from mod/diagnostics) | 12 | ||||
| -rw-r--r-- | mod/mod-build-force.cxx | 14 | ||||
| -rw-r--r-- | mod/mod-build-force.hxx (renamed from mod/mod-build-force) | 16 | ||||
| -rw-r--r-- | mod/mod-build-log.cxx | 14 | ||||
| -rw-r--r-- | mod/mod-build-log.hxx (renamed from mod/mod-build-log) | 16 | ||||
| -rw-r--r-- | mod/mod-build-result.cxx | 18 | ||||
| -rw-r--r-- | mod/mod-build-result.hxx (renamed from mod/mod-build-result) | 16 | ||||
| -rw-r--r-- | mod/mod-build-task.cxx | 18 | ||||
| -rw-r--r-- | mod/mod-build-task.hxx (renamed from mod/mod-build-task) | 16 | ||||
| -rw-r--r-- | mod/mod-package-details.cxx | 16 | ||||
| -rw-r--r-- | mod/mod-package-details.hxx (renamed from mod/mod-package-details) | 16 | ||||
| -rw-r--r-- | mod/mod-package-search.cxx | 16 | ||||
| -rw-r--r-- | mod/mod-package-search.hxx (renamed from mod/mod-package-search) | 16 | ||||
| -rw-r--r-- | mod/mod-package-version-details.cxx | 16 | ||||
| -rw-r--r-- | mod/mod-package-version-details.hxx (renamed from mod/mod-package-version-details) | 16 | ||||
| -rw-r--r-- | mod/mod-repository-details.cxx | 16 | ||||
| -rw-r--r-- | mod/mod-repository-details.hxx (renamed from mod/mod-repository-details) | 16 | ||||
| -rw-r--r-- | mod/mod-repository-root.cxx | 26 | ||||
| -rw-r--r-- | mod/mod-repository-root.hxx (renamed from mod/mod-repository-root) | 16 | ||||
| -rw-r--r-- | mod/module.cxx | 8 | ||||
| -rw-r--r-- | mod/module.hxx (renamed from mod/module) | 18 | ||||
| -rw-r--r-- | mod/options-types.hxx (renamed from mod/options-types) | 12 | ||||
| -rw-r--r-- | mod/options.cli | 6 | ||||
| -rw-r--r-- | mod/page.cxx | 10 | ||||
| -rw-r--r-- | mod/page.hxx (renamed from mod/page) | 18 | ||||
| -rw-r--r-- | mod/services.cxx | 8 | ||||
| -rw-r--r-- | mod/types-parsers.cxx | 4 | ||||
| -rw-r--r-- | mod/types-parsers.hxx (renamed from mod/types-parsers) | 16 | ||||
| -rw-r--r-- | tests/load/buildfile | 4 | ||||
| -rw-r--r-- | tests/load/driver.cxx | 8 | ||||
| -rw-r--r-- | tests/web/xhtml/driver.cxx | 2 | ||||
| -rw-r--r-- | web/apache/log.hxx (renamed from web/apache/log) | 10 | ||||
| -rw-r--r-- | web/apache/request.cxx | 4 | ||||
| -rw-r--r-- | web/apache/request.hxx (renamed from web/apache/request) | 12 | ||||
| -rw-r--r-- | web/apache/service.cxx | 6 | ||||
| -rw-r--r-- | web/apache/service.hxx (renamed from web/apache/service) | 14 | ||||
| -rw-r--r-- | web/apache/stream.hxx (renamed from web/apache/stream) | 10 | ||||
| -rw-r--r-- | web/mime-url-encoding.cxx | 2 | ||||
| -rw-r--r-- | web/mime-url-encoding.hxx (renamed from web/mime-url-encoding) | 8 | ||||
| -rw-r--r-- | web/module.hxx (renamed from web/module) | 8 | ||||
| -rw-r--r-- | web/xhtml-fragment.cxx | 4 | ||||
| -rw-r--r-- | web/xhtml-fragment.hxx (renamed from web/xhtml-fragment) | 8 | ||||
| -rw-r--r-- | web/xhtml.hxx (renamed from web/xhtml) | 8 |
83 files changed, 432 insertions, 429 deletions
diff --git a/brep/.gitignore b/brep/.gitignore deleted file mode 100644 index 1e5e1f9..0000000 --- a/brep/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -common-odb* - -package-odb* -package.sql -package-extra - -build-odb* -build.sql - -version diff --git a/brep/odb.sh b/brep/odb.sh deleted file mode 100755 index 7fb7fa0..0000000 --- a/brep/odb.sh +++ /dev/null @@ -1,37 +0,0 @@ -#! /usr/bin/env bash - -trap 'exit 1' ERR - -odb=odb -lib="\ --I$HOME/work/odb/libodb-sqlite-default \ --I$HOME/work/odb/libodb-sqlite \ --I$HOME/work/odb/libodb-default \ --I$HOME/work/odb/libodb" - -$odb $lib -d pgsql --std c++11 --generate-query \ - --odb-epilogue '#include <brep/wrapper-traits>' \ - --hxx-prologue '#include <brep/wrapper-traits>' \ - -I .. -I ../../libbbot -I ../../libbpkg -I ../../libbutl \ - --hxx-suffix "" --include-with-brackets \ - --include-prefix brep --guard-prefix BREP \ - common - -$odb $lib -d pgsql --std c++11 --generate-query --generate-schema \ - --schema-format sql --schema-format embedded --schema-name package \ - --generate-prepared --odb-epilogue '#include <brep/wrapper-traits>' \ - --hxx-prologue '#include <brep/package-traits>' \ - -I .. -I ../../libbbot -I ../../libbpkg -I ../../libbutl \ - --hxx-suffix "" --include-with-brackets \ - --include-prefix brep --guard-prefix BREP \ - package - -xxd -i <package-extra.sql >package-extra - -$odb $lib -d pgsql --std c++11 --generate-query --generate-schema \ - --schema-format sql --schema-format embedded --schema-name build \ - --generate-prepared --odb-epilogue '#include <brep/wrapper-traits>' \ - -I .. -I ../../libbbot -I ../../libbpkg -I ../../libbutl \ - --hxx-suffix "" --include-with-brackets \ - --include-prefix brep --guard-prefix BREP \ - build diff --git a/build/export.build b/build/export.build index ec930b1..0c38d80 100644 --- a/build/export.build +++ b/build/export.build @@ -4,7 +4,7 @@ $out_root/: { - include brep/ + include libbrep/ } -export $out_root/brep/lib{brep} +export $out_root/libbrep/lib{brep} diff --git a/build/root.build b/build/root.build index b273cae..d75dbcf 100644 --- a/build/root.build +++ b/build/root.build @@ -6,7 +6,7 @@ cxx.std = latest using cxx -hxx{*}: extension = +hxx{*}: extension = hxx ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx @@ -2,7 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -./: brep/ mod/ load/ migrate/ tests/ www/ doc/ etc/ \ +./: libbrep/ mod/ load/ migrate/ tests/ www/ doc/ etc/ \ doc{INSTALL INSTALL-DEV LICENSE NEWS README version} file{manifest} doc{version}: file{manifest} # Generated by the version module. diff --git a/libbrep/.gitignore b/libbrep/.gitignore new file mode 100644 index 0000000..3f251f5 --- /dev/null +++ b/libbrep/.gitignore @@ -0,0 +1,10 @@ +common-odb.?xx + +package-odb.?xx +package.sql +package-extra.hxx + +build-odb.?xx +build.sql + +version.hxx diff --git a/brep/build.cxx b/libbrep/build.cxx index d795ba6..710c0b2 100644 --- a/brep/build.cxx +++ b/libbrep/build.cxx @@ -1,8 +1,8 @@ -// file : brep/build.cxx -*- C++ -*- +// file : libbrep/build.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/build> +#include <libbrep/build.hxx> namespace brep { diff --git a/brep/build b/libbrep/build.hxx index 43ca230..d28f5ab 100644 --- a/brep/build +++ b/libbrep/build.hxx @@ -1,21 +1,21 @@ -// file : brep/build -*- C++ -*- +// file : libbrep/build.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_BUILD -#define BREP_BUILD +#ifndef LIBBREP_BUILD_HXX +#define LIBBREP_BUILD_HXX #include <chrono> #include <odb/core.hxx> #include <odb/section.hxx> -#include <bbot/manifest> +#include <libbbot/manifest.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <brep/common> // Must be included last (see assert). +#include <libbrep/common.hxx> // Must be included last (see assert). // Used by the data migration entries. // @@ -163,4 +163,4 @@ namespace brep }; } -#endif // BREP_BUILD +#endif // LIBBREP_BUILD_HXX diff --git a/brep/build.xml b/libbrep/build.xml index 8d9178a..8d9178a 100644 --- a/brep/build.xml +++ b/libbrep/build.xml diff --git a/brep/buildfile b/libbrep/buildfile index 2da0281..b4005ab 100644 --- a/brep/buildfile +++ b/libbrep/buildfile @@ -1,4 +1,4 @@ -# file : brep/buildfile +# file : libbrep/buildfile # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file @@ -45,6 +45,6 @@ else lib{brep}: cxx.export.poptions = "-I$out_root" "-I$src_root" lib{brep}: cxx.export.libs = $int_libs -# Install into the brep/ subdirectory of, say, /usr/include/. +# Install into the libbrep/ subdirectory of, say, /usr/include/. # -install.include = $install.include/brep/ +install.include = $install.include/libbrep/ diff --git a/brep/common.cxx b/libbrep/common.cxx index 4847977..39fd0c7 100644 --- a/brep/common.cxx +++ b/libbrep/common.cxx @@ -1,8 +1,8 @@ -// file : brep/common.cxx -*- C++ -*- +// file : libbrep/common.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/common> +#include <libbrep/common.hxx> namespace brep { diff --git a/brep/common b/libbrep/common.hxx index 52f225c..bf60491 100644 --- a/brep/common +++ b/libbrep/common.hxx @@ -1,16 +1,16 @@ -// file : brep/common -*- C++ -*- +// file : libbrep/common.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_COMMON -#define BREP_COMMON +#ifndef LIBBREP_COMMON_HXX +#define LIBBREP_COMMON_HXX #include <ratio> #include <chrono> #include <type_traits> // static_assert -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> // The uint16_t value range is not fully covered by SMALLINT PostgreSQL type // to which uint16_t is mapped by default. @@ -338,4 +338,4 @@ namespace brep } } -#endif // BREP_COMMON +#endif // LIBBREP_COMMON_HXX diff --git a/brep/database-lock.cxx b/libbrep/database-lock.cxx index 88f3603..c69c240 100644 --- a/brep/database-lock.cxx +++ b/libbrep/database-lock.cxx @@ -1,8 +1,8 @@ -// file : brep/database-lock.cxx -*- C++ -*- +// file : libbrep/database-lock.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/database-lock> +#include <libbrep/database-lock.hxx> #include <odb/pgsql/database.hxx> #include <odb/pgsql/exceptions.hxx> diff --git a/brep/database-lock b/libbrep/database-lock.hxx index 6bf21c9..60d57a4 100644 --- a/brep/database-lock +++ b/libbrep/database-lock.hxx @@ -1,15 +1,15 @@ -// file : brep/database-lock -*- C++ -*- +// file : libbrep/database-lock.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_DATABASE_LOCK -#define BREP_DATABASE_LOCK +#ifndef LIBBREP_DATABASE_LOCK_HXX +#define LIBBREP_DATABASE_LOCK_HXX #include <odb/pgsql/forward.hxx> // database, transaction #include <odb/pgsql/connection.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> namespace brep { @@ -40,4 +40,4 @@ namespace brep }; } -#endif // BREP_DATABASE_LOCK +#endif // LIBBREP_DATABASE_LOCK_HXX diff --git a/libbrep/odb.sh b/libbrep/odb.sh new file mode 100755 index 0000000..b794a2d --- /dev/null +++ b/libbrep/odb.sh @@ -0,0 +1,40 @@ +#! /usr/bin/env bash + +trap 'exit 1' ERR + +odb=odb +lib="\ +-I$HOME/work/odb/libodb-pgsql-default \ +-I$HOME/work/odb/libodb-pgsql \ +-I$HOME/work/odb/libodb-default \ +-I$HOME/work/odb/libodb" + +$odb $lib -d pgsql --std c++11 --generate-query \ + --odb-epilogue '#include <libbrep/wrapper-traits.hxx>' \ + --hxx-prologue '#include <libbrep/wrapper-traits.hxx>' \ + -DLIBODB_BUILD2 -DLIBODB_PGSQL_BUILD2 \ + -I .. -I ../../libbbot -I ../../libbpkg -I ../../libbutl \ + --hxx-suffix ".hxx" --include-with-brackets \ + --include-prefix libbrep --guard-prefix LIBBREP \ + common.hxx + +$odb $lib -d pgsql --std c++11 --generate-query --generate-schema \ + --schema-format sql --schema-format embedded --schema-name package \ + --odb-epilogue '#include <libbrep/wrapper-traits.hxx>' \ + --hxx-prologue '#include <libbrep/package-traits.hxx>' \ + --generate-prepared -DLIBODB_BUILD2 -DLIBODB_PGSQL_BUILD2 \ + -I .. -I ../../libbbot -I ../../libbpkg -I ../../libbutl \ + --hxx-suffix ".hxx" --include-with-brackets \ + --include-prefix libbrep --guard-prefix LIBBREP \ + package.hxx + +xxd -i <package-extra.sql >package-extra.hxx + +$odb $lib -d pgsql --std c++11 --generate-query --generate-schema \ + --schema-format sql --schema-format embedded --schema-name build \ + --odb-epilogue '#include <libbrep/wrapper-traits.hxx>' \ + --generate-prepared -DLIBODB_BUILD2 -DLIBODB_PGSQL_BUILD2 \ + -I .. -I ../../libbbot -I ../../libbpkg -I ../../libbutl \ + --hxx-suffix ".hxx" --include-with-brackets \ + --include-prefix libbrep --guard-prefix LIBBREP \ + build.hxx diff --git a/brep/package-extra.sql b/libbrep/package-extra.sql index 823c3af..823c3af 100644 --- a/brep/package-extra.sql +++ b/libbrep/package-extra.sql diff --git a/brep/package-traits.cxx b/libbrep/package-traits.cxx index 8cdcf65..a03cbac 100644 --- a/brep/package-traits.cxx +++ b/libbrep/package-traits.cxx @@ -1,8 +1,8 @@ -// file : brep/package-traits.cxx -*- C++ -*- +// file : libbrep/package-traits.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/package-traits> +#include <libbrep/package-traits.hxx> #include <string> #include <ostream> diff --git a/brep/package-traits b/libbrep/package-traits.hxx index f6bcc6e..b626ea8 100644 --- a/brep/package-traits +++ b/libbrep/package-traits.hxx @@ -9,7 +9,7 @@ #include <odb/pgsql/traits.hxx> -#include <brep/package> // weighted_text +#include <libbrep/package.hxx> // weighted_text namespace odb { diff --git a/brep/package.cxx b/libbrep/package.cxx index 144fc05..20be387 100644 --- a/brep/package.cxx +++ b/libbrep/package.cxx @@ -1,12 +1,12 @@ -// file : brep/package.cxx -*- C++ -*- +// file : libbrep/package.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/package> +#include <libbrep/package.hxx> #include <odb/database.hxx> -#include <brep/package-odb> +#include <libbrep/package-odb.hxx> using namespace std; using namespace odb::core; diff --git a/brep/package b/libbrep/package.hxx index ba7490f..8164639 100644 --- a/brep/package +++ b/libbrep/package.hxx @@ -1,9 +1,9 @@ -// file : brep/package -*- C++ -*- +// file : libbrep/package.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_PACKAGE -#define BREP_PACKAGE +#ifndef LIBBREP_PACKAGE_HXX +#define LIBBREP_PACKAGE_HXX #include <map> #include <chrono> @@ -11,10 +11,10 @@ #include <odb/core.hxx> #include <odb/nested-container.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <brep/common> // Must be included last (see assert). +#include <libbrep/common.hxx> // Must be included last (see assert). // Used by the data migration entries. // @@ -497,4 +497,4 @@ namespace brep }; } -#endif // BREP_PACKAGE +#endif // LIBBREP_PACKAGE_HXX diff --git a/brep/package.xml b/libbrep/package.xml index 657c2fc..657c2fc 100644 --- a/brep/package.xml +++ b/libbrep/package.xml diff --git a/brep/types b/libbrep/types.hxx index fb036c4..a0001a7 100644 --- a/brep/types +++ b/libbrep/types.hxx @@ -1,9 +1,9 @@ -// file : brep/types -*- C++ -*- +// file : libbrep/types.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_TYPES -#define BREP_TYPES +#ifndef LIBBREP_TYPES_HXX +#define LIBBREP_TYPES_HXX #include <vector> #include <string> @@ -91,4 +91,4 @@ namespace brep using butl::timestamp_nonexistent; } -#endif // BREP_TYPES +#endif // LIBBREP_TYPES_HXX diff --git a/brep/utility b/libbrep/utility.hxx index 3c6f5a2..f5948dd 100644 --- a/brep/utility +++ b/libbrep/utility.hxx @@ -1,9 +1,9 @@ -// file : brep/utility -*- C++ -*- +// file : libbrep/utility.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_UTILITY -#define BREP_UTILITY +#ifndef LIBBREP_UTILITY_HXX +#define LIBBREP_UTILITY_HXX #include <memory> // make_shared() #include <string> // to_string() @@ -29,6 +29,6 @@ namespace brep using butl::reverse_iterate; } -#include <brep/version> +#include <libbrep/version.hxx> -#endif // BREP_UTILITY +#endif // LIBBREP_UTILITY_HXX diff --git a/brep/version.in b/libbrep/version.hxx.in index a5b236e..e1b60a2 100644 --- a/brep/version.in +++ b/libbrep/version.hxx.in @@ -1,4 +1,4 @@ -// file : brep/version.in -*- C++ -*- +// file : libbrep/version.hxx.in -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file @@ -45,7 +45,7 @@ $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$ $libbpkg.check(LIBBPKG_VERSION, LIBBPKG_SNAPSHOT)$ -#include <bbot/version> +#include <libbbot/version.hxx> $libbbot.check(LIBBBOT_VERSION, LIBBBOT_SNAPSHOT)$ diff --git a/brep/wrapper-traits b/libbrep/wrapper-traits.hxx index 4be84b7..ac039e3 100644 --- a/brep/wrapper-traits +++ b/libbrep/wrapper-traits.hxx @@ -1,9 +1,9 @@ -// file : brep/wrapper-traits -*- C++ -*- +// file : libbrep/wrapper-traits.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_WRAPPER_TRAITS -#define BREP_WRAPPER_TRAITS +#ifndef LIBBREP_WRAPPER_TRAITS_HXX +#define LIBBREP_WRAPPER_TRAITS_HXX #include <odb/pre.hxx> @@ -60,4 +60,4 @@ namespace odb #include <odb/post.hxx> -#endif // BREP_WRAPPER_TRAITS +#endif // LIBBREP_WRAPPER_TRAITS_HXX 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 diff --git a/migrate/buildfile b/migrate/buildfile index 6b2ddd1..0c8fc97 100644 --- a/migrate/buildfile +++ b/migrate/buildfile @@ -6,12 +6,12 @@ import libs = libodb%lib{odb} import libs += libodb-pgsql%lib{odb-pgsql} import libs += libbutl%lib{butl} -include ../brep/ +include ../libbrep/ exe{brep-migrate}: \ { cxx}{ migrate } \ {hxx ixx cxx}{ migrate-options } \ -../brep/lib{brep} $libs +../libbrep/lib{brep} $libs # Generated options parser. # @@ -19,9 +19,9 @@ if $cli.configured { cli.cxx{migrate-options}: cli{migrate} - cli.options += -I $src_root --include-with-brackets --include-prefix migrate \ ---guard-prefix MIGRATE --generate-specifier --page-usage print_ --ansi-color \ ---long-usage + cli.options += -I $src_root --include-with-brackets \ +--include-prefix migrate --guard-prefix MIGRATE --generate-specifier \ +--page-usage print_ --ansi-color --long-usage # Include generated cli files into the distribution. # diff --git a/migrate/migrate.cxx b/migrate/migrate.cxx index e785531..047dfe0 100644 --- a/migrate/migrate.cxx +++ b/migrate/migrate.cxx @@ -15,12 +15,12 @@ #include <butl/pager> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <brep/database-lock> +#include <libbrep/database-lock.hxx> -#include <migrate/migrate-options> +#include <migrate/migrate-options.hxx> using namespace std; using namespace odb::core; @@ -321,7 +321,7 @@ try if (create || drop) { static const char package_extras[] = { -#include <brep/package-extra> +#include <libbrep/package-extra.hxx> , '\0'}; schema s (db_schema == "package" diff --git a/mod/build-config.cxx b/mod/build-config.cxx index 11be1b9..9cbd1bf 100644 --- a/mod/build-config.cxx +++ b/mod/build-config.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/build-config> +#include <mod/build-config.hxx> #include <map> diff --git a/mod/build-config b/mod/build-config.hxx index a5713d7..13024dc 100644 --- a/mod/build-config +++ b/mod/build-config.hxx @@ -1,14 +1,14 @@ -// file : mod/build-config -*- C++ -*- +// file : mod/build-config.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_BUILD_CONFIG -#define MOD_BUILD_CONFIG +#ifndef MOD_BUILD_CONFIG_HXX +#define MOD_BUILD_CONFIG_HXX -#include <bbot/build-config> +#include <libbbot/build-config.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> namespace brep { @@ -20,4 +20,4 @@ namespace brep shared_build_config (const path&); } -#endif // MOD_BUILD_CONFIG +#endif // MOD_BUILD_CONFIG_HXX diff --git a/mod/buildfile b/mod/buildfile index 771b52b..f845a42 100644 --- a/mod/buildfile +++ b/mod/buildfile @@ -16,7 +16,7 @@ import libs += libbutl%lib{butl} import libs += libbpkg%lib{bpkg} import libs += libbbot%lib{bbot} -include ../brep/ +include ../libbrep/ mod{brep}: \ {hxx cxx}{ build-config } \ @@ -46,7 +46,7 @@ mod{brep}: \ ../web/apache/{hxx ixx cxx}{ request } \ ../web/apache/{hxx txx cxx}{ service } \ ../web/apache/{hxx }{ stream } \ -../brep/lib{brep} $libs +../libbrep/lib{brep} $libs # Don't install any of the module's headers. # @@ -62,9 +62,9 @@ if $cli.configured # Set option prefix to the empty value to handle all unknown request # parameters uniformly with a single catch block. # - cli.options += --std c++11 -I $src_root --include-with-brackets \ ---include-prefix mod --guard-prefix MOD --generate-specifier \ ---cxx-prologue "#include <mod/types-parsers>" \ + cli.options += --std c++11 -I $src_root --include-with-brackets \ +--include-prefix mod --guard-prefix MOD --generate-specifier \ +--cxx-prologue "#include <mod/types-parsers.hxx>" \ --cli-namespace brep::cli --generate-file-scanner --suppress-usage \ --generate-modifier --generate-description --option-prefix "" diff --git a/mod/database-module.cxx b/mod/database-module.cxx index e7a6883..3b5e1e1 100644 --- a/mod/database-module.cxx +++ b/mod/database-module.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/database-module> +#include <mod/database-module.hxx> #include <errno.h> // EIO @@ -12,9 +12,9 @@ #include <butl/utility> // throw_generic_error() -#include <mod/options> -#include <mod/database> -#include <mod/build-config> +#include <mod/options.hxx> +#include <mod/database.hxx> +#include <mod/build-config.hxx> namespace brep { diff --git a/mod/database-module b/mod/database-module.hxx index 3799e7b..13fd529 100644 --- a/mod/database-module +++ b/mod/database-module.hxx @@ -1,19 +1,19 @@ -// file : mod/database-module -*- C++ -*- +// file : mod/database-module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_DATABASE_MODULE -#define MOD_DATABASE_MODULE +#ifndef MOD_DATABASE_MODULE_HXX +#define MOD_DATABASE_MODULE_HXX #include <odb/forward.hxx> // database -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <bbot/build-config> +#include <libbbot/build-config.hxx> -#include <mod/module> -#include <mod/options> +#include <mod/module.hxx> +#include <mod/options.hxx> namespace brep { @@ -70,4 +70,4 @@ namespace brep }; } -#endif // MOD_DATABASE_MODULE +#endif // MOD_DATABASE_MODULE_HXX diff --git a/mod/database.cxx b/mod/database.cxx index 22a0563..67a862b 100644 --- a/mod/database.cxx +++ b/mod/database.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/database> +#include <mod/database.hxx> #include <map> diff --git a/mod/database b/mod/database.hxx index 9a83752..623e65b 100644 --- a/mod/database +++ b/mod/database.hxx @@ -1,14 +1,14 @@ -// file : mod/database -*- C++ -*- +// file : mod/database.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_DATABASE -#define MOD_DATABASE +#ifndef MOD_DATABASE_HXX +#define MOD_DATABASE_HXX #include <odb/forward.hxx> // database -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> namespace brep { @@ -24,4 +24,4 @@ namespace brep size_t max_connections); } -#endif // MOD_DATABASE +#endif // MOD_DATABASE_HXX diff --git a/mod/diagnostics.cxx b/mod/diagnostics.cxx index 066c4b2..c2f3f52 100644 --- a/mod/diagnostics.cxx +++ b/mod/diagnostics.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/diagnostics> +#include <mod/diagnostics.hxx> using namespace std; diff --git a/mod/diagnostics b/mod/diagnostics.hxx index 496f488..e05d56a 100644 --- a/mod/diagnostics +++ b/mod/diagnostics.hxx @@ -1,14 +1,14 @@ -// file : mod/diagnostics -*- C++ -*- +// file : mod/diagnostics.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_DIAGNOSTICS -#define MOD_DIAGNOSTICS +#ifndef MOD_DIAGNOSTICS_HXX +#define MOD_DIAGNOSTICS_HXX #include <sstream> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> namespace brep { @@ -303,4 +303,4 @@ namespace brep using fail_mark = diag_mark<fail_mark_base<E>>; } -#endif // MOD_DIAGNOSTICS +#endif // MOD_DIAGNOSTICS_HXX diff --git a/mod/mod-build-force.cxx b/mod/mod-build-force.cxx index 1db25d1..e0c641e 100644 --- a/mod/mod-build-force.cxx +++ b/mod/mod-build-force.cxx @@ -2,21 +2,21 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-build-force> +#include <mod/mod-build-force.hxx> #include <algorithm> // replace() #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <web/module> +#include <web/module.hxx> -#include <brep/build> -#include <brep/build-odb> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/build.hxx> +#include <libbrep/build-odb.hxx> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/options> +#include <mod/options.hxx> using namespace std; using namespace bbot; diff --git a/mod/mod-build-force b/mod/mod-build-force.hxx index 3fa723d..02b6ea4 100644 --- a/mod/mod-build-force +++ b/mod/mod-build-force.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-build-force -*- C++ -*- +// file : mod/mod-build-force.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_BUILD_FORCE -#define MOD_MOD_BUILD_FORCE +#ifndef MOD_MOD_BUILD_FORCE_HXX +#define MOD_MOD_BUILD_FORCE_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -42,4 +42,4 @@ namespace brep }; } -#endif // MOD_MOD_BUILD_FORCE +#endif // MOD_MOD_BUILD_FORCE_HXX diff --git a/mod/mod-build-log.cxx b/mod/mod-build-log.cxx index 3dddd82..09591b9 100644 --- a/mod/mod-build-log.cxx +++ b/mod/mod-build-log.cxx @@ -2,21 +2,21 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-build-log> +#include <mod/mod-build-log.hxx> #include <algorithm> // find_if() #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <web/module> +#include <web/module.hxx> -#include <brep/build> -#include <brep/build-odb> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/build.hxx> +#include <libbrep/build-odb.hxx> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/options> +#include <mod/options.hxx> using namespace std; using namespace bbot; diff --git a/mod/mod-build-log b/mod/mod-build-log.hxx index 8395546..76e99c7 100644 --- a/mod/mod-build-log +++ b/mod/mod-build-log.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-build-log -*- C++ -*- +// file : mod/mod-build-log.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_BUILD_LOG -#define MOD_MOD_BUILD_LOG +#ifndef MOD_MOD_BUILD_LOG_HXX +#define MOD_MOD_BUILD_LOG_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -42,4 +42,4 @@ namespace brep }; } -#endif // MOD_MOD_BUILD_LOG +#endif // MOD_MOD_BUILD_LOG_HXX diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx index 23381de..d6ec5e9 100644 --- a/mod/mod-build-result.cxx +++ b/mod/mod-build-result.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-build-result> +#include <mod/mod-build-result.hxx> #include <algorithm> // find_if() @@ -11,20 +11,20 @@ #include <butl/manifest-parser> #include <butl/manifest-serializer> -#include <bbot/manifest> +#include <libbbot/manifest.hxx> #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <web/module> -#include <web/mime-url-encoding> +#include <web/module.hxx> +#include <web/mime-url-encoding.hxx> -#include <brep/build> -#include <brep/build-odb> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/build.hxx> +#include <libbrep/build-odb.hxx> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/options> +#include <mod/options.hxx> using namespace std; using namespace butl; diff --git a/mod/mod-build-result b/mod/mod-build-result.hxx index 8afa697..4af9b1b 100644 --- a/mod/mod-build-result +++ b/mod/mod-build-result.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-build-result -*- C++ -*- +// file : mod/mod-build-result.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_BUILD_RESULT -#define MOD_MOD_BUILD_RESULT +#ifndef MOD_MOD_BUILD_RESULT_HXX +#define MOD_MOD_BUILD_RESULT_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -39,4 +39,4 @@ namespace brep }; } -#endif // MOD_MOD_BUILD_RESULT +#endif // MOD_MOD_BUILD_RESULT_HXX diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx index 9a72f66..353e636 100644 --- a/mod/mod-build-task.cxx +++ b/mod/mod-build-task.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-build-task> +#include <mod/mod-build-task.hxx> #include <map> #include <chrono> @@ -12,20 +12,20 @@ #include <butl/manifest-parser> #include <butl/manifest-serializer> -#include <bbot/manifest> -#include <bbot/build-config> +#include <libbbot/manifest.hxx> +#include <libbbot/build-config.hxx> #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <web/module> +#include <web/module.hxx> -#include <brep/build> -#include <brep/build-odb> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/build.hxx> +#include <libbrep/build-odb.hxx> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/options> +#include <mod/options.hxx> using namespace std; using namespace butl; diff --git a/mod/mod-build-task b/mod/mod-build-task.hxx index 051357e..d69836f 100644 --- a/mod/mod-build-task +++ b/mod/mod-build-task.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-build-task -*- C++ -*- +// file : mod/mod-build-task.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_BUILD_TASK -#define MOD_MOD_BUILD_TASK +#ifndef MOD_MOD_BUILD_TASK_HXX +#define MOD_MOD_BUILD_TASK_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -39,4 +39,4 @@ namespace brep }; } -#endif // MOD_MOD_BUILD_TASK +#endif // MOD_MOD_BUILD_TASK_HXX diff --git a/mod/mod-package-details.cxx b/mod/mod-package-details.cxx index fd3fd6d..9a9bfcc 100644 --- a/mod/mod-package-details.cxx +++ b/mod/mod-package-details.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-package-details> +#include <mod/mod-package-details.hxx> #include <xml/serializer> @@ -10,15 +10,15 @@ #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <web/xhtml> -#include <web/module> -#include <web/mime-url-encoding> +#include <web/xhtml.hxx> +#include <web/module.hxx> +#include <web/mime-url-encoding.hxx> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/page> -#include <mod/options> +#include <mod/page.hxx> +#include <mod/options.hxx> using namespace odb::core; using namespace brep::cli; diff --git a/mod/mod-package-details b/mod/mod-package-details.hxx index a19e0d7..e3950aa 100644 --- a/mod/mod-package-details +++ b/mod/mod-package-details.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-package-details -*- C++ -*- +// file : mod/mod-package-details.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_PACKAGE_DETAILS -#define MOD_MOD_PACKAGE_DETAILS +#ifndef MOD_MOD_PACKAGE_DETAILS_HXX +#define MOD_MOD_PACKAGE_DETAILS_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -39,4 +39,4 @@ namespace brep }; } -#endif // MOD_MOD_PACKAGE_DETAILS +#endif // MOD_MOD_PACKAGE_DETAILS_HXX diff --git a/mod/mod-package-search.cxx b/mod/mod-package-search.cxx index 6d73a69..8897792 100644 --- a/mod/mod-package-search.cxx +++ b/mod/mod-package-search.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-package-search> +#include <mod/mod-package-search.hxx> #include <xml/serializer> @@ -11,15 +11,15 @@ #include <odb/transaction.hxx> #include <odb/schema-catalog.hxx> -#include <web/xhtml> -#include <web/module> -#include <web/mime-url-encoding> +#include <web/xhtml.hxx> +#include <web/module.hxx> +#include <web/mime-url-encoding.hxx> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/page> -#include <mod/options> +#include <mod/page.hxx> +#include <mod/options.hxx> using namespace odb::core; using namespace brep::cli; diff --git a/mod/mod-package-search b/mod/mod-package-search.hxx index d8d09be..5e7385e 100644 --- a/mod/mod-package-search +++ b/mod/mod-package-search.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-package-search -*- C++ -*- +// file : mod/mod-package-search.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_PACKAGE_SEARCH -#define MOD_MOD_PACKAGE_SEARCH +#ifndef MOD_MOD_PACKAGE_SEARCH_HXX +#define MOD_MOD_PACKAGE_SEARCH_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -39,4 +39,4 @@ namespace brep }; } -#endif // MOD_MOD_PACKAGE_SEARCH +#endif // MOD_MOD_PACKAGE_SEARCH_HXX diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx index 30b2567..34c7f3b 100644 --- a/mod/mod-package-version-details.cxx +++ b/mod/mod-package-version-details.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-package-version-details> +#include <mod/mod-package-version-details.hxx> #include <xml/serializer> @@ -10,15 +10,15 @@ #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <web/xhtml> -#include <web/module> -#include <web/mime-url-encoding> +#include <web/xhtml.hxx> +#include <web/module.hxx> +#include <web/mime-url-encoding.hxx> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/page> -#include <mod/options> +#include <mod/page.hxx> +#include <mod/options.hxx> using namespace std; using namespace odb::core; diff --git a/mod/mod-package-version-details b/mod/mod-package-version-details.hxx index 70ec82b..ef682d7 100644 --- a/mod/mod-package-version-details +++ b/mod/mod-package-version-details.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-package-version-details -*- C++ -*- +// file : mod/mod-package-version-details.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_PACKAGE_VERSION_DETAILS -#define MOD_MOD_PACKAGE_VERSION_DETAILS +#ifndef MOD_MOD_PACKAGE_VERSION_DETAILS_HXX +#define MOD_MOD_PACKAGE_VERSION_DETAILS_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -42,4 +42,4 @@ namespace brep }; } -#endif // MOD_MOD_PACKAGE_VERSION_DETAILS +#endif // MOD_MOD_PACKAGE_VERSION_DETAILS_HXX diff --git a/mod/mod-repository-details.cxx b/mod/mod-repository-details.cxx index 9e791ef..78b309d 100644 --- a/mod/mod-repository-details.cxx +++ b/mod/mod-repository-details.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-repository-details> +#include <mod/mod-repository-details.hxx> #include <time.h> // tzset() @@ -16,15 +16,15 @@ #include <butl/timestamp> -#include <web/xhtml> -#include <web/module> -#include <web/mime-url-encoding> +#include <web/xhtml.hxx> +#include <web/module.hxx> +#include <web/mime-url-encoding.hxx> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> -#include <mod/page> -#include <mod/options> +#include <mod/page.hxx> +#include <mod/options.hxx> using namespace std; using namespace odb::core; diff --git a/mod/mod-repository-details b/mod/mod-repository-details.hxx index 5e797b2..8a795dc 100644 --- a/mod/mod-repository-details +++ b/mod/mod-repository-details.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-repository-details -*- C++ -*- +// file : mod/mod-repository-details.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_REPOSITORY_DETAILS -#define MOD_MOD_REPOSITORY_DETAILS +#ifndef MOD_MOD_REPOSITORY_DETAILS_HXX +#define MOD_MOD_REPOSITORY_DETAILS_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/database-module> +#include <mod/options.hxx> +#include <mod/database-module.hxx> namespace brep { @@ -39,4 +39,4 @@ namespace brep }; } -#endif // MOD_MOD_REPOSITORY_DETAILS +#endif // MOD_MOD_REPOSITORY_DETAILS_HXX diff --git a/mod/mod-repository-root.cxx b/mod/mod-repository-root.cxx index 097c874..bac63ca 100644 --- a/mod/mod-repository-root.cxx +++ b/mod/mod-repository-root.cxx @@ -2,22 +2,22 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/mod-repository-root> +#include <mod/mod-repository-root.hxx> #include <sstream> -#include <web/module> - -#include <mod/module> -#include <mod/options> -#include <mod/mod-build-log> -#include <mod/mod-build-task> -#include <mod/mod-build-force> -#include <mod/mod-build-result> -#include <mod/mod-package-search> -#include <mod/mod-package-details> -#include <mod/mod-repository-details> -#include <mod/mod-package-version-details> +#include <web/module.hxx> + +#include <mod/module.hxx> +#include <mod/options.hxx> +#include <mod/mod-build-log.hxx> +#include <mod/mod-build-task.hxx> +#include <mod/mod-build-force.hxx> +#include <mod/mod-build-result.hxx> +#include <mod/mod-package-search.hxx> +#include <mod/mod-package-details.hxx> +#include <mod/mod-repository-details.hxx> +#include <mod/mod-package-version-details.hxx> using namespace std; using namespace brep::cli; diff --git a/mod/mod-repository-root b/mod/mod-repository-root.hxx index b347cd3..f54fa62 100644 --- a/mod/mod-repository-root +++ b/mod/mod-repository-root.hxx @@ -1,15 +1,15 @@ -// file : mod/mod-repository-root -*- C++ -*- +// file : mod/mod-repository-root.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MOD_REPOSITORY_ROOT -#define MOD_MOD_REPOSITORY_ROOT +#ifndef MOD_MOD_REPOSITORY_ROOT_HXX +#define MOD_MOD_REPOSITORY_ROOT_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/module> -#include <mod/options> +#include <mod/module.hxx> +#include <mod/options.hxx> namespace brep { @@ -74,4 +74,4 @@ namespace brep }; } -#endif // MOD_MOD_REPOSITORY_ROOT +#endif // MOD_MOD_REPOSITORY_ROOT_HXX diff --git a/mod/module.cxx b/mod/module.cxx index e42f937..5db1fbe 100644 --- a/mod/module.cxx +++ b/mod/module.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/module> +#include <mod/module.hxx> #include <httpd.h> #include <http_log.h> @@ -11,10 +11,10 @@ #include <cstring> // strchr() #include <functional> // bind() -#include <web/module> -#include <web/apache/log> +#include <web/module.hxx> +#include <web/apache/log.hxx> -#include <mod/options> +#include <mod/options.hxx> using namespace std; using namespace placeholders; // For std::bind's _1, etc. diff --git a/mod/module b/mod/module.hxx index f0743bb..1cd6b8d 100644 --- a/mod/module +++ b/mod/module.hxx @@ -1,17 +1,17 @@ -// file : mod/module -*- C++ -*- +// file : mod/module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_MODULE -#define MOD_MODULE +#ifndef MOD_MODULE_HXX +#define MOD_MODULE_HXX -#include <web/module> +#include <web/module.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options> -#include <mod/diagnostics> +#include <mod/options.hxx> +#include <mod/diagnostics.hxx> namespace brep { @@ -198,4 +198,4 @@ namespace brep }; } -#endif // MOD_MODULE +#endif // MOD_MODULE_HXX diff --git a/mod/options-types b/mod/options-types.hxx index d9eaf9e..7808ca4 100644 --- a/mod/options-types +++ b/mod/options-types.hxx @@ -1,12 +1,12 @@ -// file : mod/options-types -*- C++ -*- +// file : mod/options-types.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_OPTIONS_TYPES -#define MOD_OPTIONS_TYPES +#ifndef MOD_OPTIONS_TYPES_HXX +#define MOD_OPTIONS_TYPES_HXX -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> namespace brep { @@ -28,4 +28,4 @@ namespace brep }; } -#endif // MOD_OPTIONS_TYPES +#endif // MOD_OPTIONS_TYPES_HXX diff --git a/mod/options.cli b/mod/options.cli index 0f96e9c..3d6ac60 100644 --- a/mod/options.cli +++ b/mod/options.cli @@ -2,11 +2,11 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -include <web/xhtml-fragment>; +include <web/xhtml-fragment.hxx>; -include <brep/types>; +include <libbrep/types.hxx>; -include <mod/options-types>; +include <mod/options-types.hxx>; namespace brep { diff --git a/mod/page.cxx b/mod/page.cxx index 1ee18ce..8d8e6e6 100644 --- a/mod/page.cxx +++ b/mod/page.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/page> +#include <mod/page.hxx> #include <set> #include <ios> // hex, uppercase, right @@ -12,11 +12,11 @@ #include <xml/serializer> -#include <web/xhtml> -#include <web/mime-url-encoding> +#include <web/xhtml.hxx> +#include <web/mime-url-encoding.hxx> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> using namespace std; using namespace xml; @@ -1,20 +1,20 @@ -// file : mod/page -*- C++ -*- +// file : mod/page.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef MOD_PAGE -#define MOD_PAGE +#ifndef MOD_PAGE_HXX +#define MOD_PAGE_HXX #include <xml/forward> -#include <web/xhtml-fragment> +#include <web/xhtml-fragment.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <brep/package> +#include <libbrep/package.hxx> -#include <mod/options-types> // page_menu +#include <mod/options-types.hxx> // page_menu namespace brep { @@ -425,4 +425,4 @@ namespace brep html_id (const string&); } -#endif // MOD_PAGE +#endif // MOD_PAGE_HXX diff --git a/mod/services.cxx b/mod/services.cxx index fa788b3..dfa14a8 100644 --- a/mod/services.cxx +++ b/mod/services.cxx @@ -4,12 +4,12 @@ #include <ap_config.h> // AP_MODULE_DECLARE_DATA -#include <web/apache/service> +#include <web/apache/service.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/mod-repository-root> +#include <mod/mod-repository-root.hxx> static brep::repository_root mod; web::apache::service AP_MODULE_DECLARE_DATA brep_module ("brep", mod); diff --git a/mod/types-parsers.cxx b/mod/types-parsers.cxx index fb293a3..65d9c6c 100644 --- a/mod/types-parsers.cxx +++ b/mod/types-parsers.cxx @@ -2,9 +2,9 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <mod/types-parsers> +#include <mod/types-parsers.hxx> -#include <mod/options> +#include <mod/options.hxx> using namespace std; using namespace web::xhtml; diff --git a/mod/types-parsers b/mod/types-parsers.hxx index eb206e4..03c54fe 100644 --- a/mod/types-parsers +++ b/mod/types-parsers.hxx @@ -1,19 +1,19 @@ -// file : mod/types-parsers -*- C++ -*- +// file : mod/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 MOD_TYPES_PARSERS -#define MOD_TYPES_PARSERS +#ifndef MOD_TYPES_PARSERS_HXX +#define MOD_TYPES_PARSERS_HXX -#include <web/xhtml-fragment> +#include <web/xhtml-fragment.hxx> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <mod/options-types> +#include <mod/options-types.hxx> namespace brep { @@ -61,4 +61,4 @@ namespace brep } } -#endif // MOD_TYPES_PARSERS +#endif // MOD_TYPES_PARSERS_HXX diff --git a/tests/load/buildfile b/tests/load/buildfile index 2088ee1..6b81346 100644 --- a/tests/load/buildfile +++ b/tests/load/buildfile @@ -7,9 +7,9 @@ import libs += libbutl%lib{butl} import libs += libodb-pgsql%lib{odb-pgsql} import libs += libodb%lib{odb} -include ../../brep/ +include ../../libbrep/ -exe{driver}: cxx{driver} ../../brep/lib{brep} $libs +exe{driver}: cxx{driver} ../../libbrep/lib{brep} $libs # Disable for now until build2 test module supports running custom # commands, pre/post steps. diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 24b29b4..7c8662b 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -14,11 +14,11 @@ #include <butl/process> #include <butl/filesystem> -#include <brep/types> -#include <brep/utility> +#include <libbrep/types.hxx> +#include <libbrep/utility.hxx> -#include <brep/package> -#include <brep/package-odb> +#include <libbrep/package.hxx> +#include <libbrep/package-odb.hxx> using namespace std; using namespace odb::core; diff --git a/tests/web/xhtml/driver.cxx b/tests/web/xhtml/driver.cxx index e50a9a7..7d9a536 100644 --- a/tests/web/xhtml/driver.cxx +++ b/tests/web/xhtml/driver.cxx @@ -7,7 +7,7 @@ #include <xml/serializer> -#include <web/xhtml> +#include <web/xhtml.hxx> using namespace std; using namespace xml; diff --git a/web/apache/log b/web/apache/log.hxx index dda9099..4397875 100644 --- a/web/apache/log +++ b/web/apache/log.hxx @@ -1,9 +1,9 @@ -// file : web/apache/log -*- C++ -*- +// file : web/apache/log.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_APACHE_LOG -#define WEB_APACHE_LOG +#ifndef WEB_APACHE_LOG_HXX +#define WEB_APACHE_LOG_HXX #include <httpd.h> // request_rec, server_rec #include <http_log.h> @@ -12,7 +12,7 @@ #include <cstdint> // uint64_t #include <algorithm> // min() -#include <web/module> +#include <web/module.hxx> namespace web { @@ -78,4 +78,4 @@ namespace web } } -#endif // WEB_APACHE_LOG +#endif // WEB_APACHE_LOG_HXX diff --git a/web/apache/request.cxx b/web/apache/request.cxx index b4fb080..219f887 100644 --- a/web/apache/request.cxx +++ b/web/apache/request.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <web/apache/request> +#include <web/apache/request.hxx> #include <apr_tables.h> // apr_table_*, apr_array_header_t #include <apr_strings.h> // apr_pstrdup() @@ -31,7 +31,7 @@ #include <butl/optional> #include <butl/timestamp> -#include <web/mime-url-encoding> +#include <web/mime-url-encoding.hxx> using namespace std; using namespace butl; diff --git a/web/apache/request b/web/apache/request.hxx index a35c5dc..0488fb2 100644 --- a/web/apache/request +++ b/web/apache/request.hxx @@ -1,9 +1,9 @@ -// file : web/apache/request -*- C++ -*- +// file : web/apache/request.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_APACHE_REQUEST -#define WEB_APACHE_REQUEST +#ifndef WEB_APACHE_REQUEST_HXX +#define WEB_APACHE_REQUEST_HXX #include <httpd.h> // request_rec, HTTP_*, OK, M_POST @@ -14,8 +14,8 @@ #include <ostream> #include <streambuf> -#include <web/module> -#include <web/apache/stream> +#include <web/module.hxx> +#include <web/apache/stream.hxx> namespace web { @@ -187,4 +187,4 @@ namespace web #include <web/apache/request.ixx> -#endif // WEB_APACHE_REQUEST +#endif // WEB_APACHE_REQUEST_HXX diff --git a/web/apache/service.cxx b/web/apache/service.cxx index ca8e235..8c3fa82 100644 --- a/web/apache/service.cxx +++ b/web/apache/service.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <web/apache/service> +#include <web/apache/service.hxx> #include <apr_pools.h> // apr_palloc() @@ -18,8 +18,8 @@ #include <butl/optional> -#include <web/module> -#include <web/apache/log> +#include <web/module.hxx> +#include <web/apache/log.hxx> using namespace std; diff --git a/web/apache/service b/web/apache/service.hxx index 45cf39b..44d064f 100644 --- a/web/apache/service +++ b/web/apache/service.hxx @@ -1,9 +1,9 @@ -// file : web/apache/service -*- C++ -*- +// file : web/apache/service.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_APACHE_SERVICE -#define WEB_APACHE_SERVICE +#ifndef WEB_APACHE_SERVICE_HXX +#define WEB_APACHE_SERVICE_HXX #include <apr_pools.h> // apr_pool_t #include <apr_hooks.h> // APR_HOOK_* @@ -16,9 +16,9 @@ #include <string> #include <cassert> -#include <web/module> -#include <web/apache/log> -#include <web/apache/request> +#include <web/module.hxx> +#include <web/apache/log.hxx> +#include <web/apache/request.hxx> namespace web { @@ -327,4 +327,4 @@ namespace web #include <web/apache/service.txx> -#endif // WEB_APACHE_SERVICE +#endif // WEB_APACHE_SERVICE_HXX diff --git a/web/apache/stream b/web/apache/stream.hxx index d4abb4e..3bb422d 100644 --- a/web/apache/stream +++ b/web/apache/stream.hxx @@ -1,9 +1,9 @@ -// file : web/apache/stream -*- C++ -*- +// file : web/apache/stream.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_APACHE_STREAM -#define WEB_APACHE_STREAM +#ifndef WEB_APACHE_STREAM_HXX +#define WEB_APACHE_STREAM_HXX #include <httpd.h> // request_rec, HTTP_* #include <http_protocol.h> // ap_*() @@ -14,7 +14,7 @@ #include <streambuf> #include <algorithm> // min(), max() -#include <web/module> // invalid_request +#include <web/module.hxx> // invalid_request namespace web { @@ -146,4 +146,4 @@ namespace web } } -#endif // WEB_APACHE_STREAM +#endif // WEB_APACHE_STREAM_HXX diff --git a/web/mime-url-encoding.cxx b/web/mime-url-encoding.cxx index fa85dd3..e0022bc 100644 --- a/web/mime-url-encoding.cxx +++ b/web/mime-url-encoding.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <web/mime-url-encoding> +#include <web/mime-url-encoding.hxx> #include <ios> // hex, uppercase, right #include <string> diff --git a/web/mime-url-encoding b/web/mime-url-encoding.hxx index 9db0887..d45f4ca 100644 --- a/web/mime-url-encoding +++ b/web/mime-url-encoding.hxx @@ -1,9 +1,9 @@ -// file : web/mime-url-encoding -*- C++ -*- +// file : web/mime-url-encoding.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_MIME_URL_ENCODING -#define WEB_MIME_URL_ENCODING +#ifndef WEB_MIME_URL_ENCODING_HXX +#define WEB_MIME_URL_ENCODING_HXX #include <string> #include <iosfwd> @@ -27,4 +27,4 @@ namespace web mime_url_decode (const char* b, const char* e, bool trim = false); } -#endif // WEB_MIME_URL_ENCODING +#endif // WEB_MIME_URL_ENCODING_HXX diff --git a/web/module b/web/module.hxx index 1e588a4..1864673 100644 --- a/web/module +++ b/web/module.hxx @@ -1,9 +1,9 @@ -// file : web/module -*- C++ -*- +// file : web/module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_MODULE -#define WEB_MODULE +#ifndef WEB_MODULE_HXX +#define WEB_MODULE_HXX #include <map> #include <string> @@ -264,4 +264,4 @@ namespace web }; } -#endif // WEB_MODULE +#endif // WEB_MODULE_HXX diff --git a/web/xhtml-fragment.cxx b/web/xhtml-fragment.cxx index 3147c72..1d883ae 100644 --- a/web/xhtml-fragment.cxx +++ b/web/xhtml-fragment.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <web/xhtml-fragment> +#include <web/xhtml-fragment.hxx> #include <string> #include <cassert> @@ -10,7 +10,7 @@ #include <xml/parser> #include <xml/serializer> -#include <web/xhtml> +#include <web/xhtml.hxx> using namespace std; using namespace xml; diff --git a/web/xhtml-fragment b/web/xhtml-fragment.hxx index 9f602e0..9d58bbf 100644 --- a/web/xhtml-fragment +++ b/web/xhtml-fragment.hxx @@ -1,9 +1,9 @@ -// file : web/xhtml-fragment -*- C++ -*- +// file : web/xhtml-fragment.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_XHTML_FRAGMENT -#define WEB_XHTML_FRAGMENT +#ifndef WEB_XHTML_FRAGMENT_HXX +#define WEB_XHTML_FRAGMENT_HXX #include <string> #include <vector> @@ -45,4 +45,4 @@ namespace web } } -#endif // WEB_XHTML_FRAGMENT +#endif // WEB_XHTML_FRAGMENT_HXX diff --git a/web/xhtml b/web/xhtml.hxx index 58dee7b..0809860 100644 --- a/web/xhtml +++ b/web/xhtml.hxx @@ -1,9 +1,9 @@ -// file : web/xhtml -*- C++ -*- +// file : web/xhtml.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef WEB_XHTML -#define WEB_XHTML +#ifndef WEB_XHTML_HXX +#define WEB_XHTML_HXX #include <xml/serializer> @@ -348,4 +348,4 @@ namespace web } } -#endif // WEB_XHTML +#endif // WEB_XHTML_HXX |