diff options
Diffstat (limited to 'mod')
| -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 |
36 files changed, 239 insertions, 239 deletions
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 |