diff options
| -rw-r--r-- | README-GIT | 6 | ||||
| -rw-r--r-- | build/root.build | 2 | ||||
| -rw-r--r-- | build2/.gitignore | 2 | ||||
| -rw-r--r-- | build2/algorithm.cxx | 22 | ||||
| -rw-r--r-- | build2/algorithm.hxx (renamed from build2/algorithm) | 16 | ||||
| -rw-r--r-- | build2/algorithm.ixx | 4 | ||||
| -rw-r--r-- | build2/b-options.cxx | 4 | ||||
| -rw-r--r-- | build2/b-options.hxx (renamed from build2/b-options) | 8 | ||||
| -rw-r--r-- | build2/b.cli | 2 | ||||
| -rw-r--r-- | build2/b.cxx | 58 | ||||
| -rw-r--r-- | build2/bin/guess.cxx | 4 | ||||
| -rw-r--r-- | build2/bin/guess.hxx (renamed from build2/bin/guess) | 12 | ||||
| -rw-r--r-- | build2/bin/init.cxx | 18 | ||||
| -rw-r--r-- | build2/bin/init.hxx (renamed from build2/bin/init) | 14 | ||||
| -rw-r--r-- | build2/bin/rule.cxx | 12 | ||||
| -rw-r--r-- | build2/bin/rule.hxx (renamed from build2/bin/rule) | 14 | ||||
| -rw-r--r-- | build2/bin/target.cxx | 2 | ||||
| -rw-r--r-- | build2/bin/target.hxx (renamed from build2/bin/target) | 14 | ||||
| -rw-r--r-- | build2/buildfile | 10 | ||||
| -rw-r--r-- | build2/c/init.cxx | 14 | ||||
| -rw-r--r-- | build2/c/init.hxx (renamed from build2/c/init) | 14 | ||||
| -rw-r--r-- | build2/c/target | 22 | ||||
| -rw-r--r-- | build2/c/target.hxx | 22 | ||||
| -rw-r--r-- | build2/cc/common.cxx | 18 | ||||
| -rw-r--r-- | build2/cc/common.hxx (renamed from build2/cc/common) | 18 | ||||
| -rw-r--r-- | build2/cc/compile.cxx | 20 | ||||
| -rw-r--r-- | build2/cc/compile.hxx (renamed from build2/cc/compile) | 20 | ||||
| -rw-r--r-- | build2/cc/gcc.cxx | 18 | ||||
| -rw-r--r-- | build2/cc/guess.cxx | 9 | ||||
| -rw-r--r-- | build2/cc/guess.hxx (renamed from build2/cc/guess) | 14 | ||||
| -rw-r--r-- | build2/cc/init.cxx | 12 | ||||
| -rw-r--r-- | build2/cc/init.hxx (renamed from build2/cc/init) | 14 | ||||
| -rw-r--r-- | build2/cc/install.cxx | 10 | ||||
| -rw-r--r-- | build2/cc/install.hxx (renamed from build2/cc/install) | 18 | ||||
| -rw-r--r-- | build2/cc/link.cxx | 26 | ||||
| -rw-r--r-- | build2/cc/link.hxx (renamed from build2/cc/link) | 18 | ||||
| -rw-r--r-- | build2/cc/module.cxx | 16 | ||||
| -rw-r--r-- | build2/cc/module.hxx (renamed from build2/cc/module) | 24 | ||||
| -rw-r--r-- | build2/cc/msvc.cxx | 20 | ||||
| -rw-r--r-- | build2/cc/pkgconfig.cxx | 20 | ||||
| -rw-r--r-- | build2/cc/target.cxx | 2 | ||||
| -rw-r--r-- | build2/cc/target.hxx (renamed from build2/cc/target) | 14 | ||||
| -rw-r--r-- | build2/cc/types.hxx (renamed from build2/cc/types) | 12 | ||||
| -rw-r--r-- | build2/cc/utility.cxx | 8 | ||||
| -rw-r--r-- | build2/cc/utility.hxx (renamed from build2/cc/utility) | 18 | ||||
| -rw-r--r-- | build2/cc/windows-manifest.cxx | 16 | ||||
| -rw-r--r-- | build2/cc/windows-rpath.cxx | 14 | ||||
| -rw-r--r-- | build2/cli/init.cxx | 18 | ||||
| -rw-r--r-- | build2/cli/init.hxx (renamed from build2/cli/init) | 14 | ||||
| -rw-r--r-- | build2/cli/rule.cxx | 16 | ||||
| -rw-r--r-- | build2/cli/rule.hxx (renamed from build2/cli/rule) | 14 | ||||
| -rw-r--r-- | build2/cli/target.cxx | 2 | ||||
| -rw-r--r-- | build2/cli/target.hxx (renamed from build2/cli/target) | 16 | ||||
| -rw-r--r-- | build2/config/init.cxx | 24 | ||||
| -rw-r--r-- | build2/config/init.hxx (renamed from build2/config/init) | 14 | ||||
| -rw-r--r-- | build2/config/module.cxx | 2 | ||||
| -rw-r--r-- | build2/config/module.hxx (renamed from build2/config/module) | 18 | ||||
| -rw-r--r-- | build2/config/operation.cxx | 24 | ||||
| -rw-r--r-- | build2/config/operation.hxx (renamed from build2/config/operation) | 14 | ||||
| -rw-r--r-- | build2/config/utility.cxx | 6 | ||||
| -rw-r--r-- | build2/config/utility.hxx (renamed from build2/config/utility) | 16 | ||||
| -rw-r--r-- | build2/config/utility.txx | 4 | ||||
| -rw-r--r-- | build2/context.cxx | 22 | ||||
| -rw-r--r-- | build2/context.hxx (renamed from build2/context) | 20 | ||||
| -rw-r--r-- | build2/cxx/init.cxx | 14 | ||||
| -rw-r--r-- | build2/cxx/init.hxx (renamed from build2/cxx/init) | 14 | ||||
| -rw-r--r-- | build2/cxx/target.cxx | 2 | ||||
| -rw-r--r-- | build2/cxx/target.hxx (renamed from build2/cxx/target) | 16 | ||||
| -rw-r--r-- | build2/depdb.cxx | 4 | ||||
| -rw-r--r-- | build2/depdb.hxx (renamed from build2/depdb) | 12 | ||||
| -rw-r--r-- | build2/diagnostics.cxx | 4 | ||||
| -rw-r--r-- | build2/diagnostics.hxx (renamed from build2/diagnostics) | 14 | ||||
| -rw-r--r-- | build2/dist/init.cxx | 16 | ||||
| -rw-r--r-- | build2/dist/init.hxx (renamed from build2/dist/init) | 14 | ||||
| -rw-r--r-- | build2/dist/module.cxx | 2 | ||||
| -rw-r--r-- | build2/dist/module.hxx (renamed from build2/dist/module) | 16 | ||||
| -rw-r--r-- | build2/dist/operation | 21 | ||||
| -rw-r--r-- | build2/dist/operation.cxx | 22 | ||||
| -rw-r--r-- | build2/dist/operation.hxx | 21 | ||||
| -rw-r--r-- | build2/dist/rule.cxx | 10 | ||||
| -rw-r--r-- | build2/dist/rule.hxx (renamed from build2/dist/rule) | 18 | ||||
| -rw-r--r-- | build2/dump.cxx | 12 | ||||
| -rw-r--r-- | build2/dump.hxx (renamed from build2/dump) | 14 | ||||
| -rw-r--r-- | build2/file.cxx | 22 | ||||
| -rw-r--r-- | build2/file.hxx (renamed from build2/file) | 16 | ||||
| -rw-r--r-- | build2/filesystem.cxx | 4 | ||||
| -rw-r--r-- | build2/filesystem.hxx (renamed from build2/filesystem) | 18 | ||||
| -rw-r--r-- | build2/filesystem.txx | 4 | ||||
| -rw-r--r-- | build2/function.cxx | 2 | ||||
| -rw-r--r-- | build2/function.hxx (renamed from build2/function) | 16 | ||||
| -rw-r--r-- | build2/functions-builtin.cxx | 4 | ||||
| -rw-r--r-- | build2/functions-path.cxx | 4 | ||||
| -rw-r--r-- | build2/functions-process-path.cxx | 4 | ||||
| -rw-r--r-- | build2/functions-string.cxx | 4 | ||||
| -rw-r--r-- | build2/functions-target-triplet.cxx | 4 | ||||
| -rw-r--r-- | build2/install/init.cxx | 20 | ||||
| -rw-r--r-- | build2/install/init.hxx (renamed from build2/install/init) | 14 | ||||
| -rw-r--r-- | build2/install/operation | 22 | ||||
| -rw-r--r-- | build2/install/operation.cxx | 2 | ||||
| -rw-r--r-- | build2/install/operation.hxx | 22 | ||||
| -rw-r--r-- | build2/install/rule.cxx | 14 | ||||
| -rw-r--r-- | build2/install/rule.hxx (renamed from build2/install/rule) | 18 | ||||
| -rw-r--r-- | build2/install/utility.hxx (renamed from build2/install/utility) | 14 | ||||
| -rw-r--r-- | build2/lexer.cxx | 2 | ||||
| -rw-r--r-- | build2/lexer.hxx (renamed from build2/lexer) | 18 | ||||
| -rw-r--r-- | build2/module.cxx | 8 | ||||
| -rw-r--r-- | build2/module.hxx (renamed from build2/module) | 16 | ||||
| -rw-r--r-- | build2/name.cxx | 4 | ||||
| -rw-r--r-- | build2/name.hxx (renamed from build2/name) | 12 | ||||
| -rw-r--r-- | build2/operation.cxx | 16 | ||||
| -rw-r--r-- | build2/operation.hxx (renamed from build2/operation) | 16 | ||||
| -rw-r--r-- | build2/parser.cxx | 24 | ||||
| -rw-r--r-- | build2/parser.hxx (renamed from build2/parser) | 22 | ||||
| -rw-r--r-- | build2/pkgconfig/init.cxx | 12 | ||||
| -rw-r--r-- | build2/pkgconfig/init.hxx (renamed from build2/pkgconfig/init) | 14 | ||||
| -rw-r--r-- | build2/prerequisite.cxx | 10 | ||||
| -rw-r--r-- | build2/prerequisite.hxx (renamed from build2/prerequisite) | 16 | ||||
| -rw-r--r-- | build2/regex.cxx | 2 | ||||
| -rw-r--r-- | build2/regex.hxx (renamed from build2/regex) | 12 | ||||
| -rw-r--r-- | build2/rule-map.hxx (renamed from build2/rule-map) | 16 | ||||
| -rw-r--r-- | build2/rule.cxx | 16 | ||||
| -rw-r--r-- | build2/rule.hxx (renamed from build2/rule) | 16 | ||||
| -rw-r--r-- | build2/scheduler.cxx | 2 | ||||
| -rw-r--r-- | build2/scheduler.hxx (renamed from build2/scheduler) | 12 | ||||
| -rw-r--r-- | build2/scope.cxx | 6 | ||||
| -rw-r--r-- | build2/scope.hxx (renamed from build2/scope) | 28 | ||||
| -rw-r--r-- | build2/search.cxx | 14 | ||||
| -rw-r--r-- | build2/search.hxx (renamed from build2/search) | 12 | ||||
| -rw-r--r-- | build2/spec.cxx | 6 | ||||
| -rw-r--r-- | build2/spec.hxx (renamed from build2/spec) | 14 | ||||
| -rw-r--r-- | build2/target-key.hxx (renamed from build2/target-key) | 16 | ||||
| -rw-r--r-- | build2/target-type.hxx (renamed from build2/target-type) | 12 | ||||
| -rw-r--r-- | build2/target.cxx | 16 | ||||
| -rw-r--r-- | build2/target.hxx (renamed from build2/target) | 38 | ||||
| -rw-r--r-- | build2/target.ixx | 2 | ||||
| -rw-r--r-- | build2/target.txx | 8 | ||||
| -rw-r--r-- | build2/test/common.cxx | 6 | ||||
| -rw-r--r-- | build2/test/common.hxx (renamed from build2/test/common) | 14 | ||||
| -rw-r--r-- | build2/test/init.cxx | 18 | ||||
| -rw-r--r-- | build2/test/init.hxx (renamed from build2/test/init) | 14 | ||||
| -rw-r--r-- | build2/test/module | 26 | ||||
| -rw-r--r-- | build2/test/module.hxx | 26 | ||||
| -rw-r--r-- | build2/test/operation | 21 | ||||
| -rw-r--r-- | build2/test/operation.cxx | 2 | ||||
| -rw-r--r-- | build2/test/operation.hxx | 21 | ||||
| -rw-r--r-- | build2/test/rule.cxx | 20 | ||||
| -rw-r--r-- | build2/test/rule.hxx (renamed from build2/test/rule) | 18 | ||||
| -rw-r--r-- | build2/test/script/builtin.cxx | 12 | ||||
| -rw-r--r-- | build2/test/script/builtin.hxx (renamed from build2/test/script/builtin) | 12 | ||||
| -rw-r--r-- | build2/test/script/lexer.cxx | 2 | ||||
| -rw-r--r-- | build2/test/script/lexer.hxx (renamed from build2/test/script/lexer) | 16 | ||||
| -rw-r--r-- | build2/test/script/parser.cxx | 8 | ||||
| -rw-r--r-- | build2/test/script/parser.hxx (renamed from build2/test/script/parser) | 20 | ||||
| -rw-r--r-- | build2/test/script/regex.cxx | 2 | ||||
| -rw-r--r-- | build2/test/script/regex.hxx (renamed from build2/test/script/regex) | 12 | ||||
| -rw-r--r-- | build2/test/script/runner.cxx | 18 | ||||
| -rw-r--r-- | build2/test/script/runner.hxx (renamed from build2/test/script/runner) | 16 | ||||
| -rw-r--r-- | build2/test/script/script.cxx | 6 | ||||
| -rw-r--r-- | build2/test/script/script.hxx (renamed from build2/test/script/script) | 18 | ||||
| -rw-r--r-- | build2/test/script/token.cxx | 2 | ||||
| -rw-r--r-- | build2/test/script/token.hxx (renamed from build2/test/script/token) | 14 | ||||
| -rw-r--r-- | build2/test/target.cxx | 2 | ||||
| -rw-r--r-- | build2/test/target.hxx (renamed from build2/test/target) | 14 | ||||
| -rw-r--r-- | build2/token.cxx | 2 | ||||
| -rw-r--r-- | build2/token.hxx (renamed from build2/token) | 14 | ||||
| -rw-r--r-- | build2/types-parsers.cxx | 4 | ||||
| -rw-r--r-- | build2/types-parsers.hxx (renamed from build2/types-parsers) | 10 | ||||
| -rw-r--r-- | build2/types.hxx (renamed from build2/types) | 58 | ||||
| -rw-r--r-- | build2/utility.cxx | 10 | ||||
| -rw-r--r-- | build2/utility.hxx (renamed from build2/utility) | 21 | ||||
| -rw-r--r-- | build2/variable.cxx | 6 | ||||
| -rw-r--r-- | build2/variable.hxx (renamed from build2/variable) | 18 | ||||
| -rw-r--r-- | build2/variable.txx | 2 | ||||
| -rw-r--r-- | build2/version-impl | 18 | ||||
| -rw-r--r-- | build2/version.hxx.in (renamed from build2/version-impl.in) | 4 | ||||
| -rw-r--r-- | build2/version/init.cxx | 22 | ||||
| -rw-r--r-- | build2/version/init.hxx (renamed from build2/version/init) | 14 | ||||
| -rw-r--r-- | build2/version/module.cxx | 2 | ||||
| -rw-r--r-- | build2/version/module.hxx (renamed from build2/version/module) | 14 | ||||
| -rw-r--r-- | build2/version/rule.cxx | 24 | ||||
| -rw-r--r-- | build2/version/rule.hxx (renamed from build2/version/rule) | 14 | ||||
| -rw-r--r-- | build2/version/snapshot-git.cxx | 2 | ||||
| -rw-r--r-- | build2/version/snapshot.cxx | 4 | ||||
| -rw-r--r-- | build2/version/snapshot.hxx (renamed from build2/version/snapshot) | 14 | ||||
| -rw-r--r-- | old-tests/depdb/driver.cxx | 8 | ||||
| -rw-r--r-- | tests/.gitignore | 5 | ||||
| -rw-r--r-- | tests/build/root.build | 2 | ||||
| -rw-r--r-- | tests/test/script/runner/driver.cxx | 8 | ||||
| -rw-r--r-- | unit-tests/.gitignore | 5 | ||||
| -rw-r--r-- | unit-tests/function/driver.cxx | 16 | ||||
| -rw-r--r-- | unit-tests/lexer/driver.cxx | 8 | ||||
| -rw-r--r-- | unit-tests/scheduler/driver.cxx | 6 | ||||
| -rw-r--r-- | unit-tests/test/script/lexer/driver.cxx | 8 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/directive.test | 4 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/driver.cxx | 18 | ||||
| -rw-r--r-- | unit-tests/test/script/regex/driver.cxx | 2 |
196 files changed, 1276 insertions, 1282 deletions
@@ -10,7 +10,7 @@ Alternatively, if you have already cloned without --recursive, run: git submodule update --init -The checked out build2/version-impl will be overwritten during the build -process but these changes should be ignored. To do this automatically, run: +The checked out build2/version.hxx will be overwritten during the build process +but these changes should be ignored. To do this automatically, run: -git update-index --assume-unchanged build2/version-impl +git update-index --assume-unchanged build2/version.hxx diff --git a/build/root.build b/build/root.build index a7b0df3..85f69a1 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 diff --git a/build2/.gitignore b/build2/.gitignore index a82a338..eda023f 100644 --- a/build2/.gitignore +++ b/build2/.gitignore @@ -2,4 +2,4 @@ b b-boot #*-options #*-options.?xx -version-impl +version.hxx diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx index c6ff1b5..8203b08 100644 --- a/build2/algorithm.cxx +++ b/build2/algorithm.cxx @@ -2,17 +2,17 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/algorithm> - -#include <build2/scope> -#include <build2/target> -#include <build2/rule> -#include <build2/file> // import() -#include <build2/search> -#include <build2/context> -#include <build2/filesystem> -#include <build2/diagnostics> -#include <build2/prerequisite> +#include <build2/algorithm.hxx> + +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/rule.hxx> +#include <build2/file.hxx> // import() +#include <build2/search.hxx> +#include <build2/context.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> +#include <build2/prerequisite.hxx> using namespace std; using namespace butl; diff --git a/build2/algorithm b/build2/algorithm.hxx index 601d2ef..36e5a92 100644 --- a/build2/algorithm +++ b/build2/algorithm.hxx @@ -1,15 +1,15 @@ -// file : build2/algorithm -*- C++ -*- +// file : build2/algorithm.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_ALGORITHM -#define BUILD2_ALGORITHM +#ifndef BUILD2_ALGORITHM_HXX +#define BUILD2_ALGORITHM_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> -#include <build2/operation> +#include <build2/target.hxx> +#include <build2/operation.hxx> namespace build2 { @@ -434,4 +434,4 @@ namespace build2 #include <build2/algorithm.ixx> -#endif // BUILD2_ALGORITHM +#endif // BUILD2_ALGORITHM_HXX diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx index 46dece4..0e721f5 100644 --- a/build2/algorithm.ixx +++ b/build2/algorithm.ixx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/rule> -#include <build2/context> +#include <build2/rule.hxx> +#include <build2/context.hxx> namespace build2 { diff --git a/build2/b-options.cxx b/build2/b-options.cxx index d31868c..50871f0 100644 --- a/build2/b-options.cxx +++ b/build2/b-options.cxx @@ -6,11 +6,11 @@ // Begin prologue. // -#include <build2/types-parsers> +#include <build2/types-parsers.hxx> // // End prologue. -#include <build2/b-options> +#include <build2/b-options.hxx> #include <map> #include <set> diff --git a/build2/b-options b/build2/b-options.hxx index e674798..a280a79 100644 --- a/build2/b-options +++ b/build2/b-options.hxx @@ -4,8 +4,8 @@ // compiler for C++. // -#ifndef BUILD2_B_OPTIONS -#define BUILD2_B_OPTIONS +#ifndef BUILD2_B_OPTIONS_HXX +#define BUILD2_B_OPTIONS_HXX // Begin prologue. // @@ -347,7 +347,7 @@ namespace build2 } } -#include <build2/types> +#include <build2/types.hxx> namespace build2 { @@ -537,4 +537,4 @@ namespace build2 // // End epilogue. -#endif // BUILD2_B_OPTIONS +#endif // BUILD2_B_OPTIONS_HXX diff --git a/build2/b.cli b/build2/b.cli index 3d988a8..a6e1abc 100644 --- a/build2/b.cli +++ b/build2/b.cli @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -include <build2/types>; +include <build2/types.hxx>; "\section=1" "\name=b" diff --git a/build2/b.cxx b/build2/b.cxx index cafc18f..dbd002b 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -13,43 +13,43 @@ #include <typeinfo> #include <iostream> // cout -#include <butl/pager> +#include <libbutl/pager.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/spec> -#include <build2/operation> -#include <build2/scope> -#include <build2/target> -#include <build2/prerequisite> -#include <build2/rule> -#include <build2/file> -#include <build2/module> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> -#include <build2/context> -#include <build2/variable> +#include <build2/spec.hxx> +#include <build2/operation.hxx> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/prerequisite.hxx> +#include <build2/rule.hxx> +#include <build2/file.hxx> +#include <build2/module.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> -#include <build2/parser> +#include <build2/parser.hxx> -#include <build2/b-options> +#include <build2/b-options.hxx> using namespace butl; using namespace std; -#include <build2/config/init> -#include <build2/dist/init> -#include <build2/bin/init> -#include <build2/c/init> -#include <build2/cc/init> -#include <build2/cxx/init> -#include <build2/cli/init> -#include <build2/test/init> -#include <build2/install/init> -#include <build2/pkgconfig/init> -#include <build2/version/init> +#include <build2/config/init.hxx> +#include <build2/dist/init.hxx> +#include <build2/bin/init.hxx> +#include <build2/c/init.hxx> +#include <build2/cc/init.hxx> +#include <build2/cxx/init.hxx> +#include <build2/cli/init.hxx> +#include <build2/test/init.hxx> +#include <build2/install/init.hxx> +#include <build2/pkgconfig/init.hxx> +#include <build2/version/init.hxx> namespace build2 { diff --git a/build2/bin/guess.cxx b/build2/bin/guess.cxx index 90012d4..780ccf8 100644 --- a/build2/bin/guess.cxx +++ b/build2/bin/guess.cxx @@ -2,9 +2,9 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/bin/guess> +#include <build2/bin/guess.hxx> -#include <build2/diagnostics> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/build2/bin/guess b/build2/bin/guess.hxx index 659fcd0..803f299 100644 --- a/build2/bin/guess +++ b/build2/bin/guess.hxx @@ -1,12 +1,12 @@ -// file : build2/bin/guess -*- C++ -*- +// file : build2/bin/guess.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_BIN_GUESS -#define BUILD2_BIN_GUESS +#ifndef BUILD2_BIN_GUESS_HXX +#define BUILD2_BIN_GUESS_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -104,4 +104,4 @@ namespace build2 } } -#endif // BUILD2_BIN_GUESS +#endif // BUILD2_BIN_GUESS_HXX diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx index 9d08b62..71c77b2 100644 --- a/build2/bin/init.cxx +++ b/build2/bin/init.cxx @@ -2,20 +2,20 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/bin/init> +#include <build2/bin/init.hxx> #include <map> -#include <build2/scope> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> -#include <build2/config/utility> -#include <build2/install/utility> +#include <build2/config/utility.hxx> +#include <build2/install/utility.hxx> -#include <build2/bin/rule> -#include <build2/bin/guess> -#include <build2/bin/target> +#include <build2/bin/rule.hxx> +#include <build2/bin/guess.hxx> +#include <build2/bin/target.hxx> using namespace std; using namespace butl; diff --git a/build2/bin/init b/build2/bin/init.hxx index 430d789..b629f94 100644 --- a/build2/bin/init +++ b/build2/bin/init.hxx @@ -1,14 +1,14 @@ -// file : build2/bin/init -*- C++ -*- +// file : build2/bin/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_BIN_INIT -#define BUILD2_BIN_INIT +#ifndef BUILD2_BIN_INIT_HXX +#define BUILD2_BIN_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -97,4 +97,4 @@ namespace build2 } } -#endif // BUILD2_BIN_INIT +#endif // BUILD2_BIN_INIT_HXX diff --git a/build2/bin/rule.cxx b/build2/bin/rule.cxx index fd1526e..3aa3c81 100644 --- a/build2/bin/rule.cxx +++ b/build2/bin/rule.cxx @@ -2,14 +2,14 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/bin/rule> +#include <build2/bin/rule.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/algorithm> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/algorithm.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> using namespace std; diff --git a/build2/bin/rule b/build2/bin/rule.hxx index 95747c2..7109473 100644 --- a/build2/bin/rule +++ b/build2/bin/rule.hxx @@ -1,14 +1,14 @@ -// file : build2/bin/rule -*- C++ -*- +// file : build2/bin/rule.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_BIN_RULE -#define BUILD2_BIN_RULE +#ifndef BUILD2_BIN_RULE_HXX +#define BUILD2_BIN_RULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> +#include <build2/rule.hxx> namespace build2 { @@ -43,4 +43,4 @@ namespace build2 } } -#endif // BUILD2_BIN_RULE +#endif // BUILD2_BIN_RULE_HXX diff --git a/build2/bin/target.cxx b/build2/bin/target.cxx index dc691d6..962befa 100644 --- a/build2/bin/target.cxx +++ b/build2/bin/target.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/bin/target> +#include <build2/bin/target.hxx> using namespace std; diff --git a/build2/bin/target b/build2/bin/target.hxx index 35bde60..d920cc1 100644 --- a/build2/bin/target +++ b/build2/bin/target.hxx @@ -1,14 +1,14 @@ -// file : build2/bin/target -*- C++ -*- +// file : build2/bin/target.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_BIN_TARGET -#define BUILD2_BIN_TARGET +#ifndef BUILD2_BIN_TARGET_HXX +#define BUILD2_BIN_TARGET_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> +#include <build2/target.hxx> namespace build2 { @@ -117,4 +117,4 @@ namespace build2 } } -#endif // BUILD2_BIN_TARGET +#endif // BUILD2_BIN_TARGET_HXX diff --git a/build2/buildfile b/build2/buildfile index 8f8d51c..2d65001 100644 --- a/build2/buildfile +++ b/build2/buildfile @@ -41,7 +41,7 @@ exe{b}: \ {hxx cxx}{ types-parsers } \ {hxx ixx txx cxx}{ utility } \ {hxx ixx txx cxx}{ variable } \ - {hxx }{ version-impl } \ + {hxx }{ version } \ bin/{hxx cxx}{ guess } \ bin/{hxx cxx}{ init } \ bin/{hxx cxx}{ rule } \ @@ -107,8 +107,8 @@ exe{b}: {hxx ixx txx cxx}{** -b-options -dummy} \ liba{b} $libs #\ -hxx{version-impl}: in{version-impl} $src_root/file{manifest} -hxx{version-impl}: dist = true +hxx{version}: in{version} $src_root/file{manifest} +hxx{version}: dist = true # Fake utility library (without it code generation does not work). # @@ -130,8 +130,8 @@ if $cli.configured cli.cxx{b-options}: cli{b} cli.options += -I $src_root --include-with-brackets --include-prefix build2 \ ---guard-prefix BUILD2 --cxx-prologue "#include <build2/types-parsers>" \ ---cli-namespace build2::cl --generate-file-scanner --generate-parse \ +--guard-prefix BUILD2 --cxx-prologue "#include <build2/types-parsers.hxx>" \ +--cli-namespace build2::cl --generate-file-scanner --generate-parse \ --generate-specifier # Usage options. diff --git a/build2/c/init.cxx b/build2/c/init.cxx index c5b8ac8..da57223 100644 --- a/build2/c/init.cxx +++ b/build2/c/init.cxx @@ -2,16 +2,16 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/c/init> +#include <build2/c/init.hxx> -#include <build2/scope> -#include <build2/context> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> -#include <build2/cc/guess> -#include <build2/cc/module> +#include <build2/cc/guess.hxx> +#include <build2/cc/module.hxx> -#include <build2/c/target> +#include <build2/c/target.hxx> using namespace std; using namespace butl; diff --git a/build2/c/init b/build2/c/init.hxx index 3219cd3..e18a5df 100644 --- a/build2/c/init +++ b/build2/c/init.hxx @@ -1,14 +1,14 @@ -// file : build2/c/init -*- C++ -*- +// file : build2/c/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_C_INIT -#define BUILD2_C_INIT +#ifndef BUILD2_C_INIT_HXX +#define BUILD2_C_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -34,4 +34,4 @@ namespace build2 } } -#endif // BUILD2_C_INIT +#endif // BUILD2_C_INIT_HXX diff --git a/build2/c/target b/build2/c/target deleted file mode 100644 index 5d7566b..0000000 --- a/build2/c/target +++ /dev/null @@ -1,22 +0,0 @@ -// file : build2/c/target -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BUILD2_C_TARGET -#define BUILD2_C_TARGET - -#include <build2/types> -#include <build2/utility> - -#include <build2/cc/target> - -namespace build2 -{ - namespace c - { - using cc::h; - using cc::c; - } -} - -#endif // BUILD2_C_TARGET diff --git a/build2/c/target.hxx b/build2/c/target.hxx new file mode 100644 index 0000000..d92405d --- /dev/null +++ b/build2/c/target.hxx @@ -0,0 +1,22 @@ +// file : build2/c/target.hxx -*- C++ -*- +// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef BUILD2_C_TARGET_HXX +#define BUILD2_C_TARGET_HXX + +#include <build2/types.hxx> +#include <build2/utility.hxx> + +#include <build2/cc/target.hxx> + +namespace build2 +{ + namespace c + { + using cc::h; + using cc::c; + } +} + +#endif // BUILD2_C_TARGET_HXX diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx index 88eb45d..59feb9b 100644 --- a/build2/cc/common.cxx +++ b/build2/cc/common.cxx @@ -2,17 +2,17 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/common> +#include <build2/cc/common.hxx> -#include <build2/file> // import() -#include <build2/scope> -#include <build2/context> -#include <build2/variable> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/file.hxx> // import() +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/cc/utility> +#include <build2/cc/utility.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/common b/build2/cc/common.hxx index 5a459b8..0c8ff2b 100644 --- a/build2/cc/common +++ b/build2/cc/common.hxx @@ -1,18 +1,18 @@ -// file : build2/cc/common -*- C++ -*- +// file : build2/cc/common.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_COMMON -#define BUILD2_CC_COMMON +#ifndef BUILD2_CC_COMMON_HXX +#define BUILD2_CC_COMMON_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/variable> +#include <build2/variable.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/types> +#include <build2/cc/types.hxx> namespace build2 { @@ -286,4 +286,4 @@ namespace build2 } } -#endif // BUILD2_CC_COMMON +#endif // BUILD2_CC_COMMON_HXX diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index 7e37c44..b8b362d 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -2,22 +2,22 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/compile> +#include <build2/cc/compile.hxx> #include <cstdlib> // exit() #include <iostream> // cerr -#include <build2/depdb> -#include <build2/scope> -#include <build2/context> -#include <build2/variable> -#include <build2/algorithm> -#include <build2/diagnostics> +#include <build2/depdb.hxx> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/algorithm.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/target> // h -#include <build2/cc/utility> +#include <build2/cc/target.hxx> // h +#include <build2/cc/utility.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/compile b/build2/cc/compile.hxx index 2986b7d..bee13f2 100644 --- a/build2/cc/compile +++ b/build2/cc/compile.hxx @@ -1,19 +1,19 @@ -// file : build2/cc/compile -*- C++ -*- +// file : build2/cc/compile.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_COMPILE -#define BUILD2_CC_COMPILE +#ifndef BUILD2_CC_COMPILE_HXX +#define BUILD2_CC_COMPILE_HXX -#include <butl/path-map> +#include <libbutl/path-map.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> +#include <build2/rule.hxx> -#include <build2/cc/types> -#include <build2/cc/common> +#include <build2/cc/types.hxx> +#include <build2/cc/common.hxx> namespace build2 { @@ -91,4 +91,4 @@ namespace build2 } } -#endif // BUILD2_CC_COMPILE +#endif // BUILD2_CC_COMPILE_HXX diff --git a/build2/cc/gcc.cxx b/build2/cc/gcc.cxx index c16191a..b5dd236 100644 --- a/build2/cc/gcc.cxx +++ b/build2/cc/gcc.cxx @@ -2,18 +2,18 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/variable> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/types> +#include <build2/cc/types.hxx> -#include <build2/cc/module> +#include <build2/cc/module.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/guess.cxx b/build2/cc/guess.cxx index 8b45420..0569bdc 100644 --- a/build2/cc/guess.cxx +++ b/build2/cc/guess.cxx @@ -2,11 +2,11 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/guess> +#include <build2/cc/guess.hxx> #include <cstring> // strlen(), strchr() -#include <build2/diagnostics> +#include <build2/diagnostics.hxx> using namespace std; @@ -946,8 +946,9 @@ namespace build2 // Now we need to map x86, x64, and ARM to the target triplets. The // problem is, there aren't any established ones so we got to invent - // them ourselves. Based on the discussion in <butl/target-triplet>, - // we need something in the CPU-VENDOR-OS-ABI form. + // them ourselves. Based on the discussion in + // <libbutl/target-triplet.hxx>, we need something in the + // CPU-VENDOR-OS-ABI form. // // The CPU part is fairly straightforward with x86 mapped to 'i386' (or // maybe 'i686'), x64 to 'x86_64', and ARM to 'arm' (it could also diff --git a/build2/cc/guess b/build2/cc/guess.hxx index 593bd85..dbd06e3 100644 --- a/build2/cc/guess +++ b/build2/cc/guess.hxx @@ -1,14 +1,14 @@ -// file : build2/cc/guess -*- C++ -*- +// file : build2/cc/guess.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_GUESS -#define BUILD2_CC_GUESS +#ifndef BUILD2_CC_GUESS_HXX +#define BUILD2_CC_GUESS_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/cc/types> +#include <build2/cc/types.hxx> namespace build2 { @@ -138,4 +138,4 @@ namespace build2 } } -#endif // BUILD2_CC_GUESS +#endif // BUILD2_CC_GUESS_HXX diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx index bc598c3..8d20573 100644 --- a/build2/cc/init.cxx +++ b/build2/cc/init.cxx @@ -2,15 +2,15 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/init> +#include <build2/cc/init.hxx> -#include <build2/scope> -#include <build2/context> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> -#include <build2/config/utility> +#include <build2/config/utility.hxx> -#include <build2/cc/target> +#include <build2/cc/target.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/init b/build2/cc/init.hxx index c969505..9eab424 100644 --- a/build2/cc/init +++ b/build2/cc/init.hxx @@ -1,14 +1,14 @@ -// file : build2/cc/init -*- C++ -*- +// file : build2/cc/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_INIT -#define BUILD2_CC_INIT +#ifndef BUILD2_CC_INIT_HXX +#define BUILD2_CC_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -61,4 +61,4 @@ namespace build2 } } -#endif // BUILD2_CC_INIT +#endif // BUILD2_CC_INIT_HXX diff --git a/build2/cc/install.cxx b/build2/cc/install.cxx index e1e5719..e09a62f 100644 --- a/build2/cc/install.cxx +++ b/build2/cc/install.cxx @@ -2,14 +2,14 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/install> +#include <build2/cc/install.hxx> -#include <build2/algorithm> +#include <build2/algorithm.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/link> // match() -#include <build2/cc/utility> +#include <build2/cc/link.hxx> // match() +#include <build2/cc/utility.hxx> using namespace std; diff --git a/build2/cc/install b/build2/cc/install.hxx index e229e94..b7d92fb 100644 --- a/build2/cc/install +++ b/build2/cc/install.hxx @@ -1,17 +1,17 @@ -// file : build2/cc/install -*- C++ -*- +// file : build2/cc/install.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_INSTALL -#define BUILD2_CC_INSTALL +#ifndef BUILD2_CC_INSTALL_HXX +#define BUILD2_CC_INSTALL_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/install/rule> +#include <build2/install/rule.hxx> -#include <build2/cc/types> -#include <build2/cc/common> +#include <build2/cc/types.hxx> +#include <build2/cc/common.hxx> namespace build2 { @@ -45,4 +45,4 @@ namespace build2 } } -#endif // BUILD2_CC_INSTALL +#endif // BUILD2_CC_INSTALL_HXX diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx index 80281f7..1b2f306 100644 --- a/build2/cc/link.cxx +++ b/build2/cc/link.cxx @@ -2,27 +2,27 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/link> +#include <build2/cc/link.hxx> #include <map> #include <cstdlib> // exit() #include <iostream> // cerr -#include <butl/path-map> -#include <butl/filesystem> // file_exists() +#include <libbutl/path-map.hxx> +#include <libbutl/filesystem.hxx> // file_exists() -#include <build2/depdb> -#include <build2/scope> -#include <build2/context> -#include <build2/variable> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/depdb.hxx> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/target> // c -#include <build2/cc/utility> +#include <build2/cc/target.hxx> // c +#include <build2/cc/utility.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/link b/build2/cc/link.hxx index 0dace7c..4dc722a 100644 --- a/build2/cc/link +++ b/build2/cc/link.hxx @@ -1,19 +1,19 @@ -// file : build2/cc/link -*- C++ -*- +// file : build2/cc/link.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_LINK -#define BUILD2_CC_LINK +#ifndef BUILD2_CC_LINK_HXX +#define BUILD2_CC_LINK_HXX #include <set> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> +#include <build2/rule.hxx> -#include <build2/cc/types> -#include <build2/cc/common> +#include <build2/cc/types.hxx> +#include <build2/cc/common.hxx> namespace build2 { @@ -127,4 +127,4 @@ namespace build2 } } -#endif // BUILD2_CC_LINK +#endif // BUILD2_CC_LINK_HXX diff --git a/build2/cc/module.cxx b/build2/cc/module.cxx index 7df71ba..6d8c799 100644 --- a/build2/cc/module.cxx +++ b/build2/cc/module.cxx @@ -2,20 +2,20 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/module> +#include <build2/cc/module.hxx> #include <iomanip> // left, setw() -#include <build2/scope> -#include <build2/context> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/config/utility> -#include <build2/install/utility> +#include <build2/config/utility.hxx> +#include <build2/install/utility.hxx> -#include <build2/cc/guess> +#include <build2/cc/guess.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/module b/build2/cc/module.hxx index 3c5ec61..643cf89 100644 --- a/build2/cc/module +++ b/build2/cc/module.hxx @@ -1,21 +1,21 @@ -// file : build2/cc/module -*- C++ -*- +// file : build2/cc/module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_MODULE -#define BUILD2_CC_MODULE +#ifndef BUILD2_CC_MODULE_HXX +#define BUILD2_CC_MODULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> -#include <build2/variable> +#include <build2/module.hxx> +#include <build2/variable.hxx> -#include <build2/cc/common> +#include <build2/cc/common.hxx> -#include <build2/cc/compile> -#include <build2/cc/link> -#include <build2/cc/install> +#include <build2/cc/compile.hxx> +#include <build2/cc/link.hxx> +#include <build2/cc/install.hxx> namespace build2 { @@ -65,4 +65,4 @@ namespace build2 } } -#endif // BUILD2_CC_MODULE +#endif // BUILD2_CC_MODULE_HXX diff --git a/build2/cc/msvc.cxx b/build2/cc/msvc.cxx index aa9389f..e3765cd 100644 --- a/build2/cc/msvc.cxx +++ b/build2/cc/msvc.cxx @@ -4,19 +4,19 @@ #include <iostream> // cerr -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/variable> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/types> +#include <build2/cc/types.hxx> -#include <build2/cc/common> -#include <build2/cc/module> +#include <build2/cc/common.hxx> +#include <build2/cc/module.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx index 00ab541..1b67f5f 100644 --- a/build2/cc/pkgconfig.cxx +++ b/build2/cc/pkgconfig.cxx @@ -2,19 +2,19 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/variable> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/types> -#include <build2/cc/utility> +#include <build2/cc/types.hxx> +#include <build2/cc/utility.hxx> -#include <build2/cc/common> +#include <build2/cc/common.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/target.cxx b/build2/cc/target.cxx index a734953..5fbf67d 100644 --- a/build2/cc/target.cxx +++ b/build2/cc/target.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/target> +#include <build2/cc/target.hxx> using namespace std; diff --git a/build2/cc/target b/build2/cc/target.hxx index 6992609..4c9e4cb 100644 --- a/build2/cc/target +++ b/build2/cc/target.hxx @@ -1,14 +1,14 @@ -// file : build2/cc/target -*- C++ -*- +// file : build2/cc/target.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_TARGET -#define BUILD2_CC_TARGET +#ifndef BUILD2_CC_TARGET_HXX +#define BUILD2_CC_TARGET_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> +#include <build2/target.hxx> namespace build2 { @@ -60,4 +60,4 @@ namespace build2 } } -#endif // BUILD2_CC_TARGET +#endif // BUILD2_CC_TARGET_HXX diff --git a/build2/cc/types b/build2/cc/types.hxx index 68d9949..59ea67f 100644 --- a/build2/cc/types +++ b/build2/cc/types.hxx @@ -1,12 +1,12 @@ -// file : build2/cc/types -*- C++ -*- +// file : build2/cc/types.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_TYPES -#define BUILD2_CC_TYPES +#ifndef BUILD2_CC_TYPES_HXX +#define BUILD2_CC_TYPES_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -32,4 +32,4 @@ namespace build2 } } -#endif // BUILD2_CC_TYPES +#endif // BUILD2_CC_TYPES_HXX diff --git a/build2/cc/utility.cxx b/build2/cc/utility.cxx index 4a931af..7a03b54 100644 --- a/build2/cc/utility.cxx +++ b/build2/cc/utility.cxx @@ -2,12 +2,12 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cc/utility> +#include <build2/cc/utility.hxx> -#include <build2/variable> -#include <build2/algorithm> // search() +#include <build2/variable.hxx> +#include <build2/algorithm.hxx> // search() -#include <build2/bin/target> +#include <build2/bin/target.hxx> using namespace std; diff --git a/build2/cc/utility b/build2/cc/utility.hxx index ee3cb81..e0529af 100644 --- a/build2/cc/utility +++ b/build2/cc/utility.hxx @@ -1,17 +1,17 @@ -// file : build2/cc/utility -*- C++ -*- +// file : build2/cc/utility.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CC_UTILITY -#define BUILD2_CC_UTILITY +#ifndef BUILD2_CC_UTILITY_HXX +#define BUILD2_CC_UTILITY_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> -#include <build2/bin/target> +#include <build2/target.hxx> +#include <build2/bin/target.hxx> -#include <build2/cc/types> +#include <build2/cc/types.hxx> namespace build2 { @@ -48,4 +48,4 @@ namespace build2 #include <build2/cc/utility.ixx> -#endif // BUILD2_CC_UTILITY +#endif // BUILD2_CC_UTILITY_HXX diff --git a/build2/cc/windows-manifest.cxx b/build2/cc/windows-manifest.cxx index 3a62fcc..d840f67 100644 --- a/build2/cc/windows-manifest.cxx +++ b/build2/cc/windows-manifest.cxx @@ -2,14 +2,14 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/variable> -#include <build2/filesystem> -#include <build2/diagnostics> - -#include <build2/cc/link> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> + +#include <build2/cc/link.hxx> using namespace std; using namespace butl; diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx index 0b34963..0078944 100644 --- a/build2/cc/windows-rpath.cxx +++ b/build2/cc/windows-rpath.cxx @@ -4,15 +4,15 @@ #include <errno.h> // E* -#include <build2/scope> -#include <build2/context> -#include <build2/variable> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/bin/target> +#include <build2/bin/target.hxx> -#include <build2/cc/link> +#include <build2/cc/link.hxx> using namespace std; using namespace butl; diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx index 3e4ba03..d257efa 100644 --- a/build2/cli/init.cxx +++ b/build2/cli/init.cxx @@ -2,19 +2,19 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cli/init> +#include <build2/cli/init.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> -#include <build2/cxx/target> +#include <build2/cxx/target.hxx> -#include <build2/config/utility> +#include <build2/config/utility.hxx> -#include <build2/cli/target> -#include <build2/cli/rule> +#include <build2/cli/target.hxx> +#include <build2/cli/rule.hxx> using namespace std; using namespace butl; diff --git a/build2/cli/init b/build2/cli/init.hxx index 149a436..3edb24e 100644 --- a/build2/cli/init +++ b/build2/cli/init.hxx @@ -1,14 +1,14 @@ -// file : build2/cli/init -*- C++ -*- +// file : build2/cli/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CLI_INIT -#define BUILD2_CLI_INIT +#ifndef BUILD2_CLI_INIT_HXX +#define BUILD2_CLI_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -34,4 +34,4 @@ namespace build2 } } -#endif // BUILD2_CLI_INIT +#endif // BUILD2_CLI_INIT_HXX diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx index 2eb98c7..9e925b3 100644 --- a/build2/cli/rule.cxx +++ b/build2/cli/rule.cxx @@ -2,16 +2,16 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cli/rule> +#include <build2/cli/rule.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/cli/target> +#include <build2/cli/target.hxx> using namespace std; using namespace butl; diff --git a/build2/cli/rule b/build2/cli/rule.hxx index d783c20..6798a6b 100644 --- a/build2/cli/rule +++ b/build2/cli/rule.hxx @@ -1,14 +1,14 @@ -// file : build2/cli/rule -*- C++ -*- +// file : build2/cli/rule.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CLI_RULE -#define BUILD2_CLI_RULE +#ifndef BUILD2_CLI_RULE_HXX +#define BUILD2_CLI_RULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> +#include <build2/rule.hxx> namespace build2 { @@ -36,4 +36,4 @@ namespace build2 } } -#endif // BUILD2_CLI_RULE +#endif // BUILD2_CLI_RULE_HXX diff --git a/build2/cli/target.cxx b/build2/cli/target.cxx index 2199f79..0b85810 100644 --- a/build2/cli/target.cxx +++ b/build2/cli/target.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cli/target> +#include <build2/cli/target.hxx> using namespace std; using namespace butl; diff --git a/build2/cli/target b/build2/cli/target.hxx index 5e51bb4..1247172 100644 --- a/build2/cli/target +++ b/build2/cli/target.hxx @@ -1,16 +1,16 @@ -// file : build2/cli/target -*- C++ -*- +// file : build2/cli/target.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CLI_TARGET -#define BUILD2_CLI_TARGET +#ifndef BUILD2_CLI_TARGET_HXX +#define BUILD2_CLI_TARGET_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> +#include <build2/target.hxx> -#include <build2/cxx/target> +#include <build2/cxx/target.hxx> namespace build2 { @@ -52,4 +52,4 @@ namespace build2 } } -#endif // BUILD2_CLI_TARGET +#endif // BUILD2_CLI_TARGET_HXX diff --git a/build2/config/init.cxx b/build2/config/init.cxx index 65aa7bb..889285d 100644 --- a/build2/config/init.cxx +++ b/build2/config/init.cxx @@ -2,18 +2,18 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/config/init> - -#include <build2/file> -#include <build2/rule> -#include <build2/scope> -#include <build2/context> -#include <build2/filesystem> // exists() -#include <build2/diagnostics> - -#include <build2/config/module> -#include <build2/config/utility> -#include <build2/config/operation> +#include <build2/config/init.hxx> + +#include <build2/file.hxx> +#include <build2/rule.hxx> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/filesystem.hxx> // exists() +#include <build2/diagnostics.hxx> + +#include <build2/config/module.hxx> +#include <build2/config/utility.hxx> +#include <build2/config/operation.hxx> using namespace std; using namespace butl; diff --git a/build2/config/init b/build2/config/init.hxx index 7100ab2..45c288b 100644 --- a/build2/config/init +++ b/build2/config/init.hxx @@ -1,14 +1,14 @@ -// file : build2/config/init -*- C++ -*- +// file : build2/config/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CONFIG_INIT -#define BUILD2_CONFIG_INIT +#ifndef BUILD2_CONFIG_INIT_HXX +#define BUILD2_CONFIG_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -28,4 +28,4 @@ namespace build2 } } -#endif // BUILD2_CONFIG_INIT +#endif // BUILD2_CONFIG_INIT_HXX diff --git a/build2/config/module.cxx b/build2/config/module.cxx index 6d54e46..19b5125 100644 --- a/build2/config/module.cxx +++ b/build2/config/module.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/config/module> +#include <build2/config/module.hxx> using namespace std; diff --git a/build2/config/module b/build2/config/module.hxx index 3b58aa0..d997802 100644 --- a/build2/config/module +++ b/build2/config/module.hxx @@ -1,20 +1,20 @@ -// file : build2/config/module -*- C++ -*- +// file : build2/config/module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CONFIG_MODULE -#define BUILD2_CONFIG_MODULE +#ifndef BUILD2_CONFIG_MODULE_HXX +#define BUILD2_CONFIG_MODULE_HXX #include <map> #include <algorithm> // find_if() -#include <butl/prefix-map> +#include <libbutl/prefix-map.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> -#include <build2/variable> +#include <build2/module.hxx> +#include <build2/variable.hxx> namespace build2 { @@ -91,4 +91,4 @@ namespace build2 } } -#endif // BUILD2_CONFIG_MODULE +#endif // BUILD2_CONFIG_MODULE_HXX diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx index cf53292..bffc45b 100644 --- a/build2/config/operation.cxx +++ b/build2/config/operation.cxx @@ -2,21 +2,21 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/config/operation> +#include <build2/config/operation.hxx> #include <set> -#include <build2/file> -#include <build2/spec> -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> - -#include <build2/config/module> -#include <build2/config/utility> +#include <build2/file.hxx> +#include <build2/spec.hxx> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> + +#include <build2/config/module.hxx> +#include <build2/config/utility.hxx> using namespace std; using namespace butl; diff --git a/build2/config/operation b/build2/config/operation.hxx index 425869c..bf9403f 100644 --- a/build2/config/operation +++ b/build2/config/operation.hxx @@ -1,14 +1,14 @@ -// file : build2/config/operation -*- C++ -*- +// file : build2/config/operation.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CONFIG_OPERATION -#define BUILD2_CONFIG_OPERATION +#ifndef BUILD2_CONFIG_OPERATION_HXX +#define BUILD2_CONFIG_OPERATION_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/operation> +#include <build2/operation.hxx> namespace build2 { @@ -26,4 +26,4 @@ namespace build2 } } -#endif // BUILD2_CONFIG_OPERATION +#endif // BUILD2_CONFIG_OPERATION_HXX diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx index ea66e92..c195e0b 100644 --- a/build2/config/utility.cxx +++ b/build2/config/utility.cxx @@ -2,11 +2,11 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/config/utility> +#include <build2/config/utility.hxx> -#include <build2/context> +#include <build2/context.hxx> -#include <build2/config/module> +#include <build2/config/module.hxx> using namespace std; diff --git a/build2/config/utility b/build2/config/utility.hxx index 041277a..33a3985 100644 --- a/build2/config/utility +++ b/build2/config/utility.hxx @@ -1,15 +1,15 @@ -// file : build2/config/utility -*- C++ -*- +// file : build2/config/utility.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CONFIG_UTILITY -#define BUILD2_CONFIG_UTILITY +#ifndef BUILD2_CONFIG_UTILITY_HXX +#define BUILD2_CONFIG_UTILITY_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> namespace build2 { @@ -149,4 +149,4 @@ namespace build2 #include <build2/config/utility.txx> -#endif // BUILD2_CONFIG_UTILITY +#endif // BUILD2_CONFIG_UTILITY_HXX diff --git a/build2/config/utility.txx b/build2/config/utility.txx index 1434406..fc21710 100644 --- a/build2/config/utility.txx +++ b/build2/config/utility.txx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/scope> -#include <build2/context> +#include <build2/scope.hxx> +#include <build2/context.hxx> namespace build2 { diff --git a/build2/context.cxx b/build2/context.cxx index 56db9d4..669fcae 100644 --- a/build2/context.cxx +++ b/build2/context.cxx @@ -2,22 +2,22 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/context> +#include <build2/context.hxx> #include <sstream> -#include <build2/rule> -#include <build2/scope> -#include <build2/target> -#include <build2/diagnostics> +#include <build2/rule.hxx> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/diagnostics.hxx> // For command line variable parsing. // -#include <build2/token> -#include <build2/lexer> -#include <build2/parser> +#include <build2/token.hxx> +#include <build2/lexer.hxx> +#include <build2/parser.hxx> -#include <build2/config/operation> // config::preprocess_create(). +#include <build2/config/operation.hxx> // config::preprocess_create(). using namespace std; using namespace butl; @@ -220,7 +220,7 @@ namespace build2 vp.clear (); // Reset meta/operation tables. Note that the order should match the id - // constants in <build2/operation>. + // constants in <build2/operation.hxx>. // meta_operation_table.clear (); meta_operation_table.insert ("noop"); @@ -240,7 +240,7 @@ namespace build2 operation_table.insert ("uninstall"); // Create global scope. Note that the empty path is a prefix for any other - // path. See the comment in <butl/prefix-map> for details. + // path. See the comment in <libbutl/prefix-map.hxx> for details. // auto make_global_scope = [&sm] () -> scope& { diff --git a/build2/context b/build2/context.hxx index bc73d5b..ff8b5b3 100644 --- a/build2/context +++ b/build2/context.hxx @@ -1,17 +1,17 @@ -// file : build2/context -*- C++ -*- +// file : build2/context.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CONTEXT -#define BUILD2_CONTEXT +#ifndef BUILD2_CONTEXT_HXX +#define BUILD2_CONTEXT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/scope> -#include <build2/variable> -#include <build2/operation> -#include <build2/scheduler> +#include <build2/scope.hxx> +#include <build2/variable.hxx> +#include <build2/operation.hxx> +#include <build2/scheduler.hxx> namespace build2 { @@ -396,4 +396,4 @@ namespace build2 #include <build2/context.ixx> -#endif // BUILD2_CONTEXT +#endif // BUILD2_CONTEXT_HXX diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx index f76779b..c74a077 100644 --- a/build2/cxx/init.cxx +++ b/build2/cxx/init.cxx @@ -2,16 +2,16 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cxx/init> +#include <build2/cxx/init.hxx> -#include <build2/scope> -#include <build2/context> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> -#include <build2/cc/guess> -#include <build2/cc/module> +#include <build2/cc/guess.hxx> +#include <build2/cc/module.hxx> -#include <build2/cxx/target> +#include <build2/cxx/target.hxx> using namespace std; using namespace butl; diff --git a/build2/cxx/init b/build2/cxx/init.hxx index 78798b9..5ba4041 100644 --- a/build2/cxx/init +++ b/build2/cxx/init.hxx @@ -1,14 +1,14 @@ -// file : build2/cxx/init -*- C++ -*- +// file : build2/cxx/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CXX_INIT -#define BUILD2_CXX_INIT +#ifndef BUILD2_CXX_INIT_HXX +#define BUILD2_CXX_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -34,4 +34,4 @@ namespace build2 } } -#endif // BUILD2_CXX_INIT +#endif // BUILD2_CXX_INIT_HXX diff --git a/build2/cxx/target.cxx b/build2/cxx/target.cxx index 8955cb2..7fb9971 100644 --- a/build2/cxx/target.cxx +++ b/build2/cxx/target.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/cxx/target> +#include <build2/cxx/target.hxx> using namespace std; diff --git a/build2/cxx/target b/build2/cxx/target.hxx index 6a63060..4dd93e3 100644 --- a/build2/cxx/target +++ b/build2/cxx/target.hxx @@ -1,15 +1,15 @@ -// file : build2/cxx/target -*- C++ -*- +// file : build2/cxx/target.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_CXX_TARGET -#define BUILD2_CXX_TARGET +#ifndef BUILD2_CXX_TARGET_HXX +#define BUILD2_CXX_TARGET_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> -#include <build2/cc/target> +#include <build2/target.hxx> +#include <build2/cc/target.hxx> namespace build2 { @@ -60,4 +60,4 @@ namespace build2 } } -#endif // BUILD2_CXX_TARGET +#endif // BUILD2_CXX_TARGET_HXX diff --git a/build2/depdb.cxx b/build2/depdb.cxx index 60425d5..5aa2970 100644 --- a/build2/depdb.cxx +++ b/build2/depdb.cxx @@ -2,9 +2,9 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/depdb> +#include <build2/depdb.hxx> -#include <butl/filesystem> // file_mtime() +#include <libbutl/filesystem.hxx> // file_mtime() using namespace std; using namespace butl; diff --git a/build2/depdb b/build2/depdb.hxx index abd2e20..9dffa28 100644 --- a/build2/depdb +++ b/build2/depdb.hxx @@ -1,15 +1,15 @@ -// file : build2/depdb -*- C++ -*- +// file : build2/depdb.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_DEPDB -#define BUILD2_DEPDB +#ifndef BUILD2_DEPDB_HXX +#define BUILD2_DEPDB_HXX #include <fstream> #include <cstring> // strlen() -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -198,4 +198,4 @@ namespace build2 }; } -#endif // BUILD2_DEPDB +#endif // BUILD2_DEPDB_HXX diff --git a/build2/diagnostics.cxx b/build2/diagnostics.cxx index 0c4e63f..25339f7 100644 --- a/build2/diagnostics.cxx +++ b/build2/diagnostics.cxx @@ -2,11 +2,11 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/diagnostics> +#include <build2/diagnostics.hxx> #include <cstring> // strchr() -#include <butl/process-io> +#include <libbutl/process-io.hxx> using namespace std; diff --git a/build2/diagnostics b/build2/diagnostics.hxx index 2c2b4bb..692115b 100644 --- a/build2/diagnostics +++ b/build2/diagnostics.hxx @@ -1,14 +1,14 @@ -// file : build2/diagnostics -*- C++ -*- +// file : build2/diagnostics.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_DIAGNOSTICS -#define BUILD2_DIAGNOSTICS +#ifndef BUILD2_DIAGNOSTICS_HXX +#define BUILD2_DIAGNOSTICS_HXX -#include <butl/diagnostics> +#include <libbutl/diagnostics.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -348,4 +348,4 @@ namespace build2 extern const fail_end endf; } -#endif // BUILD2_DIAGNOSTICS +#endif // BUILD2_DIAGNOSTICS_HXX diff --git a/build2/dist/init.cxx b/build2/dist/init.cxx index 41927cd..d002868 100644 --- a/build2/dist/init.cxx +++ b/build2/dist/init.cxx @@ -2,17 +2,17 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/dist/init> +#include <build2/dist/init.hxx> -#include <build2/scope> -#include <build2/file> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/file.hxx> +#include <build2/diagnostics.hxx> -#include <build2/config/utility> +#include <build2/config/utility.hxx> -#include <build2/dist/rule> -#include <build2/dist/module> -#include <build2/dist/operation> +#include <build2/dist/rule.hxx> +#include <build2/dist/module.hxx> +#include <build2/dist/operation.hxx> using namespace std; using namespace butl; diff --git a/build2/dist/init b/build2/dist/init.hxx index 67ec0a4..45d47df 100644 --- a/build2/dist/init +++ b/build2/dist/init.hxx @@ -1,14 +1,14 @@ -// file : build2/dist/init -*- C++ -*- +// file : build2/dist/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_DIST_INIT -#define BUILD2_DIST_INIT +#ifndef BUILD2_DIST_INIT_HXX +#define BUILD2_DIST_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -28,4 +28,4 @@ namespace build2 } } -#endif // BUILD2_DIST_INIT +#endif // BUILD2_DIST_INIT_HXX diff --git a/build2/dist/module.cxx b/build2/dist/module.cxx index 05ca1cb..4f14ddb 100644 --- a/build2/dist/module.cxx +++ b/build2/dist/module.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/dist/module> +#include <build2/dist/module.hxx> using namespace std; diff --git a/build2/dist/module b/build2/dist/module.hxx index 5510423..e6eb975 100644 --- a/build2/dist/module +++ b/build2/dist/module.hxx @@ -1,15 +1,15 @@ -// file : build2/dist/module -*- C++ -*- +// file : build2/dist/module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_DIST_MODULE -#define BUILD2_DIST_MODULE +#ifndef BUILD2_DIST_MODULE_HXX +#define BUILD2_DIST_MODULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> -#include <build2/variable> +#include <build2/module.hxx> +#include <build2/variable.hxx> namespace build2 { @@ -62,4 +62,4 @@ namespace build2 } } -#endif // BUILD2_DIST_MODULE +#endif // BUILD2_DIST_MODULE_HXX diff --git a/build2/dist/operation b/build2/dist/operation deleted file mode 100644 index 845130f..0000000 --- a/build2/dist/operation +++ /dev/null @@ -1,21 +0,0 @@ -// file : build2/dist/operation -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BUILD2_DIST_OPERATION -#define BUILD2_DIST_OPERATION - -#include <build2/types> -#include <build2/utility> - -#include <build2/operation> - -namespace build2 -{ - namespace dist - { - extern const meta_operation_info dist; - } -} - -#endif // BUILD2_DIST_OPERATION diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx index 859225d..d4ca3c6 100644 --- a/build2/dist/operation.cxx +++ b/build2/dist/operation.cxx @@ -2,20 +2,20 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/dist/operation> +#include <build2/dist/operation.hxx> -#include <butl/filesystem> // path_match() +#include <libbutl/filesystem.hxx> // path_match() -#include <build2/file> -#include <build2/dump> -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/file.hxx> +#include <build2/dump.hxx> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/dist/module> +#include <build2/dist/module.hxx> using namespace std; using namespace butl; diff --git a/build2/dist/operation.hxx b/build2/dist/operation.hxx new file mode 100644 index 0000000..c72e467 --- /dev/null +++ b/build2/dist/operation.hxx @@ -0,0 +1,21 @@ +// file : build2/dist/operation.hxx -*- C++ -*- +// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef BUILD2_DIST_OPERATION_HXX +#define BUILD2_DIST_OPERATION_HXX + +#include <build2/types.hxx> +#include <build2/utility.hxx> + +#include <build2/operation.hxx> + +namespace build2 +{ + namespace dist + { + extern const meta_operation_info dist; + } +} + +#endif // BUILD2_DIST_OPERATION_HXX diff --git a/build2/dist/rule.cxx b/build2/dist/rule.cxx index 338f7f9..ab00d41 100644 --- a/build2/dist/rule.cxx +++ b/build2/dist/rule.cxx @@ -2,12 +2,12 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/dist/rule> +#include <build2/dist/rule.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/algorithm> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/algorithm.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/build2/dist/rule b/build2/dist/rule.hxx index 0a5cc3a..0524029 100644 --- a/build2/dist/rule +++ b/build2/dist/rule.hxx @@ -1,16 +1,16 @@ -// file : build2/dist/rule -*- C++ -*- +// file : build2/dist/rule.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_DIST_RULE -#define BUILD2_DIST_RULE +#ifndef BUILD2_DIST_RULE_HXX +#define BUILD2_DIST_RULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> -#include <build2/target> -#include <build2/operation> +#include <build2/rule.hxx> +#include <build2/target.hxx> +#include <build2/operation.hxx> namespace build2 { @@ -37,4 +37,4 @@ namespace build2 } } -#endif // BUILD2_DIST_RULE +#endif // BUILD2_DIST_RULE_HXX diff --git a/build2/dump.cxx b/build2/dump.cxx index 6d055ae..ab2e73f 100644 --- a/build2/dump.cxx +++ b/build2/dump.cxx @@ -2,13 +2,13 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/dump> +#include <build2/dump.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/variable> -#include <build2/context> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/variable.hxx> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/build2/dump b/build2/dump.hxx index a1d9b07..e456540 100644 --- a/build2/dump +++ b/build2/dump.hxx @@ -1,14 +1,14 @@ -// file : build2/dump -*- C++ -*- +// file : build2/dump.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_DUMP -#define BUILD2_DUMP +#ifndef BUILD2_DUMP_HXX +#define BUILD2_DUMP_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/operation> +#include <build2/operation.hxx> namespace build2 { @@ -18,4 +18,4 @@ namespace build2 dump (); } -#endif // BUILD2_DUMP +#endif // BUILD2_DUMP_HXX diff --git a/build2/file.cxx b/build2/file.cxx index 3d7f1b8..ddcce82 100644 --- a/build2/file.cxx +++ b/build2/file.cxx @@ -2,22 +2,22 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/file> +#include <build2/file.hxx> #include <iostream> // cin -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/filesystem> // exists() -#include <build2/prerequisite> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/filesystem.hxx> // exists() +#include <build2/prerequisite.hxx> +#include <build2/diagnostics.hxx> -#include <build2/token> -#include <build2/lexer> -#include <build2/parser> +#include <build2/token.hxx> +#include <build2/lexer.hxx> +#include <build2/parser.hxx> -#include <build2/config/utility> +#include <build2/config/utility.hxx> using namespace std; using namespace butl; diff --git a/build2/file b/build2/file.hxx index 2200c26..7bfae14 100644 --- a/build2/file +++ b/build2/file.hxx @@ -1,17 +1,17 @@ -// file : build2/file -*- C++ -*- +// file : build2/file.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_FILE -#define BUILD2_FILE +#ifndef BUILD2_FILE_HXX +#define BUILD2_FILE_HXX #include <map> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/scope> -#include <build2/variable> // list_value +#include <build2/scope.hxx> +#include <build2/variable.hxx> // list_value namespace build2 { @@ -184,4 +184,4 @@ namespace build2 #include <build2/file.ixx> -#endif // BUILD2_FILE +#endif // BUILD2_FILE_HXX diff --git a/build2/filesystem.cxx b/build2/filesystem.cxx index 86bdff8..9d9b3b6 100644 --- a/build2/filesystem.cxx +++ b/build2/filesystem.cxx @@ -2,9 +2,9 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/filesystem> +#include <build2/filesystem.hxx> -#include <build2/diagnostics> +#include <build2/diagnostics.hxx> using namespace std; using namespace butl; diff --git a/build2/filesystem b/build2/filesystem.hxx index bf0302e..f211f35 100644 --- a/build2/filesystem +++ b/build2/filesystem.hxx @@ -1,22 +1,22 @@ -// file : build2/filesystem -*- C++ -*- +// file : build2/filesystem.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_FILESYSTEM -#define BUILD2_FILESYSTEM +#ifndef BUILD2_FILESYSTEM_HXX +#define BUILD2_FILESYSTEM_HXX -#include <butl/filesystem> +#include <libbutl/filesystem.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -// Higher-level filesystem utilities built on top of <butl/filesystem>. +// Higher-level filesystem utilities built on top of <libbutl/filesystem.hxx>. // namespace build2 { // The dual interface wrapper for the {mk,rm}{file,dir}() functions // below that allows you to use it as a true/false return or a more - // detailed enum from <butl/filesystem> + // detailed enum from <libbutl/filesystem.hxx> // template <typename T> struct fs_status @@ -104,4 +104,4 @@ namespace build2 #include <build2/filesystem.txx> -#endif // BUILD2_FILESYSTEM +#endif // BUILD2_FILESYSTEM_HXX diff --git a/build2/filesystem.txx b/build2/filesystem.txx index 708c75e..83e3677 100644 --- a/build2/filesystem.txx +++ b/build2/filesystem.txx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/context> // work -#include <build2/diagnostics> +#include <build2/context.hxx> // work +#include <build2/diagnostics.hxx> namespace build2 { diff --git a/build2/function.cxx b/build2/function.cxx index eeb332f..9f2fb9c 100644 --- a/build2/function.cxx +++ b/build2/function.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/function> +#include <build2/function.hxx> #include <cstring> // strchr() diff --git a/build2/function b/build2/function.hxx index ef5d6bf..9abd4ef 100644 --- a/build2/function +++ b/build2/function.hxx @@ -1,19 +1,19 @@ -// file : build2/function -*- C++ -*- +// file : build2/function.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_FUNCTION -#define BUILD2_FUNCTION +#ifndef BUILD2_FUNCTION_HXX +#define BUILD2_FUNCTION_HXX #include <utility> // index_sequence #include <type_traits> // aligned_storage #include <unordered_map> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> namespace build2 { @@ -696,4 +696,4 @@ namespace build2 } } -#endif // BUILD2_FUNCTION +#endif // BUILD2_FUNCTION_HXX diff --git a/build2/functions-builtin.cxx b/build2/functions-builtin.cxx index 17ea125..81a190b 100644 --- a/build2/functions-builtin.cxx +++ b/build2/functions-builtin.cxx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/function> -#include <build2/variable> +#include <build2/function.hxx> +#include <build2/variable.hxx> using namespace std; diff --git a/build2/functions-path.cxx b/build2/functions-path.cxx index 8b88ba0..6fff94d 100644 --- a/build2/functions-path.cxx +++ b/build2/functions-path.cxx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/function> -#include <build2/variable> +#include <build2/function.hxx> +#include <build2/variable.hxx> using namespace std; diff --git a/build2/functions-process-path.cxx b/build2/functions-process-path.cxx index 17b6da3..1b7459b 100644 --- a/build2/functions-process-path.cxx +++ b/build2/functions-process-path.cxx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/function> -#include <build2/variable> +#include <build2/function.hxx> +#include <build2/variable.hxx> using namespace std; diff --git a/build2/functions-string.cxx b/build2/functions-string.cxx index 0f28526..2faad06 100644 --- a/build2/functions-string.cxx +++ b/build2/functions-string.cxx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/function> -#include <build2/variable> +#include <build2/function.hxx> +#include <build2/variable.hxx> using namespace std; diff --git a/build2/functions-target-triplet.cxx b/build2/functions-target-triplet.cxx index fb95331..0cb6846 100644 --- a/build2/functions-target-triplet.cxx +++ b/build2/functions-target-triplet.cxx @@ -2,8 +2,8 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/function> -#include <build2/variable> +#include <build2/function.hxx> +#include <build2/variable.hxx> using namespace std; diff --git a/build2/install/init.cxx b/build2/install/init.cxx index 0966d82..6a5114d 100644 --- a/build2/install/init.cxx +++ b/build2/install/init.cxx @@ -2,19 +2,19 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/install/init> +#include <build2/install/init.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/rule> -#include <build2/operation> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/rule.hxx> +#include <build2/operation.hxx> +#include <build2/diagnostics.hxx> -#include <build2/config/utility> +#include <build2/config/utility.hxx> -#include <build2/install/rule> -#include <build2/install/utility> -#include <build2/install/operation> +#include <build2/install/rule.hxx> +#include <build2/install/utility.hxx> +#include <build2/install/operation.hxx> using namespace std; using namespace butl; diff --git a/build2/install/init b/build2/install/init.hxx index 9a16111..98b4205 100644 --- a/build2/install/init +++ b/build2/install/init.hxx @@ -1,14 +1,14 @@ -// file : build2/install/init -*- C++ -*- +// file : build2/install/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_INSTALL_INIT -#define BUILD2_INSTALL_INIT +#ifndef BUILD2_INSTALL_INIT_HXX +#define BUILD2_INSTALL_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -28,4 +28,4 @@ namespace build2 } } -#endif // BUILD2_INSTALL_INIT +#endif // BUILD2_INSTALL_INIT_HXX diff --git a/build2/install/operation b/build2/install/operation deleted file mode 100644 index 02d406e..0000000 --- a/build2/install/operation +++ /dev/null @@ -1,22 +0,0 @@ -// file : build2/install/operation -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BUILD2_INSTALL_OPERATION -#define BUILD2_INSTALL_OPERATION - -#include <build2/types> -#include <build2/utility> - -#include <build2/operation> - -namespace build2 -{ - namespace install - { - extern const operation_info install; - extern const operation_info uninstall; - } -} - -#endif // BUILD2_INSTALL_OPERATION diff --git a/build2/install/operation.cxx b/build2/install/operation.cxx index 44d257f..5405c63 100644 --- a/build2/install/operation.cxx +++ b/build2/install/operation.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/install/operation> +#include <build2/install/operation.hxx> using namespace std; using namespace butl; diff --git a/build2/install/operation.hxx b/build2/install/operation.hxx new file mode 100644 index 0000000..1529621 --- /dev/null +++ b/build2/install/operation.hxx @@ -0,0 +1,22 @@ +// file : build2/install/operation.hxx -*- C++ -*- +// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef BUILD2_INSTALL_OPERATION_HXX +#define BUILD2_INSTALL_OPERATION_HXX + +#include <build2/types.hxx> +#include <build2/utility.hxx> + +#include <build2/operation.hxx> + +namespace build2 +{ + namespace install + { + extern const operation_info install; + extern const operation_info uninstall; + } +} + +#endif // BUILD2_INSTALL_OPERATION_HXX diff --git a/build2/install/rule.cxx b/build2/install/rule.cxx index 9f668f9..3a56480 100644 --- a/build2/install/rule.cxx +++ b/build2/install/rule.cxx @@ -2,15 +2,15 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/install/rule> +#include <build2/install/rule.hxx> -#include <butl/filesystem> // dir_exists(), file_exists() +#include <libbutl/filesystem.hxx> // dir_exists(), file_exists() -#include <build2/scope> -#include <build2/target> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> using namespace std; using namespace butl; diff --git a/build2/install/rule b/build2/install/rule.hxx index c923db9..76259c9 100644 --- a/build2/install/rule +++ b/build2/install/rule.hxx @@ -1,16 +1,16 @@ -// file : build2/install/rule -*- C++ -*- +// file : build2/install/rule.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_INSTALL_RULE -#define BUILD2_INSTALL_RULE +#ifndef BUILD2_INSTALL_RULE_HXX +#define BUILD2_INSTALL_RULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> -#include <build2/target> -#include <build2/operation> +#include <build2/rule.hxx> +#include <build2/target.hxx> +#include <build2/operation.hxx> namespace build2 { @@ -98,4 +98,4 @@ namespace build2 } } -#endif // BUILD2_INSTALL_RULE +#endif // BUILD2_INSTALL_RULE_HXX diff --git a/build2/install/utility b/build2/install/utility.hxx index 239447e..dfd1915 100644 --- a/build2/install/utility +++ b/build2/install/utility.hxx @@ -1,14 +1,14 @@ -// file : build2/install/utility -*- C++ -*- +// file : build2/install/utility.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_INSTALL_UTILITY -#define BUILD2_INSTALL_UTILITY +#ifndef BUILD2_INSTALL_UTILITY_HXX +#define BUILD2_INSTALL_UTILITY_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/scope> +#include <build2/scope.hxx> namespace build2 { @@ -54,4 +54,4 @@ namespace build2 } } -#endif // BUILD2_INSTALL_UTILITY +#endif // BUILD2_INSTALL_UTILITY_HXX diff --git a/build2/lexer.cxx b/build2/lexer.cxx index e117f28..09064d2 100644 --- a/build2/lexer.cxx +++ b/build2/lexer.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/lexer> +#include <build2/lexer.hxx> #include <cstring> // strchr() diff --git a/build2/lexer b/build2/lexer.hxx index 76308e4..e91e730 100644 --- a/build2/lexer +++ b/build2/lexer.hxx @@ -1,19 +1,19 @@ -// file : build2/lexer -*- C++ -*- +// file : build2/lexer.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_LEXER -#define BUILD2_LEXER +#ifndef BUILD2_LEXER_HXX +#define BUILD2_LEXER_HXX #include <stack> -#include <butl/char-scanner> +#include <libbutl/char-scanner.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/token> -#include <build2/diagnostics> +#include <build2/token.hxx> +#include <build2/diagnostics.hxx> namespace build2 { @@ -192,4 +192,4 @@ namespace butl // ADL } } -#endif // BUILD2_LEXER +#endif // BUILD2_LEXER_HXX diff --git a/build2/module.cxx b/build2/module.cxx index 6fc33fa..f1e7dd3 100644 --- a/build2/module.cxx +++ b/build2/module.cxx @@ -2,11 +2,11 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/module> +#include <build2/module.hxx> -#include <build2/scope> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/build2/module b/build2/module.hxx index 7c4672f..e3ab94f 100644 --- a/build2/module +++ b/build2/module.hxx @@ -1,17 +1,17 @@ -// file : build2/module -*- C++ -*- +// file : build2/module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_MODULE -#define BUILD2_MODULE +#ifndef BUILD2_MODULE_HXX +#define BUILD2_MODULE_HXX #include <map> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> namespace build2 { @@ -111,4 +111,4 @@ namespace build2 extern available_module_map builtin_modules; } -#endif // BUILD2_MODULE +#endif // BUILD2_MODULE_HXX diff --git a/build2/name.cxx b/build2/name.cxx index 0b3d00f..27733af 100644 --- a/build2/name.cxx +++ b/build2/name.cxx @@ -2,13 +2,13 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/types> // Note: not <build2/names> +#include <build2/types.hxx> // Note: not <build2/names> #include <string.h> // strchr() #include <sstream> -#include <build2/diagnostics> +#include <build2/diagnostics.hxx> namespace build2 { diff --git a/build2/name b/build2/name.hxx index ccceebe..c341cc9 100644 --- a/build2/name +++ b/build2/name.hxx @@ -1,14 +1,14 @@ -// file : build2/name -*- C++ -*- +// file : build2/name.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -// Note: include <build2/types> instead of this file directly. +// Note: include <build2/types.hxx> instead of this file directly. // -#ifndef BUILD2_NAME -#define BUILD2_NAME +#ifndef BUILD2_NAME_HXX +#define BUILD2_NAME_HXX -// We cannot include <build2/utility> since it includes <build2/types>. +// We cannot include <build2/utility.hxx> since it includes <build2/types>. // #include <utility> // move() @@ -155,4 +155,4 @@ namespace build2 #include <build2/name.ixx> -#endif // BUILD2_NAME +#endif // BUILD2_NAME_HXX diff --git a/build2/operation.cxx b/build2/operation.cxx index 2099ec6..7dea25b 100644 --- a/build2/operation.cxx +++ b/build2/operation.cxx @@ -2,14 +2,14 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/operation> - -#include <build2/file> -#include <build2/dump> -#include <build2/scope> -#include <build2/target> -#include <build2/algorithm> -#include <build2/diagnostics> +#include <build2/operation.hxx> + +#include <build2/file.hxx> +#include <build2/dump.hxx> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/algorithm.hxx> +#include <build2/diagnostics.hxx> using namespace std; using namespace butl; diff --git a/build2/operation b/build2/operation.hxx index 3558c0b..08bcccf 100644 --- a/build2/operation +++ b/build2/operation.hxx @@ -1,16 +1,16 @@ -// file : build2/operation -*- C++ -*- +// file : build2/operation.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_OPERATION -#define BUILD2_OPERATION +#ifndef BUILD2_OPERATION_HXX +#define BUILD2_OPERATION_HXX -#include <butl/string-table> +#include <libbutl/string-table.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/variable> +#include <build2/variable.hxx> namespace build2 { @@ -432,4 +432,4 @@ namespace butl }; } -#endif // BUILD2_OPERATION +#endif // BUILD2_OPERATION_HXX diff --git a/build2/parser.cxx b/build2/parser.cxx index 9dbce3b..71e742c 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -2,21 +2,21 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/parser> +#include <build2/parser.hxx> #include <iostream> // cout -#include <butl/filesystem> // path_search(), path_match() - -#include <build2/file> -#include <build2/scope> -#include <build2/module> -#include <build2/target> -#include <build2/context> -#include <build2/function> -#include <build2/variable> -#include <build2/diagnostics> -#include <build2/prerequisite> +#include <libbutl/filesystem.hxx> // path_search(), path_match() + +#include <build2/file.hxx> +#include <build2/scope.hxx> +#include <build2/module.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/function.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> +#include <build2/prerequisite.hxx> using namespace std; diff --git a/build2/parser b/build2/parser.hxx index 16b7782..85da4e5 100644 --- a/build2/parser +++ b/build2/parser.hxx @@ -1,20 +1,20 @@ -// file : build2/parser -*- C++ -*- +// file : build2/parser.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_PARSER -#define BUILD2_PARSER +#ifndef BUILD2_PARSER_HXX +#define BUILD2_PARSER_HXX #include <stack> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/spec> -#include <build2/lexer> -#include <build2/token> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/spec.hxx> +#include <build2/lexer.hxx> +#include <build2/token.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> namespace build2 { @@ -590,4 +590,4 @@ namespace build2 }; } -#endif // BUILD2_PARSER +#endif // BUILD2_PARSER_HXX diff --git a/build2/pkgconfig/init.cxx b/build2/pkgconfig/init.cxx index 352e845..fa22421 100644 --- a/build2/pkgconfig/init.cxx +++ b/build2/pkgconfig/init.cxx @@ -2,14 +2,14 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/pkgconfig/init> +#include <build2/pkgconfig/init.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> -#include <build2/config/utility> +#include <build2/config/utility.hxx> using namespace std; using namespace butl; diff --git a/build2/pkgconfig/init b/build2/pkgconfig/init.hxx index 5dac923..eed224f 100644 --- a/build2/pkgconfig/init +++ b/build2/pkgconfig/init.hxx @@ -1,14 +1,14 @@ -// file : build2/pkgconfig/init -*- C++ -*- +// file : build2/pkgconfig/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_PKGCONFIG_INIT -#define BUILD2_PKGCONFIG_INIT +#ifndef BUILD2_PKGCONFIG_INIT_HXX +#define BUILD2_PKGCONFIG_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -34,4 +34,4 @@ namespace build2 } } -#endif // BUILD2_PKGCONFIG_INIT +#endif // BUILD2_PKGCONFIG_INIT_HXX diff --git a/build2/prerequisite.cxx b/build2/prerequisite.cxx index b1f3cb2..7facbaa 100644 --- a/build2/prerequisite.cxx +++ b/build2/prerequisite.cxx @@ -2,12 +2,12 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/prerequisite> +#include <build2/prerequisite.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/build2/prerequisite b/build2/prerequisite.hxx index e3b78a2..77d96bf 100644 --- a/build2/prerequisite +++ b/build2/prerequisite.hxx @@ -1,17 +1,17 @@ -// file : build2/prerequisite -*- C++ -*- +// file : build2/prerequisite.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_PREREQUISITE -#define BUILD2_PREREQUISITE +#ifndef BUILD2_PREREQUISITE_HXX +#define BUILD2_PREREQUISITE_HXX #include <unordered_set> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target-key> -#include <build2/diagnostics> +#include <build2/target-key.hxx> +#include <build2/diagnostics.hxx> namespace build2 { @@ -163,4 +163,4 @@ namespace build2 using prerequisites = vector<prerequisite>; } -#endif // BUILD2_PREREQUISITE +#endif // BUILD2_PREREQUISITE_HXX diff --git a/build2/regex.cxx b/build2/regex.cxx index 40347b5..d96b860 100644 --- a/build2/regex.cxx +++ b/build2/regex.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/regex> +#include <build2/regex.hxx> #if defined(_MSC_VER) && _MSC_VER <= 1910 # include <cstring> // strstr() diff --git a/build2/regex b/build2/regex.hxx index dc6dc96..1fa261b 100644 --- a/build2/regex +++ b/build2/regex.hxx @@ -1,16 +1,16 @@ -// file : build2/regex -*- C++ -*- +// file : build2/regex.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_REGEX -#define BUILD2_REGEX +#ifndef BUILD2_REGEX_HXX +#define BUILD2_REGEX_HXX #include <regex> #include <iosfwd> #include <string> // basic_string -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -54,4 +54,4 @@ namespace std #include <build2/regex.txx> -#endif // BUILD2_REGEX +#endif // BUILD2_REGEX_HXX diff --git a/build2/rule-map b/build2/rule-map.hxx index 9fb4056..4afe3d4 100644 --- a/build2/rule-map +++ b/build2/rule-map.hxx @@ -1,18 +1,18 @@ -// file : build2/rule-map -*- C++ -*- +// file : build2/rule-map.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_RULE_MAP -#define BUILD2_RULE_MAP +#ifndef BUILD2_RULE_MAP_HXX +#define BUILD2_RULE_MAP_HXX #include <map> -#include <butl/prefix-map> +#include <libbutl/prefix-map.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/operation> +#include <build2/operation.hxx> namespace build2 { @@ -118,4 +118,4 @@ namespace build2 }; } -#endif // BUILD2_RULE_MAP +#endif // BUILD2_RULE_MAP_HXX diff --git a/build2/rule.cxx b/build2/rule.cxx index 53f723b..a462e58 100644 --- a/build2/rule.cxx +++ b/build2/rule.cxx @@ -2,14 +2,14 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/rule> - -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/rule.hxx> + +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> using namespace std; using namespace butl; diff --git a/build2/rule b/build2/rule.hxx index d434d0d..f6e23f6 100644 --- a/build2/rule +++ b/build2/rule.hxx @@ -1,15 +1,15 @@ -// file : build2/rule -*- C++ -*- +// file : build2/rule.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_RULE -#define BUILD2_RULE +#ifndef BUILD2_RULE_HXX +#define BUILD2_RULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> -#include <build2/operation> +#include <build2/target.hxx> +#include <build2/operation.hxx> namespace build2 { @@ -137,4 +137,4 @@ namespace build2 }; } -#endif // BUILD2_RULE +#endif // BUILD2_RULE_HXX diff --git a/build2/scheduler.cxx b/build2/scheduler.cxx index a453cb3..fdf4121 100644 --- a/build2/scheduler.cxx +++ b/build2/scheduler.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/scheduler> +#include <build2/scheduler.hxx> #include <cerrno> diff --git a/build2/scheduler b/build2/scheduler.hxx index c6f4f7f..ad14c56 100644 --- a/build2/scheduler +++ b/build2/scheduler.hxx @@ -1,9 +1,9 @@ -// file : build2/scheduler -*- C++ -*- +// file : build2/scheduler.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_SCHEDULER -#define BUILD2_SCHEDULER +#ifndef BUILD2_SCHEDULER_HXX +#define BUILD2_SCHEDULER_HXX #include <list> #include <mutex> @@ -12,8 +12,8 @@ #include <type_traits> // aligned_storage, etc #include <condition_variable> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -590,4 +590,4 @@ namespace build2 #include <build2/scheduler.txx> -#endif // BUILD2_SCHEDULER +#endif // BUILD2_SCHEDULER_HXX diff --git a/build2/scope.cxx b/build2/scope.cxx index 59b2ee2..1cbb815 100644 --- a/build2/scope.cxx +++ b/build2/scope.cxx @@ -2,10 +2,10 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/scope> +#include <build2/scope.hxx> -#include <build2/target> -#include <build2/context> +#include <build2/target.hxx> +#include <build2/context.hxx> using namespace std; diff --git a/build2/scope b/build2/scope.hxx index 1ce28fc..2be2b3a 100644 --- a/build2/scope +++ b/build2/scope.hxx @@ -1,24 +1,24 @@ -// file : build2/scope -*- C++ -*- +// file : build2/scope.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_SCOPE -#define BUILD2_SCOPE +#ifndef BUILD2_SCOPE_HXX +#define BUILD2_SCOPE_HXX #include <unordered_set> #include <unordered_map> -#include <butl/path-map> +#include <libbutl/path-map.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> -#include <build2/variable> -#include <build2/target-key> -#include <build2/target-type> -#include <build2/rule-map> -#include <build2/operation> +#include <build2/module.hxx> +#include <build2/variable.hxx> +#include <build2/target-key.hxx> +#include <build2/target-type.hxx> +#include <build2/rule-map.hxx> +#include <build2/operation.hxx> namespace build2 { @@ -268,7 +268,7 @@ namespace build2 friend class scope_map; friend class temp_scope; - // These two from <build2/file> set strong_. + // These two from <build2/file.hxx> set strong_. // friend void create_bootstrap_outer (scope&); friend scope& create_bootstrap_inner (scope&, const dir_path&); @@ -372,4 +372,4 @@ namespace build2 #include <build2/scope.ixx> -#endif // BUILD2_SCOPE +#endif // BUILD2_SCOPE_HXX diff --git a/build2/search.cxx b/build2/search.cxx index f7864e9..6be62b2 100644 --- a/build2/search.cxx +++ b/build2/search.cxx @@ -2,15 +2,15 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/search> +#include <build2/search.hxx> -#include <butl/filesystem> // file_mtime() +#include <libbutl/filesystem.hxx> // file_mtime() -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/prerequisite> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/prerequisite.hxx> +#include <build2/diagnostics.hxx> using namespace std; using namespace butl; diff --git a/build2/search b/build2/search.hxx index 92521bc..043a216 100644 --- a/build2/search +++ b/build2/search.hxx @@ -1,12 +1,12 @@ -// file : build2/search -*- C++ -*- +// file : build2/search.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_SEARCH -#define BUILD2_SEARCH +#ifndef BUILD2_SEARCH_HXX +#define BUILD2_SEARCH_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -33,4 +33,4 @@ namespace build2 create_new_target (const prerequisite_key&); } -#endif // BUILD2_SEARCH +#endif // BUILD2_SEARCH_HXX diff --git a/build2/spec.cxx b/build2/spec.cxx index c6f386c..da581c8 100644 --- a/build2/spec.cxx +++ b/build2/spec.cxx @@ -2,10 +2,10 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/spec> +#include <build2/spec.hxx> -#include <build2/context> -#include <build2/diagnostics> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/build2/spec b/build2/spec.hxx index 3ec4689..2af74db 100644 --- a/build2/spec +++ b/build2/spec.hxx @@ -1,14 +1,14 @@ -// file : build2/spec -*- C++ -*- +// file : build2/spec.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_SPEC -#define BUILD2_SPEC +#ifndef BUILD2_SPEC_HXX +#define BUILD2_SPEC_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/variable> +#include <build2/variable.hxx> namespace build2 { @@ -66,4 +66,4 @@ namespace build2 operator<< (ostream&, const buildspec&); } -#endif // BUILD2_SPEC +#endif // BUILD2_SPEC_HXX diff --git a/build2/target-key b/build2/target-key.hxx index 084885f..0c93580 100644 --- a/build2/target-key +++ b/build2/target-key.hxx @@ -1,18 +1,18 @@ -// file : build2/target-key -*- C++ -*- +// file : build2/target-key.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TARGET_KEY -#define BUILD2_TARGET_KEY +#ifndef BUILD2_TARGET_KEY_HXX +#define BUILD2_TARGET_KEY_HXX #include <map> -#include <butl/utility> // compare_c_string +#include <libbutl/utility.hxx> // compare_c_string -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target-type> +#include <build2/target-type.hxx> namespace build2 { @@ -93,4 +93,4 @@ namespace std }; } -#endif // BUILD2_TARGET_KEY +#endif // BUILD2_TARGET_KEY_HXX diff --git a/build2/target-type b/build2/target-type.hxx index aa2d7cb..0b8ee54 100644 --- a/build2/target-type +++ b/build2/target-type.hxx @@ -1,14 +1,14 @@ -// file : build2/target-type -*- C++ -*- +// file : build2/target-type.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TARGET_TYPE -#define BUILD2_TARGET_TYPE +#ifndef BUILD2_TARGET_TYPE_HXX +#define BUILD2_TARGET_TYPE_HXX #include <map> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -135,4 +135,4 @@ namespace build2 }; } -#endif // BUILD2_TARGET_TYPE +#endif // BUILD2_TARGET_TYPE_HXX diff --git a/build2/target.cxx b/build2/target.cxx index f7500f7..1b6757c 100644 --- a/build2/target.cxx +++ b/build2/target.cxx @@ -2,16 +2,16 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/target> +#include <build2/target.hxx> -#include <butl/filesystem> // file_mtime() +#include <libbutl/filesystem.hxx> // file_mtime() -#include <build2/file> -#include <build2/scope> -#include <build2/search> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/file.hxx> +#include <build2/scope.hxx> +#include <build2/search.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> using namespace std; using namespace butl; diff --git a/build2/target b/build2/target.hxx index 4838dfb..884b185 100644 --- a/build2/target +++ b/build2/target.hxx @@ -1,25 +1,25 @@ -// file : build2/target -*- C++ -*- +// file : build2/target.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TARGET -#define BUILD2_TARGET +#ifndef BUILD2_TARGET_HXX +#define BUILD2_TARGET_HXX #include <iterator> // tags, etc. #include <type_traits> // aligned_storage #include <unordered_map> -#include <butl/multi-index> // map_iterator_adapter +#include <libbutl/multi-index.hxx> // map_iterator_adapter -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/scope> -#include <build2/variable> -#include <build2/operation> -#include <build2/target-type> -#include <build2/target-key> -#include <build2/prerequisite> +#include <build2/scope.hxx> +#include <build2/variable.hxx> +#include <build2/operation.hxx> +#include <build2/target-type.hxx> +#include <build2/target-key.hxx> +#include <build2/prerequisite.hxx> namespace build2 { @@ -30,7 +30,7 @@ namespace build2 extern size_t current_on; // From <build/context>. const target& - search (const target&, const prerequisite&); // From <build2/algorithm>. + search (const target&, const prerequisite&); // From <build2/algorithm.hxx>. // Target state. // @@ -90,8 +90,8 @@ namespace build2 // all the prerequisites in a loop, skipping ignored. Specifically, // for actions with the "first" execution mode, it calls // execute_prerequisites() while for those with the "last" mode -- - // reverse_execute_prerequisites(); see <build2/operation>, - // <build2/algorithm> for details. The group recipe call's the group's + // reverse_execute_prerequisites(); see <build2/operation.hxx>, + // <build2/algorithm.hxx> for details. The group recipe call's the group's // recipe. // extern const recipe empty_recipe; @@ -100,10 +100,10 @@ namespace build2 extern const recipe group_recipe; target_state - noop_action (action, const target&); // Defined in <build2/algorithm>. + noop_action (action, const target&); // Defined in <build2/algorithm.hxx>. target_state - group_action (action, const target&); // Defined in <build2/algorithm>. + group_action (action, const target&); // Defined in <build2/algorithm.hxx>. // A view of target group members. // @@ -249,7 +249,7 @@ namespace build2 using action_type = build2::action; // You should not call this function directly; rather use - // resolve_group_members() from <build2/algorithm>. + // resolve_group_members() from <build2/algorithm.hxx>. // virtual group_view group_members (action_type) const; @@ -1716,4 +1716,4 @@ namespace build2 #include <build2/target.ixx> #include <build2/target.txx> -#endif // BUILD2_TARGET +#endif // BUILD2_TARGET_HXX diff --git a/build2/target.ixx b/build2/target.ixx index eb7dbaa..6a754d6 100644 --- a/build2/target.ixx +++ b/build2/target.ixx @@ -197,7 +197,7 @@ namespace build2 // prerequisite_members // group_view - resolve_group_members (action, const target&); // <build2/algorithm> + resolve_group_members (action, const target&); // <build2/algorithm.hxx> template <typename T> inline auto prerequisite_members_range<T>::iterator:: diff --git a/build2/target.txx b/build2/target.txx index 5abdfc5..d2afd59 100644 --- a/build2/target.txx +++ b/build2/target.txx @@ -2,11 +2,11 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <butl/filesystem> // dir_iterator +#include <libbutl/filesystem.hxx> // dir_iterator -#include <build2/scope> -#include <build2/diagnostics> -#include <build2/prerequisite> +#include <build2/scope.hxx> +#include <build2/diagnostics.hxx> +#include <build2/prerequisite.hxx> namespace build2 { diff --git a/build2/test/common.cxx b/build2/test/common.cxx index be0e690..8197d5d 100644 --- a/build2/test/common.cxx +++ b/build2/test/common.cxx @@ -2,10 +2,10 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/common> +#include <build2/test/common.hxx> -#include <build2/target> -#include <build2/algorithm> +#include <build2/target.hxx> +#include <build2/algorithm.hxx> using namespace std; diff --git a/build2/test/common b/build2/test/common.hxx index 1a3117a..89b7581 100644 --- a/build2/test/common +++ b/build2/test/common.hxx @@ -1,14 +1,14 @@ -// file : build2/test/common -*- C++ -*- +// file : build2/test/common.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_COMMON -#define BUILD2_TEST_COMMON +#ifndef BUILD2_TEST_COMMON_HXX +#define BUILD2_TEST_COMMON_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> +#include <build2/target.hxx> namespace build2 { @@ -49,4 +49,4 @@ namespace build2 } } -#endif // BUILD2_TEST_COMMON +#endif // BUILD2_TEST_COMMON_HXX diff --git a/build2/test/init.cxx b/build2/test/init.cxx index a367206..93ca1e4 100644 --- a/build2/test/init.cxx +++ b/build2/test/init.cxx @@ -2,18 +2,18 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/init> +#include <build2/test/init.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/rule> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/rule.hxx> +#include <build2/diagnostics.hxx> -#include <build2/config/utility> +#include <build2/config/utility.hxx> -#include <build2/test/module> -#include <build2/test/target> -#include <build2/test/operation> +#include <build2/test/module.hxx> +#include <build2/test/target.hxx> +#include <build2/test/operation.hxx> using namespace std; using namespace butl; diff --git a/build2/test/init b/build2/test/init.hxx index 45aa547..2ba6ec6 100644 --- a/build2/test/init +++ b/build2/test/init.hxx @@ -1,14 +1,14 @@ -// file : build2/test/init -*- C++ -*- +// file : build2/test/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_INIT -#define BUILD2_TEST_INIT +#ifndef BUILD2_TEST_INIT_HXX +#define BUILD2_TEST_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -28,4 +28,4 @@ namespace build2 } } -#endif // BUILD2_TEST_INIT +#endif // BUILD2_TEST_INIT_HXX diff --git a/build2/test/module b/build2/test/module deleted file mode 100644 index 49b3031..0000000 --- a/build2/test/module +++ /dev/null @@ -1,26 +0,0 @@ -// file : build2/test/module -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BUILD2_TEST_MODULE -#define BUILD2_TEST_MODULE - -#include <build2/types> -#include <build2/utility> - -#include <build2/module> - -#include <build2/test/rule> -#include <build2/test/common> - -namespace build2 -{ - namespace test - { - struct module: module_base, virtual common, rule, alias_rule - { - }; - } -} - -#endif // BUILD2_TEST_MODULE diff --git a/build2/test/module.hxx b/build2/test/module.hxx new file mode 100644 index 0000000..3c9539f --- /dev/null +++ b/build2/test/module.hxx @@ -0,0 +1,26 @@ +// file : build2/test/module.hxx -*- C++ -*- +// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef BUILD2_TEST_MODULE_HXX +#define BUILD2_TEST_MODULE_HXX + +#include <build2/types.hxx> +#include <build2/utility.hxx> + +#include <build2/module.hxx> + +#include <build2/test/rule.hxx> +#include <build2/test/common.hxx> + +namespace build2 +{ + namespace test + { + struct module: module_base, virtual common, rule, alias_rule + { + }; + } +} + +#endif // BUILD2_TEST_MODULE_HXX diff --git a/build2/test/operation b/build2/test/operation deleted file mode 100644 index 5d2a229..0000000 --- a/build2/test/operation +++ /dev/null @@ -1,21 +0,0 @@ -// file : build2/test/operation -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BUILD2_TEST_OPERATION -#define BUILD2_TEST_OPERATION - -#include <build2/types> -#include <build2/utility> - -#include <build2/operation> - -namespace build2 -{ - namespace test - { - extern const operation_info test; - } -} - -#endif // BUILD2_TEST_OPERATION diff --git a/build2/test/operation.cxx b/build2/test/operation.cxx index 1f59fc1..46b9366 100644 --- a/build2/test/operation.cxx +++ b/build2/test/operation.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/operation> +#include <build2/test/operation.hxx> using namespace std; using namespace butl; diff --git a/build2/test/operation.hxx b/build2/test/operation.hxx new file mode 100644 index 0000000..d834edf --- /dev/null +++ b/build2/test/operation.hxx @@ -0,0 +1,21 @@ +// file : build2/test/operation.hxx -*- C++ -*- +// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef BUILD2_TEST_OPERATION_HXX +#define BUILD2_TEST_OPERATION_HXX + +#include <build2/types.hxx> +#include <build2/utility.hxx> + +#include <build2/operation.hxx> + +namespace build2 +{ + namespace test + { + extern const operation_info test; + } +} + +#endif // BUILD2_TEST_OPERATION_HXX diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx index 64292fc..db4083e 100644 --- a/build2/test/rule.cxx +++ b/build2/test/rule.cxx @@ -2,19 +2,19 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/rule> +#include <build2/test/rule.hxx> -#include <build2/scope> -#include <build2/target> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> -#include <build2/test/target> +#include <build2/test/target.hxx> -#include <build2/test/script/parser> -#include <build2/test/script/runner> -#include <build2/test/script/script> +#include <build2/test/script/parser.hxx> +#include <build2/test/script/runner.hxx> +#include <build2/test/script/script.hxx> using namespace std; using namespace butl; diff --git a/build2/test/rule b/build2/test/rule.hxx index 7de2e24..819121c 100644 --- a/build2/test/rule +++ b/build2/test/rule.hxx @@ -1,17 +1,17 @@ -// file : build2/test/rule -*- C++ -*- +// file : build2/test/rule.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_RULE -#define BUILD2_TEST_RULE +#ifndef BUILD2_TEST_RULE_HXX +#define BUILD2_TEST_RULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> -#include <build2/operation> +#include <build2/rule.hxx> +#include <build2/operation.hxx> -#include <build2/test/common> +#include <build2/test/common.hxx> namespace build2 { @@ -49,4 +49,4 @@ namespace build2 } } -#endif // BUILD2_TEST_RULE +#endif // BUILD2_TEST_RULE_HXX diff --git a/build2/test/script/builtin.cxx b/build2/test/script/builtin.cxx index a2f3107..d45b200 100644 --- a/build2/test/script/builtin.cxx +++ b/build2/test/script/builtin.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/script/builtin> +#include <build2/test/script/builtin.hxx> #ifndef _WIN32 # include <utime.h> @@ -14,13 +14,13 @@ #include <ostream> #include <sstream> -#include <butl/path-io> // use default operator<< implementation -#include <butl/fdstream> // fdopen_mode, fdstream_mode -#include <butl/filesystem> // mkdir_status +#include <libbutl/path-io.hxx> // use default operator<< implementation +#include <libbutl/fdstream.hxx> // fdopen_mode, fdstream_mode +#include <libbutl/filesystem.hxx> // mkdir_status -#include <build2/regex> +#include <build2/regex.hxx> -#include <build2/test/script/script> +#include <build2/test/script/script.hxx> // Strictly speaking a builtin which reads/writes from/to standard streams // must be asynchronous so that the caller can communicate with it through diff --git a/build2/test/script/builtin b/build2/test/script/builtin.hxx index 7d902ea..ae0681f 100644 --- a/build2/test/script/builtin +++ b/build2/test/script/builtin.hxx @@ -1,14 +1,14 @@ -// file : build2/test/script/builtin -*- C++ -*- +// file : build2/test/script/builtin.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_SCRIPT_BUILTIN -#define BUILD2_TEST_SCRIPT_BUILTIN +#ifndef BUILD2_TEST_SCRIPT_BUILTIN_HXX +#define BUILD2_TEST_SCRIPT_BUILTIN_HXX #include <map> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -72,4 +72,4 @@ namespace build2 } } -#endif // BUILD2_TEST_SCRIPT_BUILTIN +#endif // BUILD2_TEST_SCRIPT_BUILTIN_HXX diff --git a/build2/test/script/lexer.cxx b/build2/test/script/lexer.cxx index fab5cc2..4d139ce 100644 --- a/build2/test/script/lexer.cxx +++ b/build2/test/script/lexer.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/script/lexer> +#include <build2/test/script/lexer.hxx> #include <cstring> // strchr() diff --git a/build2/test/script/lexer b/build2/test/script/lexer.hxx index 4851e13..a262764 100644 --- a/build2/test/script/lexer +++ b/build2/test/script/lexer.hxx @@ -1,16 +1,16 @@ -// file : build2/test/script/lexer -*- C++ -*- +// file : build2/test/script/lexer.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_SCRIPT_LEXER -#define BUILD2_TEST_SCRIPT_LEXER +#ifndef BUILD2_TEST_SCRIPT_LEXER_HXX +#define BUILD2_TEST_SCRIPT_LEXER_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/lexer> +#include <build2/lexer.hxx> -#include <build2/test/script/token> +#include <build2/test/script/token.hxx> namespace build2 { @@ -87,4 +87,4 @@ namespace build2 } } -#endif // BUILD2_TEST_SCRIPT_LEXER +#endif // BUILD2_TEST_SCRIPT_LEXER_HXX diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx index 350ca44..ae6bdbc 100644 --- a/build2/test/script/parser.cxx +++ b/build2/test/script/parser.cxx @@ -2,14 +2,14 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/script/parser> +#include <build2/test/script/parser.hxx> #include <sstream> -#include <build2/context> // sched, keep_going +#include <build2/context.hxx> // sched, keep_going -#include <build2/test/script/lexer> -#include <build2/test/script/runner> +#include <build2/test/script/lexer.hxx> +#include <build2/test/script/runner.hxx> using namespace std; diff --git a/build2/test/script/parser b/build2/test/script/parser.hxx index e018548..21ea61a 100644 --- a/build2/test/script/parser +++ b/build2/test/script/parser.hxx @@ -1,18 +1,18 @@ -// file : build2/test/script/parser -*- C++ -*- +// file : build2/test/script/parser.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_SCRIPT_PARSER -#define BUILD2_TEST_SCRIPT_PARSER +#ifndef BUILD2_TEST_SCRIPT_PARSER_HXX +#define BUILD2_TEST_SCRIPT_PARSER_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/parser> -#include <build2/diagnostics> +#include <build2/parser.hxx> +#include <build2/diagnostics.hxx> -#include <build2/test/script/token> -#include <build2/test/script/script> +#include <build2/test/script/token.hxx> +#include <build2/test/script/script.hxx> namespace build2 { @@ -242,4 +242,4 @@ namespace build2 } } -#endif // BUILD2_TEST_SCRIPT_PARSER +#endif // BUILD2_TEST_SCRIPT_PARSER_HXX diff --git a/build2/test/script/regex.cxx b/build2/test/script/regex.cxx index b77f8a5..bf38a62 100644 --- a/build2/test/script/regex.cxx +++ b/build2/test/script/regex.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/script/regex> +#include <build2/test/script/regex.hxx> #include <algorithm> // copy(), copy_backward() diff --git a/build2/test/script/regex b/build2/test/script/regex.hxx index 1170b99..d4f1cf5 100644 --- a/build2/test/script/regex +++ b/build2/test/script/regex.hxx @@ -1,9 +1,9 @@ -// file : build2/test/script/regex -*- C++ -*- +// file : build2/test/script/regex.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_SCRIPT_REGEX -#define BUILD2_TEST_SCRIPT_REGEX +#ifndef BUILD2_TEST_SCRIPT_REGEX_HXX +#define BUILD2_TEST_SCRIPT_REGEX_HXX #include <list> #include <regex> @@ -13,8 +13,8 @@ #include <type_traits> // make_unsigned, enable_if, is_* #include <unordered_set> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> namespace build2 { @@ -681,4 +681,4 @@ namespace build2 #include <build2/test/script/regex.ixx> -#endif // BUILD2_TEST_SCRIPT_REGEX +#endif // BUILD2_TEST_SCRIPT_REGEX_HXX diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index 105039a..ce32150 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -2,22 +2,22 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/script/runner> +#include <build2/test/script/runner.hxx> #include <set> #include <ios> // streamsize -#include <butl/fdstream> // fdopen_mode, fdnull(), fddup() +#include <libbutl/fdstream.hxx> // fdopen_mode, fdnull(), fddup() -#include <build2/regex> -#include <build2/variable> -#include <build2/filesystem> +#include <build2/regex.hxx> +#include <build2/variable.hxx> +#include <build2/filesystem.hxx> -#include <build2/test/common> +#include <build2/test/common.hxx> -#include <build2/test/script/regex> -#include <build2/test/script/parser> -#include <build2/test/script/builtin> +#include <build2/test/script/regex.hxx> +#include <build2/test/script/parser.hxx> +#include <build2/test/script/builtin.hxx> using namespace std; using namespace butl; diff --git a/build2/test/script/runner b/build2/test/script/runner.hxx index 566b9de..7833692 100644 --- a/build2/test/script/runner +++ b/build2/test/script/runner.hxx @@ -1,16 +1,16 @@ -// file : build2/test/script/runner -*- C++ -*- +// file : build2/test/script/runner.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_SCRIPT_RUNNER -#define BUILD2_TEST_SCRIPT_RUNNER +#ifndef BUILD2_TEST_SCRIPT_RUNNER_HXX +#define BUILD2_TEST_SCRIPT_RUNNER_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/diagnostics> // location +#include <build2/diagnostics.hxx> // location -#include <build2/test/script/script> +#include <build2/test/script/script.hxx> namespace build2 { @@ -87,4 +87,4 @@ namespace build2 } } -#endif // BUILD2_TEST_SCRIPT_RUNNER +#endif // BUILD2_TEST_SCRIPT_RUNNER_HXX diff --git a/build2/test/script/script.cxx b/build2/test/script/script.cxx index d4945fe..25f72af 100644 --- a/build2/test/script/script.cxx +++ b/build2/test/script/script.cxx @@ -2,13 +2,13 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/script/script> +#include <build2/test/script/script.hxx> #include <sstream> #include <algorithm> // find() -#include <build2/target> -#include <build2/algorithm> +#include <build2/target.hxx> +#include <build2/algorithm.hxx> using namespace std; diff --git a/build2/test/script/script b/build2/test/script/script.hxx index 9a54c71..4f6fdab 100644 --- a/build2/test/script/script +++ b/build2/test/script/script.hxx @@ -1,20 +1,20 @@ -// file : build2/test/script/script -*- C++ -*- +// file : build2/test/script/script.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_SCRIPT_SCRIPT -#define BUILD2_TEST_SCRIPT_SCRIPT +#ifndef BUILD2_TEST_SCRIPT_SCRIPT_HXX +#define BUILD2_TEST_SCRIPT_SCRIPT_HXX #include <set> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/variable> +#include <build2/variable.hxx> -#include <build2/test/target> +#include <build2/test/target.hxx> -#include <build2/test/script/token> // replay_tokens +#include <build2/test/script/token.hxx> // replay_tokens namespace build2 { @@ -549,4 +549,4 @@ namespace build2 #include <build2/test/script/script.ixx> -#endif // BUILD2_TEST_SCRIPT_SCRIPT +#endif // BUILD2_TEST_SCRIPT_SCRIPT_HXX diff --git a/build2/test/script/token.cxx b/build2/test/script/token.cxx index 3d3dc8e..42428c6 100644 --- a/build2/test/script/token.cxx +++ b/build2/test/script/token.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/script/token> +#include <build2/test/script/token.hxx> using namespace std; diff --git a/build2/test/script/token b/build2/test/script/token.hxx index 9d3e330..0e8a577 100644 --- a/build2/test/script/token +++ b/build2/test/script/token.hxx @@ -1,14 +1,14 @@ -// file : build2/test/script/token -*- C++ -*- +// file : build2/test/script/token.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_SCRIPT_TOKEN -#define BUILD2_TEST_SCRIPT_TOKEN +#ifndef BUILD2_TEST_SCRIPT_TOKEN_HXX +#define BUILD2_TEST_SCRIPT_TOKEN_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/token> +#include <build2/token.hxx> namespace build2 { @@ -62,4 +62,4 @@ namespace build2 } } -#endif // BUILD2_TEST_SCRIPT_TOKEN +#endif // BUILD2_TEST_SCRIPT_TOKEN_HXX diff --git a/build2/test/target.cxx b/build2/test/target.cxx index fd432fd..a85546c 100644 --- a/build2/test/target.cxx +++ b/build2/test/target.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/test/target> +#include <build2/test/target.hxx> using namespace std; using namespace butl; diff --git a/build2/test/target b/build2/test/target.hxx index 4cbd832..9eec146 100644 --- a/build2/test/target +++ b/build2/test/target.hxx @@ -1,14 +1,14 @@ -// file : build2/test/target -*- C++ -*- +// file : build2/test/target.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TEST_TARGET -#define BUILD2_TEST_TARGET +#ifndef BUILD2_TEST_TARGET_HXX +#define BUILD2_TEST_TARGET_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> +#include <build2/target.hxx> namespace build2 { @@ -26,4 +26,4 @@ namespace build2 } } -#endif // BUILD2_TEST_TARGET +#endif // BUILD2_TEST_TARGET_HXX diff --git a/build2/token.cxx b/build2/token.cxx index 6f2eae5..ec78901 100644 --- a/build2/token.cxx +++ b/build2/token.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/token> +#include <build2/token.hxx> using namespace std; diff --git a/build2/token b/build2/token.hxx index d58aebd..2a590d7 100644 --- a/build2/token +++ b/build2/token.hxx @@ -1,14 +1,14 @@ -// file : build2/token -*- C++ -*- +// file : build2/token.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TOKEN -#define BUILD2_TOKEN +#ifndef BUILD2_TOKEN_HXX +#define BUILD2_TOKEN_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/diagnostics> +#include <build2/diagnostics.hxx> namespace build2 { @@ -183,4 +183,4 @@ namespace build2 } } -#endif // BUILD2_TOKEN +#endif // BUILD2_TOKEN_HXX diff --git a/build2/types-parsers.cxx b/build2/types-parsers.cxx index bcbea63..4cc723c 100644 --- a/build2/types-parsers.cxx +++ b/build2/types-parsers.cxx @@ -2,9 +2,9 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/types-parsers> +#include <build2/types-parsers.hxx> -#include <build2/b-options> // build2::cl namespace +#include <build2/b-options.hxx> // build2::cl namespace namespace build2 { diff --git a/build2/types-parsers b/build2/types-parsers.hxx index a34c2ba..adbc5c3 100644 --- a/build2/types-parsers +++ b/build2/types-parsers.hxx @@ -1,14 +1,14 @@ -// file : build2/types-parsers -*- C++ -*- +// file : build2/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 BUILD2_TYPES_PARSERS -#define BUILD2_TYPES_PARSERS +#ifndef BUILD2_TYPES_PARSERS_HXX +#define BUILD2_TYPES_PARSERS_HXX -#include <build2/types> +#include <build2/types.hxx> namespace build2 { @@ -35,4 +35,4 @@ namespace build2 } } -#endif // BUILD2_TYPES_PARSERS +#endif // BUILD2_TYPES_PARSERS_HXX diff --git a/build2/types b/build2/types.hxx index c189f4d..8657ee6 100644 --- a/build2/types +++ b/build2/types.hxx @@ -1,9 +1,9 @@ -// file : build2/types -*- C++ -*- +// file : build2/types.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_TYPES -#define BUILD2_TYPES +#ifndef BUILD2_TYPES_HXX +#define BUILD2_TYPES_HXX #include <array> #include <tuple> @@ -23,7 +23,7 @@ #include <thread> #include <condition_variable> -#include <butl/ft/shared_mutex> +#include <libbutl/ft/shared_mutex.hxx> #if defined(__cpp_lib_shared_mutex) || defined(__cpp_lib_shared_timed_mutex) # include <shared_mutex> #endif @@ -33,17 +33,17 @@ #include <stdexcept> // logic_error, invalid_argument, runtime_error #include <system_error> -#include <butl/path> -#include <butl/sha256> -#include <butl/process> -#include <butl/fdstream> -#include <butl/optional> -#include <butl/const-ptr> -#include <butl/timestamp> -#include <butl/vector-view> -#include <butl/small-vector> -#include <butl/target-triplet> -#include <butl/standard-version> +#include <libbutl/path.hxx> +#include <libbutl/sha256.hxx> +#include <libbutl/process.hxx> +#include <libbutl/fdstream.hxx> +#include <libbutl/optional.hxx> +#include <libbutl/const-ptr.hxx> +#include <libbutl/timestamp.hxx> +#include <libbutl/vector-view.hxx> +#include <libbutl/small-vector.hxx> +#include <libbutl/target-triplet.hxx> +#include <libbutl/standard-version.hxx> namespace build2 { @@ -73,8 +73,8 @@ namespace build2 using std::array; using std::vector; - using butl::vector_view; // <butl/vector-view> - using butl::small_vector; // <butl/small-vector> + using butl::vector_view; // <libbutl/vector-view.hxx> + using butl::small_vector; // <libbutl/small-vector.hxx> using strings = vector<string>; using cstrings = vector<const char*>; @@ -142,16 +142,16 @@ namespace build2 using std::system_error; using io_error = std::ios_base::failure; - // <butl/optional> + // <libbutl/optional.hxx> // using butl::optional; using butl::nullopt; - // <butl/const-ptr> + // <libbutl/const-ptr.hxx> // using butl::const_ptr; - // <butl/path> + // <libbutl/path.hxx> // using butl::path; using butl::dir_path; @@ -181,7 +181,7 @@ namespace build2 using paths = std::vector<path>; using dir_paths = std::vector<dir_path>; - // <butl/timestamp> + // <libbutl/timestamp.hxx> // using butl::system_clock; using butl::timestamp; @@ -191,12 +191,12 @@ namespace build2 using butl::timestamp_nonexistent; using butl::operator<<; - // <butl/sha256> + // <libbutl/sha256.hxx> // using butl::sha256; - // <butl/process> - // <butl/fdstream> + // <libbutl/process.hxx> + // <libbutl/fdstream.hxx> // using butl::process; using butl::process_path; @@ -206,11 +206,11 @@ namespace build2 using butl::ifdstream; using butl::ofdstream; - // <butl/target-triplet> + // <libbutl/target-triplet.hxx> // using butl::target_triplet; - // <butl/standard-version> + // <libbutl/standard-version.hxx> // using butl::standard_version; using butl::standard_version_constraint; @@ -242,8 +242,8 @@ namespace std operator<< (ostream&, const ::butl::process_path&); } -// <build2/name> +// <build2/name.hxx> // -#include <build2/name> +#include <build2/name.hxx> -#endif // BUILD2_TYPES +#endif // BUILD2_TYPES_HXX diff --git a/build2/utility.cxx b/build2/utility.cxx index 11c5024..5cd01be 100644 --- a/build2/utility.cxx +++ b/build2/utility.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/utility> +#include <build2/utility.hxx> #include <time.h> // tzset() @@ -10,14 +10,14 @@ #include <cstdlib> // strtol() #include <iostream> // cerr -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> using namespace std; using namespace butl; // -// <build2/types> +// <build2/types.hxx> // namespace build2 { @@ -67,7 +67,7 @@ namespace std namespace build2 { // - // <build2/utility> + // <build2/utility.hxx> // string& diff --git a/build2/utility b/build2/utility.hxx index ca29026..5f5aa1d 100644 --- a/build2/utility +++ b/build2/utility.hxx @@ -1,9 +1,9 @@ -// file : build2/utility -*- C++ -*- +// file : build2/utility.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_UTILITY -#define BUILD2_UTILITY +#ifndef BUILD2_UTILITY_HXX +#define BUILD2_UTILITY_HXX #include <tuple> // make_tuple() #include <memory> // make_shared() @@ -14,15 +14,16 @@ #include <algorithm> // * #include <functional> // ref(), cref() -#include <butl/ft/lang> +#include <libbutl/ft/lang.hxx> -#include <butl/utility> // combine_hash(), reverse_iterate(), case*(), etc +#include <libbutl/utility.hxx> // combine_hash(), reverse_iterate(), case*(), + // etc #include <unordered_set> -#include <build2/types> -#include <build2/b-options> -#include <build2/version-impl> +#include <build2/types.hxx> +#include <build2/b-options.hxx> +#include <build2/version.hxx> namespace build2 { @@ -41,7 +42,7 @@ namespace build2 using std::stoul; using std::stoull; - // <butl/utility> + // <libbutl/utility.hxx> // using butl::reverse_iterate; using butl::compare_c_string; @@ -432,4 +433,4 @@ namespace build2 #include <build2/utility.ixx> #include <build2/utility.txx> -#endif // BUILD2_UTILITY +#endif // BUILD2_UTILITY_HXX diff --git a/build2/variable.cxx b/build2/variable.cxx index f282dc5..bcf9d62 100644 --- a/build2/variable.cxx +++ b/build2/variable.cxx @@ -2,12 +2,12 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/variable> +#include <build2/variable.hxx> #include <cstring> // memcmp() -#include <build2/context> -#include <build2/diagnostics> +#include <build2/context.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/build2/variable b/build2/variable.hxx index be3b478..19a6c69 100644 --- a/build2/variable +++ b/build2/variable.hxx @@ -1,22 +1,22 @@ -// file : build2/variable -*- C++ -*- +// file : build2/variable.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_VARIABLE -#define BUILD2_VARIABLE +#ifndef BUILD2_VARIABLE_HXX +#define BUILD2_VARIABLE_HXX #include <map> #include <set> #include <type_traits> // aligned_storage #include <unordered_map> -#include <butl/prefix-map> -#include <butl/multi-index> // map_key +#include <libbutl/prefix-map.hxx> +#include <libbutl/multi-index.hxx> // map_key -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target-type> +#include <build2/target-type.hxx> namespace build2 { @@ -1325,4 +1325,4 @@ namespace build2 #include <build2/variable.ixx> #include <build2/variable.txx> -#endif // BUILD2_VARIABLE +#endif // BUILD2_VARIABLE_HXX diff --git a/build2/variable.txx b/build2/variable.txx index c7d3e5a..1373948 100644 --- a/build2/variable.txx +++ b/build2/variable.txx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/diagnostics> +#include <build2/diagnostics.hxx> namespace build2 { diff --git a/build2/version-impl b/build2/version-impl deleted file mode 100644 index f4c132d..0000000 --- a/build2/version-impl +++ /dev/null @@ -1,18 +0,0 @@ -// file : build2/version-impl -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BUILD2_VERSION // Note: using the version macro itself. - -// This is a "fake" version used to bootstrap from the repository (we include -// a pre-generated version in distributions). -// -#define BUILD2_VERSION 9999999990000ULL - -#define BUILD2_VERSION_STR "999.999.999" -#define BUILD2_VERSION_ID "999.999.999" - -#define LIBBUTL_VERSION_STR "999.999.999" -#define LIBBUTL_VERSION_ID "999.999.999" - -#endif // BUILD2_VERSION diff --git a/build2/version-impl.in b/build2/version.hxx.in index a514240..c05a207 100644 --- a/build2/version-impl.in +++ b/build2/version.hxx.in @@ -1,4 +1,4 @@ -// file : build2/version-impl.in -*- C++ -*- +// file : build2/version.hxx.in -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file @@ -37,7 +37,7 @@ #define BUILD2_SNAPSHOT $build2.version.snapshot_sn$ULL #define BUILD2_SNAPSHOT_ID "$build2.version.snapshot_id$" -#include <butl/version> +#include <libbutl/version.hxx> $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$ diff --git a/build2/version/init.cxx b/build2/version/init.cxx index cce8de9..699495a 100644 --- a/build2/version/init.cxx +++ b/build2/version/init.cxx @@ -2,21 +2,21 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/version/init> +#include <build2/version/init.hxx> -#include <butl/manifest-parser> -#include <butl/manifest-serializer> +#include <libbutl/manifest-parser.hxx> +#include <libbutl/manifest-serializer.hxx> -#include <build2/scope> -#include <build2/context> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/scope.hxx> +#include <build2/context.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> -#include <build2/dist/module> +#include <build2/dist/module.hxx> -#include <build2/version/rule> -#include <build2/version/module> -#include <build2/version/snapshot> +#include <build2/version/rule.hxx> +#include <build2/version/module.hxx> +#include <build2/version/snapshot.hxx> using namespace std; using namespace butl; diff --git a/build2/version/init b/build2/version/init.hxx index 8ffb999..54beae1 100644 --- a/build2/version/init +++ b/build2/version/init.hxx @@ -1,14 +1,14 @@ -// file : build2/version/init -*- C++ -*- +// file : build2/version/init.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_VERSION_INIT -#define BUILD2_VERSION_INIT +#ifndef BUILD2_VERSION_INIT_HXX +#define BUILD2_VERSION_INIT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -28,4 +28,4 @@ namespace build2 } } -#endif // BUILD2_VERSION_INIT +#endif // BUILD2_VERSION_INIT_HXX diff --git a/build2/version/module.cxx b/build2/version/module.cxx index 9865271..acc629a 100644 --- a/build2/version/module.cxx +++ b/build2/version/module.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/version/module> +#include <build2/version/module.hxx> using namespace std; diff --git a/build2/version/module b/build2/version/module.hxx index 1e6fb7a..45b1a47 100644 --- a/build2/version/module +++ b/build2/version/module.hxx @@ -1,16 +1,16 @@ -// file : build2/version/module -*- C++ -*- +// file : build2/version/module.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_VERSION_MODULE -#define BUILD2_VERSION_MODULE +#ifndef BUILD2_VERSION_MODULE_HXX +#define BUILD2_VERSION_MODULE_HXX #include <map> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/module> +#include <build2/module.hxx> namespace build2 { @@ -33,4 +33,4 @@ namespace build2 } } -#endif // BUILD2_VERSION_MODULE +#endif // BUILD2_VERSION_MODULE_HXX diff --git a/build2/version/rule.cxx b/build2/version/rule.cxx index 3e143c1..d9669da 100644 --- a/build2/version/rule.cxx +++ b/build2/version/rule.cxx @@ -2,18 +2,18 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/version/rule> - -#include <build2/depdb> -#include <build2/scope> -#include <build2/target> -#include <build2/context> -#include <build2/function> -#include <build2/algorithm> -#include <build2/filesystem> -#include <build2/diagnostics> - -#include <build2/version/module> +#include <build2/version/rule.hxx> + +#include <build2/depdb.hxx> +#include <build2/scope.hxx> +#include <build2/target.hxx> +#include <build2/context.hxx> +#include <build2/function.hxx> +#include <build2/algorithm.hxx> +#include <build2/filesystem.hxx> +#include <build2/diagnostics.hxx> + +#include <build2/version/module.hxx> using namespace std; using namespace butl; diff --git a/build2/version/rule b/build2/version/rule.hxx index 186df59..e686694 100644 --- a/build2/version/rule +++ b/build2/version/rule.hxx @@ -1,14 +1,14 @@ -// file : build2/version/rule -*- C++ -*- +// file : build2/version/rule.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_VERSION_RULE -#define BUILD2_VERSION_RULE +#ifndef BUILD2_VERSION_RULE_HXX +#define BUILD2_VERSION_RULE_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/rule> +#include <build2/rule.hxx> namespace build2 { @@ -50,4 +50,4 @@ namespace build2 } } -#endif // BUILD2_VERSION_RULE +#endif // BUILD2_VERSION_RULE_HXX diff --git a/build2/version/snapshot-git.cxx b/build2/version/snapshot-git.cxx index b5db470..d91eb62 100644 --- a/build2/version/snapshot-git.cxx +++ b/build2/version/snapshot-git.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/version/snapshot> +#include <build2/version/snapshot.hxx> using namespace std; diff --git a/build2/version/snapshot.cxx b/build2/version/snapshot.cxx index be6c147..00528c7 100644 --- a/build2/version/snapshot.cxx +++ b/build2/version/snapshot.cxx @@ -2,9 +2,9 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <build2/version/snapshot> +#include <build2/version/snapshot.hxx> -#include <build2/filesystem> +#include <build2/filesystem.hxx> using namespace std; diff --git a/build2/version/snapshot b/build2/version/snapshot.hxx index a279729..b7e6dd7 100644 --- a/build2/version/snapshot +++ b/build2/version/snapshot.hxx @@ -1,14 +1,14 @@ -// file : build2/version/snapshot -*- C++ -*- +// file : build2/version/snapshot.hxx -*- C++ -*- // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BUILD2_VERSION_SNAPSHOT -#define BUILD2_VERSION_SNAPSHOT +#ifndef BUILD2_VERSION_SNAPSHOT_HXX +#define BUILD2_VERSION_SNAPSHOT_HXX -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/scope> +#include <build2/scope.hxx> namespace build2 { @@ -30,4 +30,4 @@ namespace build2 } } -#endif // BUILD2_VERSION_SNAPSHOT +#endif // BUILD2_VERSION_SNAPSHOT_HXX diff --git a/old-tests/depdb/driver.cxx b/old-tests/depdb/driver.cxx index b64b97e..2439b60 100644 --- a/old-tests/depdb/driver.cxx +++ b/old-tests/depdb/driver.cxx @@ -4,12 +4,12 @@ #include <iostream> -#include <butl/filesystem> +#include <libbutl/filesystem.hxx> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/depdb> +#include <build2/depdb.hxx> using namespace std; using namespace build2; diff --git a/tests/.gitignore b/tests/.gitignore index e54525b..eac2bb8 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1 +1,6 @@ driver + +# The immediate test/ sub-directory shouldn't be ignored. +# +*/test/ +test-*/ diff --git a/tests/build/root.build b/tests/build/root.build index 1903c41..7d483fe 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -6,7 +6,7 @@ cxx.std = latest using cxx -hxx{*}: extension = +hxx{*}: extension = hxx cxx{*}: extension = cxx # Setup the build system driver that we are testing (which may not be the same diff --git a/tests/test/script/runner/driver.cxx b/tests/test/script/runner/driver.cxx index ff91926..b31acb7 100644 --- a/tests/test/script/runner/driver.cxx +++ b/tests/test/script/runner/driver.cxx @@ -11,10 +11,10 @@ #include <iostream> #include <exception> -#include <butl/path> -#include <butl/optional> -#include <butl/fdstream> -#include <butl/filesystem> +#include <libbutl/path.hxx> +#include <libbutl/optional.hxx> +#include <libbutl/fdstream.hxx> +#include <libbutl/filesystem.hxx> using namespace std; using namespace butl; diff --git a/unit-tests/.gitignore b/unit-tests/.gitignore index e54525b..eac2bb8 100644 --- a/unit-tests/.gitignore +++ b/unit-tests/.gitignore @@ -1 +1,6 @@ driver + +# The immediate test/ sub-directory shouldn't be ignored. +# +*/test/ +test-*/ diff --git a/unit-tests/function/driver.cxx b/unit-tests/function/driver.cxx index 70fd69e..4650a18 100644 --- a/unit-tests/function/driver.cxx +++ b/unit-tests/function/driver.cxx @@ -4,14 +4,14 @@ #include <iostream> -#include <build2/types> -#include <build2/utility> - -#include <build2/parser> -#include <build2/context> -#include <build2/function> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/types.hxx> +#include <build2/utility.hxx> + +#include <build2/parser.hxx> +#include <build2/context.hxx> +#include <build2/function.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/unit-tests/lexer/driver.cxx b/unit-tests/lexer/driver.cxx index 41366ec..5bbefb9 100644 --- a/unit-tests/lexer/driver.cxx +++ b/unit-tests/lexer/driver.cxx @@ -5,11 +5,11 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/token> -#include <build2/lexer> +#include <build2/token.hxx> +#include <build2/lexer.hxx> using namespace std; diff --git a/unit-tests/scheduler/driver.cxx b/unit-tests/scheduler/driver.cxx index 2e20937..31551f2 100644 --- a/unit-tests/scheduler/driver.cxx +++ b/unit-tests/scheduler/driver.cxx @@ -8,10 +8,10 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/scheduler> +#include <build2/scheduler.hxx> using namespace std; diff --git a/unit-tests/test/script/lexer/driver.cxx b/unit-tests/test/script/lexer/driver.cxx index 229c3b6..9ff393b 100644 --- a/unit-tests/test/script/lexer/driver.cxx +++ b/unit-tests/test/script/lexer/driver.cxx @@ -5,11 +5,11 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/test/script/token> -#include <build2/test/script/lexer> +#include <build2/test/script/token.hxx> +#include <build2/test/script/lexer.hxx> using namespace std; diff --git a/unit-tests/test/script/parser/directive.test b/unit-tests/test/script/parser/directive.test index d735fb4..39bd666 100644 --- a/unit-tests/test/script/parser/directive.test +++ b/unit-tests/test/script/parser/directive.test @@ -46,11 +46,11 @@ EOI : var-expansion : -cat <<EOI >="foo-$(build.version).test"; +cat <<EOI >="foo-$(build.verson.project).test"; cmd EOI $* <<EOI >>EOO -.include "foo-$(build.version).test" +.include "foo-$(build.verson.project).test" EOI cmd EOO diff --git a/unit-tests/test/script/parser/driver.cxx b/unit-tests/test/script/parser/driver.cxx index 772bc10..fceb477 100644 --- a/unit-tests/test/script/parser/driver.cxx +++ b/unit-tests/test/script/parser/driver.cxx @@ -5,18 +5,18 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> -#include <build2/context> // reset() -#include <build2/scheduler> +#include <build2/target.hxx> +#include <build2/context.hxx> // reset() +#include <build2/scheduler.hxx> -#include <build2/test/target> +#include <build2/test/target.hxx> -#include <build2/test/script/token> -#include <build2/test/script/parser> -#include <build2/test/script/runner> +#include <build2/test/script/token.hxx> +#include <build2/test/script/parser.hxx> +#include <build2/test/script/runner.hxx> using namespace std; diff --git a/unit-tests/test/script/regex/driver.cxx b/unit-tests/test/script/regex/driver.cxx index 2680672..fd35f2a 100644 --- a/unit-tests/test/script/regex/driver.cxx +++ b/unit-tests/test/script/regex/driver.cxx @@ -5,7 +5,7 @@ #include <regex> #include <type_traits> // is_pod, is_array -#include <build2/test/script/regex> +#include <build2/test/script/regex.hxx> using namespace std; using namespace build2::test::script::regex; |