diff options
| author | Martin Hořeňovský | 2020-05-09 19:33:47 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-05-09 19:40:57 +0200 |
| commit | e1a0cce82b0ea3a37b00b3d7e6ec02be42ce1891 (patch) | |
| tree | cde46a8c67cd80ba8f4f93e056acacff3a438279 | |
| parent | 75b711a36061f5ddd2516f937a5c9bc44ef9ae8f (diff) | |
| download | catch3-e1a0cce82b0ea3a37b00b3d7e6ec02be42ce1891.tar.gz | |
Remove Clara from external folder
As Clara is no longer maintained as a separate project, the
implementation was moved to the internal subfolder of top-level
folder. This removes one folder and avoids potential user confusion.
Also simplified the convenience header checking script accordingly.
| -rw-r--r-- | src/catch2/catch_all.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_clara.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_clara_upstream.hpp (renamed from src/catch2/external/clara.hpp) | 0 | ||||
| -rw-r--r-- | tools/scripts/checkConvenienceHeaders.py | 15 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index 5c6b09d2..0cc9550d 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -36,11 +36,11 @@ #include <catch2/catch_totals.hpp> #include <catch2/catch_version.hpp> #include <catch2/catch_version_macros.hpp> -#include <catch2/external/catch_external_all.hpp> #include <catch2/generators/catch_generators_all.hpp> #include <catch2/interfaces/catch_interfaces_all.hpp> #include <catch2/internal/catch_assertionhandler.hpp> #include <catch2/internal/catch_clara.hpp> +#include <catch2/internal/catch_clara_upstream.hpp> #include <catch2/internal/catch_commandline.hpp> #include <catch2/internal/catch_common.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> diff --git a/src/catch2/internal/catch_clara.hpp b/src/catch2/internal/catch_clara.hpp index 35494929..372daa2a 100644 --- a/src/catch2/internal/catch_clara.hpp +++ b/src/catch2/internal/catch_clara.hpp @@ -23,7 +23,7 @@ #pragma clang diagnostic ignored "-Wshadow" #endif -#include <catch2/external/clara.hpp> +#include <catch2/internal/catch_clara_upstream.hpp> #ifdef __clang__ #pragma clang diagnostic pop diff --git a/src/catch2/external/clara.hpp b/src/catch2/internal/catch_clara_upstream.hpp index c7348bf9..c7348bf9 100644 --- a/src/catch2/external/clara.hpp +++ b/src/catch2/internal/catch_clara_upstream.hpp diff --git a/tools/scripts/checkConvenienceHeaders.py b/tools/scripts/checkConvenienceHeaders.py index 7565c181..054d3bd9 100644 --- a/tools/scripts/checkConvenienceHeaders.py +++ b/tools/scripts/checkConvenienceHeaders.py @@ -13,7 +13,6 @@ The top level header is called `catch_all.hpp`. """ internal_dirs = ['detail', 'internal'] -excluded_dirs = ['external'] from scriptCommon import catchPath from glob import glob @@ -44,8 +43,6 @@ def folders_in_folder(folder): def collated_includes(folder): base = headers_in_folder(folder) for subfolder in folders_in_folder(folder): - if folder in excluded_dirs: - continue if subfolder.name in internal_dirs: base.extend(headers_in_folder(subfolder.path)) else: @@ -98,7 +95,7 @@ def verify_convenience_header(folder): header_name = 'catch_all.hpp' else: header_name = 'catch_{}_all.hpp'.format('_'.join(path_pieces)) - + # 1) Does it exist? full_path = path + '/' + header_name if not os.path.isfile(full_path): @@ -116,7 +113,7 @@ def verify_convenience_header(folder): for duplicate in duplicated: errors_found = True print("'{}': Duplicated include: '{}'".format(header_name, duplicate)) - + target_includes = normalize_includes(collated_includes(path)) # Avoid requiring the convenience header to include itself target_includes = [x for x in target_includes if header_name not in x] @@ -132,15 +129,15 @@ def verify_convenience_header(folder): for include in file_incs: if include not in desired_set: errors_found = True - print("'{}': superfluous include '{}'".format(header_name, include)) - - + print("'{}': superfluous include '{}'".format(header_name, include)) + + def walk_source_folders(current): verify_convenience_header(current) for folder in folders_in_folder(current.path): fname = folder.name - if fname not in internal_dirs and fname not in excluded_dirs: + if fname not in internal_dirs: walk_source_folders(folder) # This is an ugly hack because we cannot instantiate DirEntry manually |