From 55ad5000dd45b97782bde1b487603a38108f514f Mon Sep 17 00:00:00 2001 From: Henry Winkel Date: Wed, 9 Aug 2023 15:23:10 +0200 Subject: [PATCH] Restarted the production of the app --- .gitignore | 2 +- .gitmodules | 3 + CMakeLists.txt | 17 +- cmake/Modules/defaultOptions.cmake | 2 +- cmake/Modules/protobuf.cmake | 38 + include/SimControl/SimControl.hpp | 59 +- .../libs => }/CLI11/.all-contributorsrc | 0 .../libs => }/CLI11/.appveyor.yml | 3 +- libs/{cli11 => CLI11}/.ci/azure-build.yml | 0 .../libs => }/CLI11/.ci/azure-cmake.yml | 0 .../libs => }/CLI11/.ci/azure-test.yml | 0 .../libs => }/CLI11/.clang-format | 0 libs/{cli11 => CLI11}/.clang-tidy | 0 .../libs => }/CLI11/.cmake-format.yaml | 0 .../{CommService/libs => }/CLI11/.codecov.yml | 0 .../libs => }/CLI11/.editorconfig | 0 libs/{cli11 => CLI11}/.github/CONTRIBUTING.md | 0 .../.github/actions/quick_cmake/action.yml | 0 libs/{cli11 => CLI11}/.github/codecov.yml | 0 libs/{cli11 => CLI11}/.github/dependabot.yml | 0 .../CLI11/.github/labeler_merged.yml | 0 .../.github/workflows/build.yml | 0 .../CLI11/.github/workflows/pr_merged.yml | 0 .../.github/workflows/tests.yml | 16 +- libs/{CommService/libs => }/CLI11/.gitignore | 0 libs/{cli11 => CLI11}/.pre-commit-config.yaml | 14 +- libs/{CommService/libs => }/CLI11/.remarkrc | 0 .../{CommService/libs => }/CLI11/CHANGELOG.md | 45 + .../CLI11/CLI11.CPack.Description.txt | 0 libs/{cli11 => CLI11}/CLI11.hpp.in | 0 libs/{cli11 => CLI11}/CMakeLists.txt | 0 libs/{CommService/libs => }/CLI11/CPPLINT.cfg | 0 libs/{CommService/libs => }/CLI11/LICENSE | 0 libs/{CommService/libs => }/CLI11/README.md | 6 +- libs/{cli11 => CLI11}/azure-pipelines.yml | 0 .../libs => }/CLI11/book/.gitignore | 0 .../libs => }/CLI11/book/CMakeLists.txt | 0 .../libs => }/CLI11/book/README.md | 0 .../libs => }/CLI11/book/SUMMARY.md | 0 .../libs => }/CLI11/book/book.json | 0 .../CLI11/book/chapters/advanced-topics.md | 0 .../book/chapters/an-advanced-example.md | 0 .../libs => }/CLI11/book/chapters/basics.md | 0 .../libs => }/CLI11/book/chapters/config.md | 0 .../libs => }/CLI11/book/chapters/flags.md | 0 .../CLI11/book/chapters/formatting.md | 0 .../CLI11/book/chapters/installation.md | 0 .../CLI11/book/chapters/internals.md | 0 .../libs => }/CLI11/book/chapters/options.md | 0 .../CLI11/book/chapters/subcommands.md | 0 .../libs => }/CLI11/book/chapters/toolkits.md | 0 .../CLI11/book/chapters/validators.md | 0 .../libs => }/CLI11/book/code/CMakeLists.txt | 0 .../libs => }/CLI11/book/code/flags.cpp | 0 .../libs => }/CLI11/book/code/geet.cpp | 0 .../libs => }/CLI11/book/code/intro.cpp | 0 .../libs => }/CLI11/book/code/simplest.cpp | 0 .../libs => }/CLI11/cmake/CLI11.pc.in | 0 .../CLI11/cmake/CLI11ConfigVersion.cmake.in | 0 .../CLI11/cmake/CLI11GeneratePkgConfig.cmake | 0 .../cmake/CLI11Warnings.cmake | 0 .../libs => }/CLI11/cmake/CodeCoverage.cmake | 0 libs/{cli11 => CLI11}/conanfile.py | 2 +- .../libs => }/CLI11/docs/.gitignore | 0 .../libs => }/CLI11/docs/CLI11.svg | 0 .../libs => }/CLI11/docs/CLI11_100.png | Bin .../libs => }/CLI11/docs/CLI11_300.png | Bin .../libs => }/CLI11/docs/CMakeLists.txt | 0 .../libs => }/CLI11/docs/Doxyfile | 0 .../libs => }/CLI11/docs/mainpage.md | 0 libs/{cli11 => CLI11}/examples/CMakeLists.txt | 0 .../CLI11/examples/callback_passthrough.cpp | 0 .../libs => }/CLI11/examples/config_app.cpp | 0 .../examples/custom_parse.cpp | 0 .../libs => }/CLI11/examples/digit_args.cpp | 0 .../libs => }/CLI11/examples/enum.cpp | 0 .../libs => }/CLI11/examples/enum_ostream.cpp | 0 libs/{cli11 => CLI11}/examples/formatter.cpp | 0 libs/{cli11 => CLI11}/examples/groups.cpp | 0 .../examples/inter_argument_order.cpp | 0 .../libs => }/CLI11/examples/json.cpp | 0 libs/{cli11 => CLI11}/examples/modhelp.cpp | 0 .../libs => }/CLI11/examples/nested.cpp | 0 .../examples/option_groups.cpp | 0 .../examples/positional_arity.cpp | 0 .../CLI11/examples/positional_validation.cpp | 0 .../examples/prefix_command.cpp | 0 libs/{cli11 => CLI11}/examples/ranges.cpp | 0 libs/{cli11 => CLI11}/examples/retired.cpp | 0 libs/{cli11 => CLI11}/examples/shapes.cpp | 0 .../libs => }/CLI11/examples/simple.cpp | 0 .../libs => }/CLI11/examples/subcom_help.cpp | 0 .../examples/subcom_in_files/CMakeLists.txt | 0 .../examples/subcom_in_files/subcommand_a.cpp | 0 .../examples/subcom_in_files/subcommand_a.hpp | 0 .../subcom_in_files/subcommand_main.cpp | 0 .../examples/subcom_partitioned.cpp | 0 .../{cli11 => CLI11}/examples/subcommands.cpp | 0 libs/{cli11 => CLI11}/examples/testEXE.cpp | 0 .../libs => }/CLI11/examples/validators.cpp | 0 libs/{cli11 => CLI11}/include/CLI/App.hpp | 0 .../libs => }/CLI11/include/CLI/CLI.hpp | 0 libs/{cli11 => CLI11}/include/CLI/Config.hpp | 0 .../include/CLI/ConfigFwd.hpp | 2 +- libs/{cli11 => CLI11}/include/CLI/Error.hpp | 0 .../include/CLI/Formatter.hpp | 0 .../include/CLI/FormatterFwd.hpp | 4 + libs/{cli11 => CLI11}/include/CLI/Macros.hpp | 0 libs/{cli11 => CLI11}/include/CLI/Option.hpp | 0 libs/{cli11 => CLI11}/include/CLI/Split.hpp | 0 .../include/CLI/StringTools.hpp | 0 libs/{cli11 => CLI11}/include/CLI/Timer.hpp | 0 .../include/CLI/TypeTools.hpp | 54 +- .../include/CLI/Validators.hpp | 2 +- libs/{cli11 => CLI11}/include/CLI/Version.hpp | 6 +- .../include/CLI/impl/App_inl.hpp | 45 +- .../include/CLI/impl/Config_inl.hpp | 0 .../include/CLI/impl/Formatter_inl.hpp | 6 +- .../include/CLI/impl/Option_inl.hpp | 0 .../include/CLI/impl/Split_inl.hpp | 0 .../include/CLI/impl/StringTools_inl.hpp | 0 .../include/CLI/impl/Validators_inl.hpp | 2 +- libs/{CommService/libs => }/CLI11/meson.build | 0 .../libs => }/CLI11/meson_options.txt | 0 .../libs => }/CLI11/scripts/ExtractVersion.py | 0 .../scripts/MakeSingleHeader.py | 0 .../libs => }/CLI11/scripts/check_style.sh | 0 .../CLI11/scripts/check_style_docker.sh | 0 .../CLI11/scripts/clang-format-pre-commit | 0 libs/{cli11 => CLI11}/scripts/mdlint_style.rb | 1 + libs/{cli11 => CLI11}/src/CMakeLists.txt | 0 libs/{cli11 => CLI11}/src/Precompile.cpp | 0 .../libs => }/CLI11/subprojects/catch2.wrap | 0 .../CLI11/test_package/CMakeLists.txt | 0 .../libs => }/CLI11/test_package/conanfile.py | 0 .../libs => }/CLI11/test_package/example.cpp | 0 .../CLI11/tests/.syntastic_cpp_config | 0 libs/{cli11 => CLI11}/tests/AppTest.cpp | 32 + .../CLI11/tests/BoostOptionTypeTest.cpp | 0 libs/{cli11 => CLI11}/tests/CMakeLists.txt | 0 .../tests/ComplexTypeTest.cpp | 0 .../{cli11 => CLI11}/tests/ConfigFileTest.cpp | 71 +- libs/{cli11 => CLI11}/tests/CreationTest.cpp | 0 .../libs => }/CLI11/tests/DeprecatedTest.cpp | 0 libs/{cli11 => CLI11}/tests/FormatterTest.cpp | 10 +- libs/{cli11 => CLI11}/tests/HelpTest.cpp | 12 +- libs/{cli11 => CLI11}/tests/HelpersTest.cpp | 8 + libs/{cli11 => CLI11}/tests/NewParseTest.cpp | 0 .../tests/OptionGroupTest.cpp | 6 + .../{cli11 => CLI11}/tests/OptionTypeTest.cpp | 80 + .../libs => }/CLI11/tests/OptionalTest.cpp | 0 libs/{cli11 => CLI11}/tests/SetTest.cpp | 17 + .../libs => }/CLI11/tests/SimpleTest.cpp | 0 .../tests/StringParseTest.cpp | 0 .../{cli11 => CLI11}/tests/SubcommandTest.cpp | 0 .../libs => }/CLI11/tests/TimerTest.cpp | 0 libs/{cli11 => CLI11}/tests/TransformTest.cpp | 0 .../libs => }/CLI11/tests/TrueFalseTest.cpp | 0 .../libs => }/CLI11/tests/WindowsTest.cpp | 0 libs/{cli11 => CLI11}/tests/app_helper.hpp | 2 + .../libs => }/CLI11/tests/catch.hpp | 0 .../libs => }/CLI11/tests/informational.cpp | 0 .../libs => }/CLI11/tests/link_test_1.cpp | 0 .../libs => }/CLI11/tests/link_test_2.cpp | 0 .../libs => }/CLI11/tests/main.cpp | 0 .../libs => }/CLI11/tests/meson.build | 0 .../libs => }/CLI11/tests/mesonTest/README.md | 0 .../libs => }/CLI11/tests/mesonTest/main.cpp | 0 .../CLI11/tests/mesonTest/meson.build | 0 .../libs => }/Catch2/.clang-format | 0 .../libs => }/Catch2/.conan/build.py | 0 .../Catch2/.conan/test_package/CMakeLists.txt | 0 .../Catch2/.conan/test_package/conanfile.py | 0 .../.conan/test_package/test_package.cpp | 0 .../libs => }/Catch2/.gitattributes | 0 .../libs => }/Catch2/.github/FUNDING.yml | 0 .../.github/ISSUE_TEMPLATE/bug_report.md | 0 .../.github/ISSUE_TEMPLATE/feature_request.md | 0 .../Catch2/.github/pull_request_template.md | 0 .../libbattle-com/libs => }/Catch2/.gitignore | 0 .../libs => }/Catch2/.travis.yml | 0 .../libs => }/Catch2/BUILD.bazel | 0 .../Catch2/CMake/Catch2Config.cmake.in | 0 .../libs => }/Catch2/CMake/FindGcov.cmake | 0 .../libs => }/Catch2/CMake/FindLcov.cmake | 0 .../libs => }/Catch2/CMake/Findcodecov.cmake | 0 .../Catch2/CMake/MiscFunctions.cmake | 0 .../libs => }/Catch2/CMake/catch2.pc.in | 0 .../libs => }/Catch2/CMake/llvm-cov-wrapper | 0 .../libs => }/Catch2/CMakeLists.txt | 0 .../libs => }/Catch2/CODE_OF_CONDUCT.md | 0 .../libs => }/Catch2/LICENSE.txt | 0 .../libbattle-com/libs => }/Catch2/README.md | 0 .../libbattle-com/libs => }/Catch2/WORKSPACE | 0 .../libs => }/Catch2/appveyor.yml | 0 .../Catch2/artwork/catch2-c-logo.png | Bin .../Catch2/artwork/catch2-hand-logo.png | Bin .../Catch2/artwork/catch2-logo-small.png | Bin .../libs => }/Catch2/codecov.yml | 0 .../libs => }/Catch2/conanfile.py | 0 .../libs => }/Catch2/contrib/Catch.cmake | 0 .../Catch2/contrib/CatchAddTests.cmake | 0 .../contrib/ParseAndAddCatchTests.cmake | 0 .../libs => }/Catch2/contrib/gdbinit | 0 .../libs => }/Catch2/contrib/lldbinit | 0 .../libs => }/Catch2/docs/Readme.md | 0 .../libs => }/Catch2/docs/assertions.md | 0 .../libs => }/Catch2/docs/benchmarks.md | 0 .../libs => }/Catch2/docs/ci-and-misc.md | 0 .../Catch2/docs/cmake-integration.md | 0 .../libs => }/Catch2/docs/command-line.md | 0 .../libs => }/Catch2/docs/commercial-users.md | 0 .../libs => }/Catch2/docs/configuration.md | 0 .../libs => }/Catch2/docs/contributing.md | 0 .../libs => }/Catch2/docs/deprecations.md | 0 .../libs => }/Catch2/docs/event-listeners.md | 0 .../libs => }/Catch2/docs/generators.md | 0 .../libs => }/Catch2/docs/limitations.md | 0 .../libs => }/Catch2/docs/list-of-examples.md | 0 .../libs => }/Catch2/docs/logging.md | 0 .../libs => }/Catch2/docs/matchers.md | 0 .../libs => }/Catch2/docs/opensource-users.md | 0 .../libs => }/Catch2/docs/other-macros.md | 0 .../libs => }/Catch2/docs/own-main.md | 0 .../libs => }/Catch2/docs/release-notes.md | 0 .../libs => }/Catch2/docs/release-process.md | 0 .../libs => }/Catch2/docs/reporters.md | 0 .../libs => }/Catch2/docs/slow-compiles.md | 0 .../Catch2/docs/test-cases-and-sections.md | 0 .../libs => }/Catch2/docs/test-fixtures.md | 0 .../libs => }/Catch2/docs/tostring.md | 0 .../libs => }/Catch2/docs/tutorial.md | 0 .../libs => }/Catch2/docs/why-catch.md | 0 .../Catch2/examples/000-CatchMain.cpp | 0 .../Catch2/examples/010-TestCase.cpp | 0 .../Catch2/examples/020-TestCase-1.cpp | 0 .../Catch2/examples/020-TestCase-2.cpp | 0 .../Catch2/examples/030-Asn-Require-Check.cpp | 0 .../Catch2/examples/100-Fix-Section.cpp | 0 .../Catch2/examples/110-Fix-ClassFixture.cpp | 0 .../120-Bdd-ScenarioGivenWhenThen.cpp | 0 .../Catch2/examples/200-Rpt-CatchMain.cpp | 0 .../examples/207-Rpt-TeamCityReporter.cpp | 0 .../examples/210-Evt-EventListeners.cpp | 0 .../Catch2/examples/231-Cfg-OutputStreams.cpp | 0 .../Catch2/examples/300-Gen-OwnGenerator.cpp | 0 .../examples/301-Gen-MapTypeConversion.cpp | 0 .../Catch2/examples/302-Gen-Table.cpp | 0 .../310-Gen-VariablesInGenerators.cpp | 0 .../Catch2/examples/311-Gen-CustomCapture.cpp | 0 .../libs => }/Catch2/examples/CMakeLists.txt | 0 .../libs => }/Catch2/include/catch.hpp | 0 .../Catch2/include/catch_with_main.hpp | 0 .../Catch2/include/external/clara.hpp | 0 .../internal/benchmark/catch_benchmark.hpp | 0 .../benchmark/catch_benchmarking_all.hpp | 0 .../internal/benchmark/catch_chronometer.hpp | 0 .../internal/benchmark/catch_clock.hpp | 0 .../internal/benchmark/catch_constructor.hpp | 0 .../internal/benchmark/catch_environment.hpp | 0 .../internal/benchmark/catch_estimate.hpp | 0 .../benchmark/catch_execution_plan.hpp | 0 .../internal/benchmark/catch_optimizer.hpp | 0 .../catch_outlier_classification.hpp | 0 .../benchmark/catch_sample_analysis.hpp | 0 .../benchmark/detail/catch_analyse.hpp | 0 .../detail/catch_benchmark_function.hpp | 0 .../detail/catch_complete_invoke.hpp | 0 .../benchmark/detail/catch_estimate_clock.hpp | 0 .../benchmark/detail/catch_measure.hpp | 0 .../benchmark/detail/catch_repeat.hpp | 0 .../detail/catch_run_for_at_least.hpp | 0 .../internal/benchmark/detail/catch_stats.cpp | 0 .../internal/benchmark/detail/catch_stats.hpp | 0 .../benchmark/detail/catch_timing.hpp | 0 .../Catch2/include/internal/catch_approx.cpp | 0 .../Catch2/include/internal/catch_approx.h | 0 .../internal/catch_assertionhandler.cpp | 0 .../include/internal/catch_assertionhandler.h | 0 .../include/internal/catch_assertioninfo.h | 0 .../internal/catch_assertionresult.cpp | 0 .../include/internal/catch_assertionresult.h | 0 .../Catch2/include/internal/catch_capture.hpp | 0 .../internal/catch_capture_matchers.cpp | 0 .../include/internal/catch_capture_matchers.h | 0 .../Catch2/include/internal/catch_clara.h | 0 .../include/internal/catch_commandline.cpp | 0 .../include/internal/catch_commandline.h | 0 .../Catch2/include/internal/catch_common.cpp | 0 .../Catch2/include/internal/catch_common.h | 0 .../internal/catch_compiler_capabilities.h | 0 .../Catch2/include/internal/catch_config.cpp | 0 .../Catch2/include/internal/catch_config.hpp | 0 .../catch_config_uncaught_exceptions.hpp | 0 .../include/internal/catch_console_colour.cpp | 0 .../include/internal/catch_console_colour.h | 0 .../Catch2/include/internal/catch_context.cpp | 0 .../Catch2/include/internal/catch_context.h | 0 .../include/internal/catch_debug_console.cpp | 0 .../include/internal/catch_debug_console.h | 0 .../include/internal/catch_debugger.cpp | 0 .../Catch2/include/internal/catch_debugger.h | 0 .../include/internal/catch_decomposer.cpp | 0 .../include/internal/catch_decomposer.h | 0 .../include/internal/catch_default_main.hpp | 0 .../Catch2/include/internal/catch_enforce.cpp | 0 .../Catch2/include/internal/catch_enforce.h | 0 .../internal/catch_enum_values_registry.cpp | 0 .../internal/catch_enum_values_registry.h | 0 .../include/internal/catch_errno_guard.cpp | 0 .../include/internal/catch_errno_guard.h | 0 .../catch_exception_translator_registry.cpp | 0 .../catch_exception_translator_registry.h | 0 .../internal/catch_external_interfaces.h | 0 .../internal/catch_fatal_condition.cpp | 0 .../include/internal/catch_fatal_condition.h | 0 .../include/internal/catch_generators.cpp | 0 .../include/internal/catch_generators.hpp | 0 .../internal/catch_generators_generic.hpp | 0 .../internal/catch_generators_specific.hpp | 0 .../Catch2/include/internal/catch_impl.hpp | 0 .../internal/catch_interfaces_capture.cpp | 0 .../internal/catch_interfaces_capture.h | 0 .../internal/catch_interfaces_config.cpp | 0 .../internal/catch_interfaces_config.h | 0 .../catch_interfaces_enum_values_registry.h | 0 .../internal/catch_interfaces_exception.cpp | 0 .../internal/catch_interfaces_exception.h | 0 .../catch_interfaces_generatortracker.h | 0 .../catch_interfaces_registry_hub.cpp | 0 .../internal/catch_interfaces_registry_hub.h | 0 .../internal/catch_interfaces_reporter.cpp | 0 .../internal/catch_interfaces_reporter.h | 0 .../internal/catch_interfaces_runner.cpp | 0 .../internal/catch_interfaces_runner.h | 0 .../catch_interfaces_tag_alias_registry.h | 0 .../internal/catch_interfaces_testcase.cpp | 0 .../internal/catch_interfaces_testcase.h | 0 .../include/internal/catch_leak_detector.cpp | 0 .../include/internal/catch_leak_detector.h | 0 .../Catch2/include/internal/catch_list.cpp | 0 .../Catch2/include/internal/catch_list.h | 0 .../include/internal/catch_matchers.cpp | 0 .../Catch2/include/internal/catch_matchers.h | 0 .../internal/catch_matchers_exception.cpp | 0 .../internal/catch_matchers_exception.hpp | 0 .../internal/catch_matchers_floating.cpp | 0 .../internal/catch_matchers_floating.h | 0 .../internal/catch_matchers_generic.cpp | 0 .../internal/catch_matchers_generic.hpp | 0 .../internal/catch_matchers_string.cpp | 0 .../include/internal/catch_matchers_string.h | 0 .../include/internal/catch_matchers_vector.h | 0 .../Catch2/include/internal/catch_message.cpp | 0 .../Catch2/include/internal/catch_message.h | 0 .../Catch2/include/internal/catch_meta.hpp | 0 .../Catch2/include/internal/catch_objc.hpp | 0 .../include/internal/catch_objc_arc.hpp | 0 .../Catch2/include/internal/catch_option.hpp | 0 .../internal/catch_output_redirect.cpp | 0 .../include/internal/catch_output_redirect.h | 0 .../Catch2/include/internal/catch_platform.h | 0 .../include/internal/catch_polyfills.cpp | 0 .../include/internal/catch_polyfills.hpp | 0 .../include/internal/catch_preprocessor.hpp | 0 .../catch_random_number_generator.cpp | 0 .../internal/catch_random_number_generator.h | 0 .../internal/catch_reenable_warnings.h | 0 .../include/internal/catch_registry_hub.cpp | 0 .../internal/catch_reporter_registrars.hpp | 0 .../internal/catch_reporter_registry.cpp | 0 .../internal/catch_reporter_registry.h | 0 .../include/internal/catch_result_type.cpp | 0 .../include/internal/catch_result_type.h | 0 .../include/internal/catch_run_context.cpp | 0 .../include/internal/catch_run_context.h | 0 .../Catch2/include/internal/catch_section.cpp | 0 .../Catch2/include/internal/catch_section.h | 0 .../include/internal/catch_section_info.cpp | 0 .../include/internal/catch_section_info.h | 0 .../Catch2/include/internal/catch_session.cpp | 0 .../Catch2/include/internal/catch_session.h | 0 .../include/internal/catch_singletons.cpp | 0 .../include/internal/catch_singletons.hpp | 0 .../catch_startup_exception_registry.cpp | 0 .../catch_startup_exception_registry.h | 0 .../Catch2/include/internal/catch_stream.cpp | 0 .../Catch2/include/internal/catch_stream.h | 0 .../include/internal/catch_string_manip.cpp | 0 .../include/internal/catch_string_manip.h | 0 .../include/internal/catch_stringref.cpp | 0 .../Catch2/include/internal/catch_stringref.h | 0 .../internal/catch_suppress_warnings.h | 0 .../include/internal/catch_tag_alias.cpp | 0 .../Catch2/include/internal/catch_tag_alias.h | 0 .../catch_tag_alias_autoregistrar.cpp | 0 .../internal/catch_tag_alias_autoregistrar.h | 0 .../internal/catch_tag_alias_registry.cpp | 0 .../internal/catch_tag_alias_registry.h | 0 .../include/internal/catch_test_case_info.cpp | 0 .../include/internal/catch_test_case_info.h | 0 .../catch_test_case_registry_impl.cpp | 0 .../internal/catch_test_case_registry_impl.h | 0 .../internal/catch_test_case_tracker.cpp | 0 .../internal/catch_test_case_tracker.h | 0 .../include/internal/catch_test_registry.cpp | 0 .../include/internal/catch_test_registry.h | 0 .../include/internal/catch_test_spec.cpp | 0 .../Catch2/include/internal/catch_test_spec.h | 0 .../internal/catch_test_spec_parser.cpp | 0 .../include/internal/catch_test_spec_parser.h | 0 .../Catch2/include/internal/catch_text.h | 0 .../Catch2/include/internal/catch_timer.cpp | 0 .../Catch2/include/internal/catch_timer.h | 0 .../include/internal/catch_to_string.hpp | 0 .../include/internal/catch_tostring.cpp | 0 .../Catch2/include/internal/catch_tostring.h | 0 .../Catch2/include/internal/catch_totals.cpp | 0 .../Catch2/include/internal/catch_totals.h | 0 .../internal/catch_uncaught_exceptions.cpp | 0 .../internal/catch_uncaught_exceptions.h | 0 .../include/internal/catch_user_interfaces.h | 0 .../Catch2/include/internal/catch_version.cpp | 0 .../Catch2/include/internal/catch_version.h | 0 .../internal/catch_wildcard_pattern.cpp | 0 .../include/internal/catch_wildcard_pattern.h | 0 .../include/internal/catch_windows_h_proxy.h | 0 .../include/internal/catch_xmlwriter.cpp | 0 .../Catch2/include/internal/catch_xmlwriter.h | 0 .../reporters/catch_reporter_automake.hpp | 0 .../reporters/catch_reporter_bases.cpp | 0 .../reporters/catch_reporter_bases.hpp | 0 .../reporters/catch_reporter_compact.cpp | 0 .../reporters/catch_reporter_compact.h | 0 .../reporters/catch_reporter_console.cpp | 0 .../reporters/catch_reporter_console.h | 0 .../reporters/catch_reporter_junit.cpp | 0 .../include/reporters/catch_reporter_junit.h | 0 .../reporters/catch_reporter_listening.cpp | 0 .../reporters/catch_reporter_listening.h | 0 .../reporters/catch_reporter_sonarqube.hpp | 0 .../include/reporters/catch_reporter_tap.hpp | 0 .../reporters/catch_reporter_teamcity.hpp | 0 .../include/reporters/catch_reporter_xml.cpp | 0 .../include/reporters/catch_reporter_xml.h | 0 .../libs => }/Catch2/misc/CMakeLists.txt | 0 .../misc/appveyorBuildConfigurationScript.bat | 0 .../misc/appveyorMergeCoverageScript.py | 0 .../Catch2/misc/appveyorTestRunScript.bat | 0 .../libs => }/Catch2/misc/coverage-helper.cpp | 0 .../Catch2/misc/installOpenCppCoverage.ps1 | 0 .../libs => }/Catch2/projects/CMakeLists.txt | 0 .../Catch2/projects/ExtraTests/CMakeLists.txt | 0 .../Catch2/projects/ExtraTests/ToDo.txt | 0 .../ExtraTests/X01-PrefixedMacros.cpp | 0 .../ExtraTests/X02-DisabledMacros.cpp | 0 .../X03-DisabledExceptions-DefaultHandler.cpp | 0 .../X04-DisabledExceptions-CustomHandler.cpp | 0 .../ExtraTests/X10-FallbackStringifier.cpp | 0 .../ExtraTests/X11-DisableStringification.cpp | 0 .../ExtraTests/X12-CustomDebugBreakMacro.cpp | 0 .../ExtraTests/X20-BenchmarkingMacros.cpp | 0 .../ExtraTests/X90-WindowsHeaderInclusion.cpp | 0 .../Baselines/automake.std.approved.txt | 0 .../Baselines/compact.sw.approved.txt | 0 .../Baselines/console.std.approved.txt | 0 .../Baselines/console.sw.approved.txt | 0 .../Baselines/console.swa4.approved.txt | 0 .../SelfTest/Baselines/junit.sw.approved.txt | 0 .../Baselines/sonarqube.sw.approved.txt | 0 .../SelfTest/Baselines/xml.sw.approved.txt | 0 .../CompileTimePerfTests/10.tests.cpp | 0 .../CompileTimePerfTests/100.tests.cpp | 0 .../CompileTimePerfTests/All.tests.cpp | 0 .../IntrospectiveTests/CmdLine.tests.cpp | 0 .../IntrospectiveTests/Details.tests.cpp | 0 .../GeneratorsImpl.tests.cpp | 0 .../InternalBenchmark.tests.cpp | 0 .../IntrospectiveTests/PartTracker.tests.cpp | 0 .../RandomNumberGeneration.tests.cpp | 0 .../IntrospectiveTests/String.tests.cpp | 0 .../IntrospectiveTests/StringManip.tests.cpp | 0 .../SelfTest/IntrospectiveTests/Tag.tests.cpp | 0 .../IntrospectiveTests/ToString.tests.cpp | 0 .../SelfTest/IntrospectiveTests/Xml.tests.cpp | 0 .../SelfTest/Misc/invalid-test-names.input | 0 .../SelfTest/Misc/plain-old-tests.input | 0 .../Misc/special-characters-in-file.input | 0 .../SurrogateCpps/catch_console_colour.cpp | 0 .../SelfTest/SurrogateCpps/catch_debugger.cpp | 0 .../catch_interfaces_reporter.cpp | 0 .../SelfTest/SurrogateCpps/catch_option.cpp | 0 .../SelfTest/SurrogateCpps/catch_stream.cpp | 0 .../SurrogateCpps/catch_test_case_tracker.cpp | 0 .../SurrogateCpps/catch_test_spec.cpp | 0 .../SurrogateCpps/catch_xmlwriter.cpp | 0 .../Catch2/projects/SelfTest/TestMain.cpp | 0 .../SelfTest/TimingTests/Sleep.tests.cpp | 0 .../SelfTest/UsageTests/Approx.tests.cpp | 0 .../SelfTest/UsageTests/BDD.tests.cpp | 0 .../SelfTest/UsageTests/Benchmark.tests.cpp | 0 .../SelfTest/UsageTests/Class.tests.cpp | 0 .../SelfTest/UsageTests/Compilation.tests.cpp | 0 .../SelfTest/UsageTests/Condition.tests.cpp | 0 .../UsageTests/Decomposition.tests.cpp | 0 .../UsageTests/EnumToString.tests.cpp | 0 .../SelfTest/UsageTests/Exception.tests.cpp | 0 .../SelfTest/UsageTests/Generators.tests.cpp | 0 .../SelfTest/UsageTests/Matchers.tests.cpp | 0 .../SelfTest/UsageTests/Message.tests.cpp | 0 .../SelfTest/UsageTests/Misc.tests.cpp | 0 .../UsageTests/ToStringByte.tests.cpp | 0 .../UsageTests/ToStringChrono.tests.cpp | 0 .../UsageTests/ToStringGeneral.tests.cpp | 0 .../UsageTests/ToStringOptional.tests.cpp | 0 .../UsageTests/ToStringPair.tests.cpp | 0 .../UsageTests/ToStringTuple.tests.cpp | 0 .../UsageTests/ToStringVariant.tests.cpp | 0 .../UsageTests/ToStringVector.tests.cpp | 0 .../UsageTests/ToStringWhich.tests.cpp | 0 .../SelfTest/UsageTests/Tricky.tests.cpp | 0 .../UsageTests/VariadicMacros.tests.cpp | 0 .../projects/SelfTest/WarnAboutNoTests.cmake | 0 .../projects/TestScripts/testRandomOrder.py | 0 .../OCTest/OCTest.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../XCode/OCTest/OCTest/CatchOCTestCase.h | 0 .../XCode/OCTest/OCTest/CatchOCTestCase.mm | 0 .../projects/XCode/OCTest/OCTest/Main.mm | 0 .../projects/XCode/OCTest/OCTest/OCTest.1 | 0 .../projects/XCode/OCTest/OCTest/OCTest.mm | 0 .../projects/XCode/OCTest/OCTest/TestObj.h | 0 .../projects/XCode/OCTest/OCTest/TestObj.m | 0 .../projects/XCode/OCTest/catch_objc_impl.mm | 0 .../libs => }/Catch2/scripts/approvalTests.py | 0 .../libs => }/Catch2/scripts/approve.py | 0 .../Catch2/scripts/benchmarkCompile.py | 0 .../Catch2/scripts/benchmarkRunner.py | 0 .../libs => }/Catch2/scripts/developBuild.py | 0 .../libs => }/Catch2/scripts/embed.py | 0 .../libs => }/Catch2/scripts/embedClara.py | 0 .../extractFeaturesFromReleaseNotes.py | 0 .../libs => }/Catch2/scripts/fixWhitespace.py | 0 .../Catch2/scripts/generateSingleHeader.py | 0 .../libs => }/Catch2/scripts/majorRelease.py | 0 .../libs => }/Catch2/scripts/minorRelease.py | 0 .../libs => }/Catch2/scripts/patchRelease.py | 0 .../libs => }/Catch2/scripts/releaseCommon.py | 0 .../libs => }/Catch2/scripts/releaseNotes.py | 0 .../libs => }/Catch2/scripts/scriptCommon.py | 0 .../Catch2/scripts/updateDocumentToC.py | 0 .../libs => }/Catch2/scripts/updateWandbox.py | 0 .../Catch2/single_include/catch2/catch.hpp | 0 .../catch2/catch_reporter_automake.hpp | 0 .../catch2/catch_reporter_sonarqube.hpp | 0 .../catch2/catch_reporter_tap.hpp | 0 .../catch2/catch_reporter_teamcity.hpp | 0 .../libs => }/Catch2/src/catch_with_main.cpp | 0 .../libs => }/Catch2/third_party/clara.hpp | 0 libs/CommService/.gitignore | 3 - libs/CommService/.gitmodules | 3 - libs/CommService/CMakeLists.txt | 74 - libs/CommService/cmake/Jenkinsfile | 59 - .../cmake/Modules/CheckParent.cmake | 1 - libs/CommService/cmake/Modules/CppCheck.cmake | 28 - libs/CommService/cmake/Modules/FindGMP.cmake | 76 - .../cmake/Modules/FindValgrind.cmake | 25 - .../cmake/Modules/Findsodium.cmake | 269 -- .../cmake/Modules/GenerateCccc.cmake | 47 - .../cmake/Modules/GenerateCppCheck.cmake | 74 - .../cmake/Modules/ProcessDOXYGEN.cmake | 23 - .../cmake/Modules/ProcessGIT.cmake | 17 - .../cmake/Modules/add_my_test.cmake | 22 - .../cmake/Modules/c++-standards.cmake | 66 - .../cmake/Modules/code-coverage.cmake | 588 --- .../CommService/cmake/Modules/codecheck.cmake | 83 - libs/CommService/cmake/Modules/compdb.cmake | 23 - .../cmake/Modules/compiler-options.cmake | 46 - .../cmake/Modules/defaultIncludes.cmake | 15 - .../cmake/Modules/defaultOptions.cmake | 9 - libs/CommService/cmake/Modules/doxygen.cmake | 134 - .../cmake/Modules/sanitizers.cmake | 87 - libs/CommService/cmake/Modules/tools.cmake | 64 - libs/CommService/cmake/Modules/xslt.cmake | 43 - .../cmake/Toolchains/Toolchain-mingw64.cmake | 27 - .../include/CommService/CommService.hpp | 119 - .../include/CommService/Convert.hpp | 241 -- .../include/CommService/Message.hpp | 96 - .../include/CommService/PayLoads/Join.hpp | 57 - .../include/CommService/PayLoads/Leave.hpp | 56 - .../include/CommService/PayLoads/Ping.hpp | 55 - .../include/CommService/PayLoads/Pong.hpp | 53 - .../include/CommService/ThreadsafeQueue.hpp | 47 - .../include/CommService/transmittable.hpp | 31 - .../libs/CLI11/.ci/azure-build.yml | 13 - .../libs/CLI11/.ci/build_doxygen.sh | 25 - libs/CommService/libs/CLI11/.ci/build_lcov.sh | 17 - .../libs/CLI11/.ci/make_and_test.sh | 23 - .../CommService/libs/CLI11/.ci/run_codecov.sh | 27 - libs/CommService/libs/CLI11/.clang-tidy | 17 - .../libs/CLI11/.github/CONTRIBUTING.md | 102 - .../libs/CLI11/.github/dependabot.yml | 16 - .../libs/CLI11/.github/workflows/build.yml | 57 - .../libs/CLI11/.github/workflows/tests.yml | 184 - .../libs/CLI11/.pre-commit-config.yaml | 86 - libs/CommService/libs/CLI11/CLI11.hpp.in | 69 - libs/CommService/libs/CLI11/CMakeLists.txt | 331 -- .../libs/CLI11/azure-pipelines.yml | 143 - libs/CommService/libs/CLI11/conanfile.py | 48 - .../libs/CLI11/examples/CMakeLists.txt | 254 -- .../libs/CLI11/examples/custom_parse.cpp | 39 - .../libs/CLI11/examples/formatter.cpp | 37 - .../libs/CLI11/examples/groups.cpp | 39 - .../CLI11/examples/inter_argument_order.cpp | 51 - .../libs/CLI11/examples/modhelp.cpp | 35 - .../libs/CLI11/examples/option_groups.cpp | 46 - .../libs/CLI11/examples/positional_arity.cpp | 46 - .../libs/CLI11/examples/prefix_command.cpp | 35 - .../libs/CLI11/examples/ranges.cpp | 41 - .../libs/CLI11/examples/retired.cpp | 46 - .../libs/CLI11/examples/shapes.cpp | 56 - .../examples/subcom_in_files/subcommand_a.cpp | 37 - .../CLI11/examples/subcom_partitioned.cpp | 46 - .../libs/CLI11/examples/subcommands.cpp | 35 - .../libs/CLI11/examples/testEXE.cpp | 26 - .../libs/CLI11/include/CLI/App.hpp | 3246 ----------------- .../libs/CLI11/include/CLI/Config.hpp | 396 -- .../libs/CLI11/include/CLI/ConfigFwd.hpp | 185 - .../libs/CLI11/include/CLI/Error.hpp | 355 -- .../libs/CLI11/include/CLI/Formatter.hpp | 292 -- .../libs/CLI11/include/CLI/FormatterFwd.hpp | 185 - .../libs/CLI11/include/CLI/Macros.hpp | 60 - .../libs/CLI11/include/CLI/Option.hpp | 1362 ------- .../libs/CLI11/include/CLI/Split.hpp | 143 - .../libs/CLI11/include/CLI/StringTools.hpp | 430 --- .../libs/CLI11/include/CLI/Timer.hpp | 134 - .../libs/CLI11/include/CLI/TypeTools.hpp | 1558 -------- .../libs/CLI11/include/CLI/Validators.hpp | 1175 ------ .../libs/CLI11/include/CLI/Version.hpp | 16 - .../libs/CLI11/scripts/MakeSingleHeader.py | 157 - .../libs/CLI11/scripts/mdlint_style.rb | 8 - libs/CommService/libs/CLI11/tests/AppTest.cpp | 2428 ------------ .../libs/CLI11/tests/CMakeLists.txt | 221 -- .../libs/CLI11/tests/ComplexTypeTest.cpp | 191 - .../libs/CLI11/tests/ConfigFileTest.cpp | 2897 --------------- .../libs/CLI11/tests/CreationTest.cpp | 758 ---- .../libs/CLI11/tests/FormatterTest.cpp | 211 -- .../CommService/libs/CLI11/tests/HelpTest.cpp | 1275 ------- .../libs/CLI11/tests/HelpersTest.cpp | 1331 ------- .../libs/CLI11/tests/NewParseTest.cpp | 492 --- .../libs/CLI11/tests/OptionGroupTest.cpp | 797 ---- .../libs/CLI11/tests/OptionTypeTest.cpp | 1057 ------ libs/CommService/libs/CLI11/tests/SetTest.cpp | 711 ---- .../libs/CLI11/tests/StringParseTest.cpp | 117 - .../libs/CLI11/tests/SubcommandTest.cpp | 1970 ---------- .../libs/CLI11/tests/TransformTest.cpp | 970 ----- .../libs/CLI11/tests/app_helper.hpp | 67 - libs/CommService/libs/ReadMe.txt | 0 .../CommService/libs/libbattle-com/.gitignore | 3 - .../CommService/libs/libbattle-com/.gitreview | 5 - .../libs/libbattle-com/CMakeLists.txt | 140 - .../libs/libbattle-com/Jenkinsfile | 33 - libs/CommService/libs/libbattle-com/LICENSE | 373 -- libs/CommService/libs/libbattle-com/README.md | 55 - .../libs/libbattle-com/bccli/main.cpp | 49 - .../libs/libbattle-com/bccli/ping/ping.cpp | 179 - .../libs/libbattle-com/bccli/ping/ping.hpp | 23 - .../bccli/testservice/testservice.cpp | 116 - .../bccli/testservice/testservice.hpp | 34 - .../libs/libbattle-com/cmake/Jenkinsfile | 59 - .../cmake/Modules/CheckParent.cmake | 1 - .../cmake/Modules/CppCheck.cmake | 28 - .../libbattle-com/cmake/Modules/FindGMP.cmake | 76 - .../cmake/Modules/FindValgrind.cmake | 25 - .../cmake/Modules/Findsodium.cmake | 269 -- .../cmake/Modules/GenerateCccc.cmake | 47 - .../cmake/Modules/GenerateCppCheck.cmake | 74 - .../cmake/Modules/ProcessDOXYGEN.cmake | 23 - .../cmake/Modules/ProcessGIT.cmake | 17 - .../cmake/Modules/add_my_test.cmake | 22 - .../cmake/Modules/c++-standards.cmake | 66 - .../cmake/Modules/code-coverage.cmake | 588 --- .../cmake/Modules/codecheck.cmake | 83 - .../libbattle-com/cmake/Modules/compdb.cmake | 23 - .../cmake/Modules/compiler-options.cmake | 46 - .../cmake/Modules/defaultIncludes.cmake | 15 - .../cmake/Modules/defaultOptions.cmake | 9 - .../libbattle-com/cmake/Modules/doxygen.cmake | 134 - .../cmake/Modules/sanitizers.cmake | 87 - .../libbattle-com/cmake/Modules/tools.cmake | 64 - .../libbattle-com/cmake/Modules/xslt.cmake | 43 - .../cmake/Toolchains/Toolchain-mingw64.cmake | 27 - .../libs/libbattle-com/codecheck.skip | 3 - .../libs/libbattle-com/docs/Doxyfile.in | 23 - .../libs/libbattle-com/include/BC/BC.hpp | 385 -- .../include/BC/BasicMessageQueue.hpp | 80 - .../include/BC/BasicQueueReceiver.hpp | 150 - .../libbattle-com/include/BC/BasicService.hpp | 283 -- .../libs/libbattle-com/include/BC/Message.hpp | 134 - .../include/BC/Payloads/HotPlugJoin.hpp | 63 - .../include/BC/Payloads/HotPlugLeave.hpp | 63 - .../include/BC/Payloads/Ping.hpp | 63 - .../include/BC/Payloads/Pong.hpp | 60 - .../include/BC/SimpleServiceUDP.hpp | 137 - .../libbattle-com/include/BC/endianess.hpp.in | 13 - .../libbattle-com/include/BC/receiveable.hpp | 40 - .../include/BC/transmittable.hpp | 44 - .../libbattle-com/libs/CLI11/.appveyor.yml | 30 - .../libs/CLI11/.ci/azure-build.yml | 11 - .../libs/CLI11/.ci/azure-cmake.yml | 16 - .../libs/CLI11/.ci/azure-test.yml | 12 - .../libs/CLI11/.ci/build_docs.sh | 106 - .../libs/CLI11/.ci/build_doxygen.sh | 25 - .../libs/CLI11/.ci/build_lcov.sh | 17 - .../libs/CLI11/.ci/make_and_test.sh | 23 - .../libs/CLI11/.ci/run_codecov.sh | 27 - .../libbattle-com/libs/CLI11/.clang-format | 86 - .../libs/libbattle-com/libs/CLI11/.clang-tidy | 8 - .../libbattle-com/libs/CLI11/.codecov.yml | 4 - .../libbattle-com/libs/CLI11/.editorconfig | 11 - .../libs/CLI11/.github/CONTRIBUTING.md | 40 - .../libs/libbattle-com/libs/CLI11/.gitignore | 7 - .../libs/libbattle-com/libs/CLI11/.gitmodules | 9 - .../libs/libbattle-com/libs/CLI11/.travis.yml | 140 - .../libbattle-com/libs/CLI11/CHANGELOG.md | 492 --- .../libbattle-com/libs/CLI11/CMakeLists.txt | 219 -- .../libs/libbattle-com/libs/CLI11/LICENSE | 25 - .../libs/libbattle-com/libs/CLI11/README.md | 874 ----- .../libs/CLI11/azure-pipelines.yml | 76 - .../libs/CLI11/cmake/AddGoogletest.cmake | 76 - .../CLI11/cmake/CLI11ConfigVersion.cmake.in | 13 - .../libs/CLI11/cmake/CodeCoverage.cmake | 244 -- .../libbattle-com/libs/CLI11/conanfile.py | 36 - .../libbattle-com/libs/CLI11/docs/.gitignore | 2 - .../libbattle-com/libs/CLI11/docs/CLI11.svg | 114 - .../libs/CLI11/docs/CLI11_100.png | Bin 3355 -> 0 bytes .../libs/CLI11/docs/CLI11_300.png | Bin 9957 -> 0 bytes .../libbattle-com/libs/CLI11/docs/Doxyfile | 2473 ------------- .../libbattle-com/libs/CLI11/docs/mainpage.md | 26 - .../libs/CLI11/examples/CMakeLists.txt | 228 -- .../CLI11/examples/callback_passthrough.cpp | 20 - .../libs/CLI11/examples/digit_args.cpp | 15 - .../libs/CLI11/examples/enum.cpp | 25 - .../libs/CLI11/examples/formatter.cpp | 29 - .../libs/CLI11/examples/groups.cpp | 31 - .../CLI11/examples/inter_argument_order.cpp | 45 - .../libs/CLI11/examples/json.cpp | 113 - .../libs/CLI11/examples/modhelp.cpp | 30 - .../libs/CLI11/examples/nested.cpp | 22 - .../libs/CLI11/examples/option_groups.cpp | 38 - .../libs/CLI11/examples/positional_arity.cpp | 38 - .../CLI11/examples/positional_validation.cpp | 29 - .../libs/CLI11/examples/prefix_command.cpp | 26 - .../libs/CLI11/examples/ranges.cpp | 33 - .../libs/CLI11/examples/shapes.cpp | 48 - .../libs/CLI11/examples/simple.cpp | 29 - .../libs/CLI11/examples/subcom_help.cpp | 14 - .../examples/subcom_in_files/CMakeLists.txt | 1 - .../examples/subcom_in_files/subcommand_a.cpp | 33 - .../examples/subcom_in_files/subcommand_a.hpp | 20 - .../subcom_in_files/subcommand_main.cpp | 23 - .../CLI11/examples/subcom_partitioned.cpp | 37 - .../libs/CLI11/examples/subcommands.cpp | 27 - .../libs/CLI11/examples/validators.cpp | 17 - .../libs/CLI11/include/CLI/App.hpp | 2812 -------------- .../libs/CLI11/include/CLI/CLI.hpp | 35 - .../libs/CLI11/include/CLI/Config.hpp | 73 - .../libs/CLI11/include/CLI/ConfigFwd.hpp | 144 - .../libs/CLI11/include/CLI/Error.hpp | 322 -- .../libs/CLI11/include/CLI/Formatter.hpp | 273 -- .../libs/CLI11/include/CLI/FormatterFwd.hpp | 176 - .../libs/CLI11/include/CLI/Macros.hpp | 41 - .../libs/CLI11/include/CLI/Option.hpp | 1020 ------ .../libs/CLI11/include/CLI/Optional.hpp | 97 - .../libs/CLI11/include/CLI/Split.hpp | 133 - .../libs/CLI11/include/CLI/StringTools.hpp | 379 -- .../libs/CLI11/include/CLI/Timer.hpp | 130 - .../libs/CLI11/include/CLI/TypeTools.hpp | 388 -- .../libs/CLI11/include/CLI/Validators.hpp | 976 ----- .../libs/CLI11/include/CLI/Version.hpp | 13 - .../libs/CLI11/scripts/MakeSingleHeader.py | 160 - .../libs/CLI11/scripts/UpdateDownloadProj.py | 24 - .../libs/CLI11/scripts/check_style.sh | 10 - .../libs/CLI11/scripts/check_style_docker.sh | 14 - .../CLI11/scripts/clang-format-pre-commit | 36 - .../libs/CLI11/test_package/CMakeLists.txt | 16 - .../libs/CLI11/test_package/conanfile.py | 19 - .../libs/CLI11/test_package/example.cpp | 20 - .../libs/CLI11/tests/.syntastic_cpp_config | 1 - .../libs/CLI11/tests/AppTest.cpp | 2213 ----------- .../libs/CLI11/tests/CMakeLists.txt | 143 - .../libs/CLI11/tests/CreationTest.cpp | 763 ---- .../libs/CLI11/tests/DeprecatedTest.cpp | 542 --- .../libs/CLI11/tests/FormatterTest.cpp | 193 - .../libs/CLI11/tests/HelpTest.cpp | 974 ----- .../libs/CLI11/tests/HelpersTest.cpp | 893 ----- .../libs/CLI11/tests/IniTest.cpp | 891 ----- .../libs/CLI11/tests/NewParseTest.cpp | 261 -- .../libs/CLI11/tests/OptionGroupTest.cpp | 720 ---- .../libs/CLI11/tests/OptionalTest.cpp | 83 - .../libs/CLI11/tests/SetTest.cpp | 703 ---- .../libs/CLI11/tests/SimpleTest.cpp | 28 - .../libs/CLI11/tests/StringParseTest.cpp | 75 - .../libs/CLI11/tests/SubcommandTest.cpp | 1420 ------- .../libs/CLI11/tests/TimerTest.cpp | 64 - .../libs/CLI11/tests/TransformTest.cpp | 836 ----- .../libs/CLI11/tests/TrueFalseTest.cpp | 30 - .../libs/CLI11/tests/WindowsTest.cpp | 13 - .../libs/CLI11/tests/app_helper.hpp | 57 - .../libs/CLI11/tests/informational.cpp | 50 - .../libs/CLI11/tests/link_test_1.cpp | 4 - .../libs/CLI11/tests/link_test_2.cpp | 11 - .../libs/libbattle-com/libs/CRCpp/.gitignore | 41 - .../libs/libbattle-com/libs/CRCpp/LICENSE | 28 - .../libs/libbattle-com/libs/CRCpp/README.md | 154 - .../libs/libbattle-com/libs/CRCpp/inc/CRC.h | 1719 --------- .../libs/CRCpp/test/prj/VS2015/UnitTest.sln | 28 - .../CRCpp/test/prj/VS2015/UnitTest.vcxproj | 161 - .../test/prj/VS2015/UnitTest.vcxproj.filters | 28 - .../libs/CRCpp/test/prj/gcc/Makefile | 54 - .../libs/CRCpp/test/src/main.cpp | 265 -- .../libbattle-com/src/BasicMessageQueue.cpp | 73 - .../libbattle-com/src/BasicQueueReceiver.cpp | 128 - .../libs/libbattle-com/src/BasicService.cpp | 234 -- .../libs/libbattle-com/src/Message.cpp | 182 - .../src/Payloads/HotPlugJoin.cpp | 60 - .../src/Payloads/HotPlugLeave.cpp | 61 - .../libs/libbattle-com/src/Payloads/Ping.cpp | 84 - .../libs/libbattle-com/src/Payloads/Pong.cpp | 67 - .../libbattle-com/src/SimpleServiceUDP.cpp | 397 -- .../libs/libbattle-com/src/config.hpp.in | 33 - .../src/convert/stringConvert.cpp | 41 - .../tests/test_basic_message_queue.cpp | 107 - .../tests/test_basic_queue_receiver.cpp | 79 - .../tests/test_simple_conversion.cpp | 97 - .../tests/test_simple_service_udp.cpp | 139 - libs/CommService/libs/loguru/.gitignore | 2 - libs/CommService/libs/loguru/CMakeLists.txt | 8 - libs/CommService/libs/loguru/README.md | 232 -- libs/CommService/libs/loguru/appveyor.yml | 12 - libs/CommService/libs/loguru/docs/index.html | 726 ---- .../libs/loguru/docs/terminal_colors.png | Bin 201172 -> 0 bytes .../libs/loguru/glog_bench/CMakeLists.txt | 71 - .../libs/loguru/glog_bench/build_and_run.sh | 12 - .../libs/loguru/glog_bench/glog_bench.cpp | 93 - .../libs/loguru/glog_example/CMakeLists.txt | 71 - .../libs/loguru/glog_example/build_and_run.sh | 12 - .../libs/loguru/glog_example/glog_example.hpp | 26 - .../libs/loguru/glog_example/main.cpp | 13 - .../libs/loguru/lnav_format_loguru_cpp.json | 32 - libs/CommService/libs/loguru/loguru.cpp | 2037 ----------- libs/CommService/libs/loguru/loguru.hpp | 1482 -------- .../libs/loguru/loguru_bench/CMakeLists.txt | 22 - .../libs/loguru/loguru_bench/build_and_run.sh | 12 - .../libs/loguru/loguru_bench/loguru_bench.cpp | 121 - .../libs/loguru/loguru_example/CMakeLists.txt | 39 - .../loguru/loguru_example/build_and_run.sh | 12 - .../loguru/loguru_example/loguru_example.hpp | 26 - .../libs/loguru/loguru_example/main.cpp | 13 - .../libs/loguru/test/CMakeLists.txt | 80 - .../libs/loguru/test/appveyor.cmake | 50 - libs/CommService/libs/loguru/test/build.sh | 21 - .../libs/loguru/test/build_and_run.cmake | 45 - .../libs/loguru/test/build_and_run.sh | 57 - .../libs/loguru/test/fail_test_wrapper.cmake | 24 - .../libs/loguru/test/loguru_test.cpp | 432 --- .../src/CommService/CommService.cpp | 401 -- libs/CommService/src/CommService/Message.cpp | 98 - .../src/CommService/PayLoads/Join.cpp | 56 - .../src/CommService/PayLoads/Leave.cpp | 66 - .../src/CommService/PayLoads/Ping.cpp | 80 - .../src/CommService/PayLoads/Pong.cpp | 70 - libs/CommService/src/main.cpp | 53 - libs/EntityLibrary | 1 + libs/cli11/.all-contributorsrc | 483 --- libs/cli11/.appveyor.yml | 38 - libs/cli11/.ci/azure-cmake.yml | 17 - libs/cli11/.ci/azure-test.yml | 9 - libs/cli11/.clang-format | 86 - libs/cli11/.cmake-format.yaml | 6 - libs/cli11/.codecov.yml | 3 - libs/cli11/.editorconfig | 13 - .../.github/actions/quick_cmake/action.yml | 25 - libs/cli11/.github/labeler_merged.yml | 4 - libs/cli11/.github/workflows/pr_merged.yml | 15 - libs/cli11/.gitignore | 15 - libs/cli11/.remarkrc | 7 - libs/cli11/CHANGELOG.md | 964 ----- libs/cli11/CLI11.CPack.Description.txt | 1 - libs/cli11/CPPLINT.cfg | 13 - libs/cli11/LICENSE | 25 - libs/cli11/README.md | 1767 --------- libs/cli11/book/.gitignore | 20 - libs/cli11/book/CMakeLists.txt | 7 - libs/cli11/book/README.md | 94 - libs/cli11/book/SUMMARY.md | 15 - libs/cli11/book/book.json | 12 - libs/cli11/book/chapters/advanced-topics.md | 152 - .../book/chapters/an-advanced-example.md | 39 - libs/cli11/book/chapters/basics.md | 39 - libs/cli11/book/chapters/config.md | 340 -- libs/cli11/book/chapters/flags.md | 167 - libs/cli11/book/chapters/formatting.md | 86 - libs/cli11/book/chapters/installation.md | 114 - libs/cli11/book/chapters/internals.md | 54 - libs/cli11/book/chapters/options.md | 459 --- libs/cli11/book/chapters/subcommands.md | 194 - libs/cli11/book/chapters/toolkits.md | 40 - libs/cli11/book/chapters/validators.md | 66 - libs/cli11/book/code/CMakeLists.txt | 32 - libs/cli11/book/code/flags.cpp | 36 - libs/cli11/book/code/geet.cpp | 50 - libs/cli11/book/code/intro.cpp | 15 - libs/cli11/book/code/simplest.cpp | 11 - libs/cli11/cmake/CLI11.pc.in | 9 - libs/cli11/cmake/CLI11ConfigVersion.cmake.in | 13 - libs/cli11/cmake/CLI11GeneratePkgConfig.cmake | 3 - libs/cli11/cmake/CodeCoverage.cmake | 243 -- libs/cli11/docs/.gitignore | 2 - libs/cli11/docs/CLI11.svg | 114 - libs/cli11/docs/CLI11_100.png | Bin 3355 -> 0 bytes libs/cli11/docs/CLI11_300.png | Bin 9957 -> 0 bytes libs/cli11/docs/CMakeLists.txt | 11 - libs/cli11/docs/Doxyfile | 2475 ------------- libs/cli11/docs/mainpage.md | 24 - libs/cli11/examples/callback_passthrough.cpp | 28 - libs/cli11/examples/config_app.cpp | 50 - libs/cli11/examples/digit_args.cpp | 21 - libs/cli11/examples/enum.cpp | 33 - libs/cli11/examples/enum_ostream.cpp | 50 - libs/cli11/examples/json.cpp | 123 - libs/cli11/examples/nested.cpp | 30 - libs/cli11/examples/positional_validation.cpp | 37 - libs/cli11/examples/simple.cpp | 38 - libs/cli11/examples/subcom_help.cpp | 21 - .../examples/subcom_in_files/CMakeLists.txt | 1 - .../examples/subcom_in_files/subcommand_a.hpp | 23 - .../subcom_in_files/subcommand_main.cpp | 26 - libs/cli11/examples/validators.cpp | 25 - libs/cli11/include/CLI/CLI.hpp | 36 - libs/cli11/meson.build | 23 - libs/cli11/meson_options.txt | 1 - libs/cli11/scripts/ExtractVersion.py | 17 - libs/cli11/scripts/check_style.sh | 10 - libs/cli11/scripts/check_style_docker.sh | 14 - libs/cli11/scripts/clang-format-pre-commit | 36 - libs/cli11/subprojects/catch2.wrap | 11 - libs/cli11/test_package/CMakeLists.txt | 16 - libs/cli11/test_package/conanfile.py | 21 - libs/cli11/test_package/example.cpp | 20 - libs/cli11/tests/.syntastic_cpp_config | 1 - libs/cli11/tests/BoostOptionTypeTest.cpp | 126 - libs/cli11/tests/DeprecatedTest.cpp | 14 - libs/cli11/tests/OptionalTest.cpp | 357 -- libs/cli11/tests/SimpleTest.cpp | 34 - libs/cli11/tests/TimerTest.cpp | 70 - libs/cli11/tests/TrueFalseTest.cpp | 29 - libs/cli11/tests/WindowsTest.cpp | 19 - libs/cli11/tests/catch.hpp | 9 - libs/cli11/tests/informational.cpp | 56 - libs/cli11/tests/link_test_1.cpp | 10 - libs/cli11/tests/link_test_2.cpp | 17 - libs/cli11/tests/main.cpp | 8 - libs/cli11/tests/meson.build | 78 - libs/cli11/tests/mesonTest/README.md | 10 - libs/cli11/tests/mesonTest/main.cpp | 17 - libs/cli11/tests/mesonTest/meson.build | 5 - src/SimControl/SimControl.cpp | 127 +- src/main.cpp | 3 +- 970 files changed, 453 insertions(+), 79862 deletions(-) create mode 100644 .gitmodules create mode 100644 cmake/Modules/protobuf.cmake rename libs/{CommService/libs => }/CLI11/.all-contributorsrc (100%) rename libs/{CommService/libs => }/CLI11/.appveyor.yml (93%) rename libs/{cli11 => CLI11}/.ci/azure-build.yml (100%) rename libs/{CommService/libs => }/CLI11/.ci/azure-cmake.yml (100%) rename libs/{CommService/libs => }/CLI11/.ci/azure-test.yml (100%) rename libs/{CommService/libs => }/CLI11/.clang-format (100%) rename libs/{cli11 => CLI11}/.clang-tidy (100%) rename libs/{CommService/libs => }/CLI11/.cmake-format.yaml (100%) rename libs/{CommService/libs => }/CLI11/.codecov.yml (100%) rename libs/{CommService/libs => }/CLI11/.editorconfig (100%) rename libs/{cli11 => CLI11}/.github/CONTRIBUTING.md (100%) rename libs/{CommService/libs => }/CLI11/.github/actions/quick_cmake/action.yml (100%) rename libs/{cli11 => CLI11}/.github/codecov.yml (100%) rename libs/{cli11 => CLI11}/.github/dependabot.yml (100%) rename libs/{CommService/libs => }/CLI11/.github/labeler_merged.yml (100%) rename libs/{cli11 => CLI11}/.github/workflows/build.yml (100%) rename libs/{CommService/libs => }/CLI11/.github/workflows/pr_merged.yml (100%) rename libs/{cli11 => CLI11}/.github/workflows/tests.yml (95%) rename libs/{CommService/libs => }/CLI11/.gitignore (100%) rename libs/{cli11 => CLI11}/.pre-commit-config.yaml (90%) rename libs/{CommService/libs => }/CLI11/.remarkrc (100%) rename libs/{CommService/libs => }/CLI11/CHANGELOG.md (95%) rename libs/{CommService/libs => }/CLI11/CLI11.CPack.Description.txt (100%) rename libs/{cli11 => CLI11}/CLI11.hpp.in (100%) rename libs/{cli11 => CLI11}/CMakeLists.txt (100%) rename libs/{CommService/libs => }/CLI11/CPPLINT.cfg (100%) rename libs/{CommService/libs => }/CLI11/LICENSE (100%) rename libs/{CommService/libs => }/CLI11/README.md (99%) rename libs/{cli11 => CLI11}/azure-pipelines.yml (100%) rename libs/{CommService/libs => }/CLI11/book/.gitignore (100%) rename libs/{CommService/libs => }/CLI11/book/CMakeLists.txt (100%) rename libs/{CommService/libs => }/CLI11/book/README.md (100%) rename libs/{CommService/libs => }/CLI11/book/SUMMARY.md (100%) rename libs/{CommService/libs => }/CLI11/book/book.json (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/advanced-topics.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/an-advanced-example.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/basics.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/config.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/flags.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/formatting.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/installation.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/internals.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/options.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/subcommands.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/toolkits.md (100%) rename libs/{CommService/libs => }/CLI11/book/chapters/validators.md (100%) rename libs/{CommService/libs => }/CLI11/book/code/CMakeLists.txt (100%) rename libs/{CommService/libs => }/CLI11/book/code/flags.cpp (100%) rename libs/{CommService/libs => }/CLI11/book/code/geet.cpp (100%) rename libs/{CommService/libs => }/CLI11/book/code/intro.cpp (100%) rename libs/{CommService/libs => }/CLI11/book/code/simplest.cpp (100%) rename libs/{CommService/libs => }/CLI11/cmake/CLI11.pc.in (100%) rename libs/{CommService/libs => }/CLI11/cmake/CLI11ConfigVersion.cmake.in (100%) rename libs/{CommService/libs => }/CLI11/cmake/CLI11GeneratePkgConfig.cmake (100%) rename libs/{cli11 => CLI11}/cmake/CLI11Warnings.cmake (100%) rename libs/{CommService/libs => }/CLI11/cmake/CodeCoverage.cmake (100%) rename libs/{cli11 => CLI11}/conanfile.py (95%) rename libs/{CommService/libs => }/CLI11/docs/.gitignore (100%) rename libs/{CommService/libs => }/CLI11/docs/CLI11.svg (100%) rename libs/{CommService/libs => }/CLI11/docs/CLI11_100.png (100%) rename libs/{CommService/libs => }/CLI11/docs/CLI11_300.png (100%) rename libs/{CommService/libs => }/CLI11/docs/CMakeLists.txt (100%) rename libs/{CommService/libs => }/CLI11/docs/Doxyfile (100%) rename libs/{CommService/libs => }/CLI11/docs/mainpage.md (100%) rename libs/{cli11 => CLI11}/examples/CMakeLists.txt (100%) rename libs/{CommService/libs => }/CLI11/examples/callback_passthrough.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/config_app.cpp (100%) rename libs/{cli11 => CLI11}/examples/custom_parse.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/digit_args.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/enum.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/enum_ostream.cpp (100%) rename libs/{cli11 => CLI11}/examples/formatter.cpp (100%) rename libs/{cli11 => CLI11}/examples/groups.cpp (100%) rename libs/{cli11 => CLI11}/examples/inter_argument_order.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/json.cpp (100%) rename libs/{cli11 => CLI11}/examples/modhelp.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/nested.cpp (100%) rename libs/{cli11 => CLI11}/examples/option_groups.cpp (100%) rename libs/{cli11 => CLI11}/examples/positional_arity.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/positional_validation.cpp (100%) rename libs/{cli11 => CLI11}/examples/prefix_command.cpp (100%) rename libs/{cli11 => CLI11}/examples/ranges.cpp (100%) rename libs/{cli11 => CLI11}/examples/retired.cpp (100%) rename libs/{cli11 => CLI11}/examples/shapes.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/simple.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/subcom_help.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/subcom_in_files/CMakeLists.txt (100%) rename libs/{cli11 => CLI11}/examples/subcom_in_files/subcommand_a.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/subcom_in_files/subcommand_a.hpp (100%) rename libs/{CommService/libs => }/CLI11/examples/subcom_in_files/subcommand_main.cpp (100%) rename libs/{cli11 => CLI11}/examples/subcom_partitioned.cpp (100%) rename libs/{cli11 => CLI11}/examples/subcommands.cpp (100%) rename libs/{cli11 => CLI11}/examples/testEXE.cpp (100%) rename libs/{CommService/libs => }/CLI11/examples/validators.cpp (100%) rename libs/{cli11 => CLI11}/include/CLI/App.hpp (100%) rename libs/{CommService/libs => }/CLI11/include/CLI/CLI.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/Config.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/ConfigFwd.hpp (99%) rename libs/{cli11 => CLI11}/include/CLI/Error.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/Formatter.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/FormatterFwd.hpp (96%) rename libs/{cli11 => CLI11}/include/CLI/Macros.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/Option.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/Split.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/StringTools.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/Timer.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/TypeTools.hpp (98%) rename libs/{cli11 => CLI11}/include/CLI/Validators.hpp (99%) rename libs/{cli11 => CLI11}/include/CLI/Version.hpp (78%) rename libs/{cli11 => CLI11}/include/CLI/impl/App_inl.hpp (98%) rename libs/{cli11 => CLI11}/include/CLI/impl/Config_inl.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/impl/Formatter_inl.hpp (98%) rename libs/{cli11 => CLI11}/include/CLI/impl/Option_inl.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/impl/Split_inl.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/impl/StringTools_inl.hpp (100%) rename libs/{cli11 => CLI11}/include/CLI/impl/Validators_inl.hpp (99%) rename libs/{CommService/libs => }/CLI11/meson.build (100%) rename libs/{CommService/libs => }/CLI11/meson_options.txt (100%) rename libs/{CommService/libs => }/CLI11/scripts/ExtractVersion.py (100%) rename libs/{cli11 => CLI11}/scripts/MakeSingleHeader.py (100%) rename libs/{CommService/libs => }/CLI11/scripts/check_style.sh (100%) rename libs/{CommService/libs => }/CLI11/scripts/check_style_docker.sh (100%) rename libs/{CommService/libs => }/CLI11/scripts/clang-format-pre-commit (100%) rename libs/{cli11 => CLI11}/scripts/mdlint_style.rb (90%) rename libs/{cli11 => CLI11}/src/CMakeLists.txt (100%) rename libs/{cli11 => CLI11}/src/Precompile.cpp (100%) rename libs/{CommService/libs => }/CLI11/subprojects/catch2.wrap (100%) rename libs/{CommService/libs => }/CLI11/test_package/CMakeLists.txt (100%) rename libs/{CommService/libs => }/CLI11/test_package/conanfile.py (100%) rename libs/{CommService/libs => }/CLI11/test_package/example.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/.syntastic_cpp_config (100%) rename libs/{cli11 => CLI11}/tests/AppTest.cpp (98%) rename libs/{CommService/libs => }/CLI11/tests/BoostOptionTypeTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/CMakeLists.txt (100%) rename libs/{cli11 => CLI11}/tests/ComplexTypeTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/ConfigFileTest.cpp (97%) rename libs/{cli11 => CLI11}/tests/CreationTest.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/DeprecatedTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/FormatterTest.cpp (95%) rename libs/{cli11 => CLI11}/tests/HelpTest.cpp (98%) rename libs/{cli11 => CLI11}/tests/HelpersTest.cpp (99%) rename libs/{cli11 => CLI11}/tests/NewParseTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/OptionGroupTest.cpp (99%) rename libs/{cli11 => CLI11}/tests/OptionTypeTest.cpp (93%) rename libs/{CommService/libs => }/CLI11/tests/OptionalTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/SetTest.cpp (98%) rename libs/{CommService/libs => }/CLI11/tests/SimpleTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/StringParseTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/SubcommandTest.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/TimerTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/TransformTest.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/TrueFalseTest.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/WindowsTest.cpp (100%) rename libs/{cli11 => CLI11}/tests/app_helper.hpp (94%) rename libs/{CommService/libs => }/CLI11/tests/catch.hpp (100%) rename libs/{CommService/libs => }/CLI11/tests/informational.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/link_test_1.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/link_test_2.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/main.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/meson.build (100%) rename libs/{CommService/libs => }/CLI11/tests/mesonTest/README.md (100%) rename libs/{CommService/libs => }/CLI11/tests/mesonTest/main.cpp (100%) rename libs/{CommService/libs => }/CLI11/tests/mesonTest/meson.build (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.clang-format (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.conan/build.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.conan/test_package/CMakeLists.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.conan/test_package/conanfile.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.conan/test_package/test_package.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.gitattributes (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.github/FUNDING.yml (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.github/ISSUE_TEMPLATE/bug_report.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.github/ISSUE_TEMPLATE/feature_request.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.github/pull_request_template.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.gitignore (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/.travis.yml (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/BUILD.bazel (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMake/Catch2Config.cmake.in (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMake/FindGcov.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMake/FindLcov.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMake/Findcodecov.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMake/MiscFunctions.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMake/catch2.pc.in (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMake/llvm-cov-wrapper (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CMakeLists.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/CODE_OF_CONDUCT.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/LICENSE.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/README.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/WORKSPACE (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/appveyor.yml (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/artwork/catch2-c-logo.png (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/artwork/catch2-hand-logo.png (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/artwork/catch2-logo-small.png (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/codecov.yml (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/conanfile.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/contrib/Catch.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/contrib/CatchAddTests.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/contrib/ParseAndAddCatchTests.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/contrib/gdbinit (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/contrib/lldbinit (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/Readme.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/assertions.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/benchmarks.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/ci-and-misc.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/cmake-integration.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/command-line.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/commercial-users.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/configuration.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/contributing.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/deprecations.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/event-listeners.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/generators.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/limitations.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/list-of-examples.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/logging.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/matchers.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/opensource-users.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/other-macros.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/own-main.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/release-notes.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/release-process.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/reporters.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/slow-compiles.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/test-cases-and-sections.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/test-fixtures.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/tostring.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/tutorial.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/docs/why-catch.md (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/000-CatchMain.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/010-TestCase.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/020-TestCase-1.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/020-TestCase-2.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/030-Asn-Require-Check.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/100-Fix-Section.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/110-Fix-ClassFixture.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/200-Rpt-CatchMain.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/207-Rpt-TeamCityReporter.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/210-Evt-EventListeners.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/231-Cfg-OutputStreams.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/300-Gen-OwnGenerator.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/301-Gen-MapTypeConversion.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/302-Gen-Table.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/310-Gen-VariablesInGenerators.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/311-Gen-CustomCapture.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/examples/CMakeLists.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/catch.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/catch_with_main.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/external/clara.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_benchmark.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_benchmarking_all.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_chronometer.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_clock.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_constructor.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_environment.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_estimate.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_execution_plan.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_optimizer.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_outlier_classification.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/catch_sample_analysis.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_analyse.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_benchmark_function.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_complete_invoke.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_estimate_clock.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_measure.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_repeat.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_run_for_at_least.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_stats.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_stats.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/benchmark/detail/catch_timing.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_approx.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_approx.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_assertionhandler.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_assertionhandler.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_assertioninfo.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_assertionresult.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_assertionresult.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_capture.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_capture_matchers.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_capture_matchers.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_clara.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_commandline.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_commandline.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_common.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_common.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_compiler_capabilities.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_config.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_config.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_config_uncaught_exceptions.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_console_colour.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_console_colour.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_context.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_context.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_debug_console.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_debug_console.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_debugger.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_debugger.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_decomposer.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_decomposer.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_default_main.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_enforce.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_enforce.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_enum_values_registry.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_enum_values_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_errno_guard.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_errno_guard.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_exception_translator_registry.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_exception_translator_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_external_interfaces.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_fatal_condition.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_fatal_condition.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_generators.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_generators.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_generators_generic.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_generators_specific.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_impl.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_capture.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_capture.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_config.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_config.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_enum_values_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_exception.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_exception.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_generatortracker.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_registry_hub.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_registry_hub.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_reporter.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_reporter.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_runner.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_runner.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_tag_alias_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_testcase.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_interfaces_testcase.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_leak_detector.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_leak_detector.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_list.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_list.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_exception.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_exception.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_floating.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_floating.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_generic.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_generic.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_string.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_string.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_matchers_vector.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_message.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_message.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_meta.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_objc.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_objc_arc.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_option.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_output_redirect.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_output_redirect.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_platform.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_polyfills.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_polyfills.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_preprocessor.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_random_number_generator.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_random_number_generator.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_reenable_warnings.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_registry_hub.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_reporter_registrars.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_reporter_registry.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_reporter_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_result_type.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_result_type.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_run_context.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_run_context.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_section.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_section.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_section_info.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_section_info.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_session.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_session.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_singletons.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_singletons.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_startup_exception_registry.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_startup_exception_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_stream.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_stream.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_string_manip.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_string_manip.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_stringref.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_stringref.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_suppress_warnings.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tag_alias.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tag_alias.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tag_alias_autoregistrar.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tag_alias_autoregistrar.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tag_alias_registry.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tag_alias_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_case_info.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_case_info.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_case_registry_impl.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_case_registry_impl.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_case_tracker.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_case_tracker.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_registry.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_registry.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_spec.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_spec.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_spec_parser.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_test_spec_parser.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_text.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_timer.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_timer.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_to_string.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tostring.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_tostring.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_totals.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_totals.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_uncaught_exceptions.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_uncaught_exceptions.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_user_interfaces.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_version.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_version.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_wildcard_pattern.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_wildcard_pattern.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_windows_h_proxy.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_xmlwriter.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/internal/catch_xmlwriter.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_automake.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_bases.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_bases.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_compact.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_compact.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_console.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_console.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_junit.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_junit.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_listening.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_listening.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_sonarqube.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_tap.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_teamcity.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_xml.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/include/reporters/catch_reporter_xml.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/misc/CMakeLists.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/misc/appveyorBuildConfigurationScript.bat (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/misc/appveyorMergeCoverageScript.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/misc/appveyorTestRunScript.bat (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/misc/coverage-helper.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/misc/installOpenCppCoverage.ps1 (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/CMakeLists.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/CMakeLists.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/ToDo.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X01-PrefixedMacros.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X02-DisabledMacros.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X10-FallbackStringifier.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X11-DisableStringification.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X12-CustomDebugBreakMacro.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X20-BenchmarkingMacros.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/ExtraTests/X90-WindowsHeaderInclusion.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/automake.std.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/console.std.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/sonarqube.sw.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/CompileTimePerfTests/10.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/CompileTimePerfTests/100.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/CompileTimePerfTests/All.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/Details.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/String.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Misc/invalid-test-names.input (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Misc/plain-old-tests.input (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/Misc/special-characters-in-file.input (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_debugger.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_option.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_stream.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/TestMain.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/TimingTests/Sleep.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Approx.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/BDD.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Benchmark.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Class.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Compilation.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Condition.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Decomposition.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/EnumToString.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Exception.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Generators.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Message.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Misc.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringByte.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringChrono.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringGeneral.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringOptional.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringPair.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringTuple.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringVector.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/ToStringWhich.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/Tricky.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/UsageTests/VariadicMacros.tests.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/SelfTest/WarnAboutNoTests.cmake (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/TestScripts/testRandomOrder.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.mm (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest/Main.mm (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest/OCTest.1 (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest/OCTest.mm (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest/TestObj.h (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/OCTest/TestObj.m (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/projects/XCode/OCTest/catch_objc_impl.mm (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/approvalTests.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/approve.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/benchmarkCompile.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/benchmarkRunner.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/developBuild.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/embed.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/embedClara.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/extractFeaturesFromReleaseNotes.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/fixWhitespace.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/generateSingleHeader.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/majorRelease.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/minorRelease.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/patchRelease.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/releaseCommon.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/releaseNotes.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/scriptCommon.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/updateDocumentToC.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/scripts/updateWandbox.py (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/single_include/catch2/catch.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/single_include/catch2/catch_reporter_automake.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/single_include/catch2/catch_reporter_sonarqube.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/single_include/catch2/catch_reporter_tap.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/single_include/catch2/catch_reporter_teamcity.hpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/src/catch_with_main.cpp (100%) rename libs/{CommService/libs/libbattle-com/libs => }/Catch2/third_party/clara.hpp (100%) delete mode 100644 libs/CommService/.gitignore delete mode 100644 libs/CommService/.gitmodules delete mode 100644 libs/CommService/CMakeLists.txt delete mode 100644 libs/CommService/cmake/Jenkinsfile delete mode 100644 libs/CommService/cmake/Modules/CheckParent.cmake delete mode 100644 libs/CommService/cmake/Modules/CppCheck.cmake delete mode 100644 libs/CommService/cmake/Modules/FindGMP.cmake delete mode 100644 libs/CommService/cmake/Modules/FindValgrind.cmake delete mode 100644 libs/CommService/cmake/Modules/Findsodium.cmake delete mode 100644 libs/CommService/cmake/Modules/GenerateCccc.cmake delete mode 100644 libs/CommService/cmake/Modules/GenerateCppCheck.cmake delete mode 100644 libs/CommService/cmake/Modules/ProcessDOXYGEN.cmake delete mode 100644 libs/CommService/cmake/Modules/ProcessGIT.cmake delete mode 100644 libs/CommService/cmake/Modules/add_my_test.cmake delete mode 100644 libs/CommService/cmake/Modules/c++-standards.cmake delete mode 100644 libs/CommService/cmake/Modules/code-coverage.cmake delete mode 100644 libs/CommService/cmake/Modules/codecheck.cmake delete mode 100644 libs/CommService/cmake/Modules/compdb.cmake delete mode 100644 libs/CommService/cmake/Modules/compiler-options.cmake delete mode 100644 libs/CommService/cmake/Modules/defaultIncludes.cmake delete mode 100644 libs/CommService/cmake/Modules/defaultOptions.cmake delete mode 100644 libs/CommService/cmake/Modules/doxygen.cmake delete mode 100644 libs/CommService/cmake/Modules/sanitizers.cmake delete mode 100644 libs/CommService/cmake/Modules/tools.cmake delete mode 100644 libs/CommService/cmake/Modules/xslt.cmake delete mode 100644 libs/CommService/cmake/Toolchains/Toolchain-mingw64.cmake delete mode 100644 libs/CommService/include/CommService/CommService.hpp delete mode 100644 libs/CommService/include/CommService/Convert.hpp delete mode 100644 libs/CommService/include/CommService/Message.hpp delete mode 100644 libs/CommService/include/CommService/PayLoads/Join.hpp delete mode 100644 libs/CommService/include/CommService/PayLoads/Leave.hpp delete mode 100644 libs/CommService/include/CommService/PayLoads/Ping.hpp delete mode 100644 libs/CommService/include/CommService/PayLoads/Pong.hpp delete mode 100644 libs/CommService/include/CommService/ThreadsafeQueue.hpp delete mode 100644 libs/CommService/include/CommService/transmittable.hpp delete mode 100644 libs/CommService/libs/CLI11/.ci/azure-build.yml delete mode 100644 libs/CommService/libs/CLI11/.ci/build_doxygen.sh delete mode 100644 libs/CommService/libs/CLI11/.ci/build_lcov.sh delete mode 100755 libs/CommService/libs/CLI11/.ci/make_and_test.sh delete mode 100755 libs/CommService/libs/CLI11/.ci/run_codecov.sh delete mode 100644 libs/CommService/libs/CLI11/.clang-tidy delete mode 100644 libs/CommService/libs/CLI11/.github/CONTRIBUTING.md delete mode 100644 libs/CommService/libs/CLI11/.github/dependabot.yml delete mode 100644 libs/CommService/libs/CLI11/.github/workflows/build.yml delete mode 100644 libs/CommService/libs/CLI11/.github/workflows/tests.yml delete mode 100644 libs/CommService/libs/CLI11/.pre-commit-config.yaml delete mode 100644 libs/CommService/libs/CLI11/CLI11.hpp.in delete mode 100644 libs/CommService/libs/CLI11/CMakeLists.txt delete mode 100644 libs/CommService/libs/CLI11/azure-pipelines.yml delete mode 100644 libs/CommService/libs/CLI11/conanfile.py delete mode 100644 libs/CommService/libs/CLI11/examples/CMakeLists.txt delete mode 100644 libs/CommService/libs/CLI11/examples/custom_parse.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/formatter.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/groups.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/inter_argument_order.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/modhelp.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/option_groups.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/positional_arity.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/prefix_command.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/ranges.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/retired.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/shapes.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_a.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/subcom_partitioned.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/subcommands.cpp delete mode 100644 libs/CommService/libs/CLI11/examples/testEXE.cpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/App.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Config.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/ConfigFwd.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Error.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Formatter.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/FormatterFwd.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Macros.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Option.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Split.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/StringTools.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Timer.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/TypeTools.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Validators.hpp delete mode 100644 libs/CommService/libs/CLI11/include/CLI/Version.hpp delete mode 100755 libs/CommService/libs/CLI11/scripts/MakeSingleHeader.py delete mode 100644 libs/CommService/libs/CLI11/scripts/mdlint_style.rb delete mode 100644 libs/CommService/libs/CLI11/tests/AppTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/CMakeLists.txt delete mode 100644 libs/CommService/libs/CLI11/tests/ComplexTypeTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/ConfigFileTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/CreationTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/FormatterTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/HelpTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/HelpersTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/NewParseTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/OptionGroupTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/OptionTypeTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/SetTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/StringParseTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/SubcommandTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/TransformTest.cpp delete mode 100644 libs/CommService/libs/CLI11/tests/app_helper.hpp delete mode 100644 libs/CommService/libs/ReadMe.txt delete mode 100644 libs/CommService/libs/libbattle-com/.gitignore delete mode 100644 libs/CommService/libs/libbattle-com/.gitreview delete mode 100644 libs/CommService/libs/libbattle-com/CMakeLists.txt delete mode 100644 libs/CommService/libs/libbattle-com/Jenkinsfile delete mode 100644 libs/CommService/libs/libbattle-com/LICENSE delete mode 100644 libs/CommService/libs/libbattle-com/README.md delete mode 100644 libs/CommService/libs/libbattle-com/bccli/main.cpp delete mode 100644 libs/CommService/libs/libbattle-com/bccli/ping/ping.cpp delete mode 100644 libs/CommService/libs/libbattle-com/bccli/ping/ping.hpp delete mode 100644 libs/CommService/libs/libbattle-com/bccli/testservice/testservice.cpp delete mode 100644 libs/CommService/libs/libbattle-com/bccli/testservice/testservice.hpp delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Jenkinsfile delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/CheckParent.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/CppCheck.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/FindGMP.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/FindValgrind.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/Findsodium.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/GenerateCccc.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/GenerateCppCheck.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/ProcessDOXYGEN.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/ProcessGIT.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/add_my_test.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/c++-standards.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/code-coverage.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/codecheck.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/compdb.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/compiler-options.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/defaultIncludes.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/defaultOptions.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/doxygen.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/sanitizers.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/tools.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Modules/xslt.cmake delete mode 100644 libs/CommService/libs/libbattle-com/cmake/Toolchains/Toolchain-mingw64.cmake delete mode 100644 libs/CommService/libs/libbattle-com/codecheck.skip delete mode 100644 libs/CommService/libs/libbattle-com/docs/Doxyfile.in delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/BC.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/BasicMessageQueue.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/BasicQueueReceiver.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/BasicService.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/Message.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/Payloads/HotPlugJoin.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/Payloads/HotPlugLeave.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/Payloads/Ping.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/Payloads/Pong.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/SimpleServiceUDP.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/endianess.hpp.in delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/receiveable.hpp delete mode 100644 libs/CommService/libs/libbattle-com/include/BC/transmittable.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.appveyor.yml delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/azure-build.yml delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/azure-cmake.yml delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/azure-test.yml delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/build_docs.sh delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/build_doxygen.sh delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/build_lcov.sh delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/make_and_test.sh delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/.ci/run_codecov.sh delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.clang-format delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.clang-tidy delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.codecov.yml delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.editorconfig delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.github/CONTRIBUTING.md delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.gitignore delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.gitmodules delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/.travis.yml delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/CHANGELOG.md delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/CMakeLists.txt delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/LICENSE delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/README.md delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/azure-pipelines.yml delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/cmake/AddGoogletest.cmake delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/cmake/CLI11ConfigVersion.cmake.in delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/cmake/CodeCoverage.cmake delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/conanfile.py delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/docs/.gitignore delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/docs/CLI11.svg delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/docs/CLI11_100.png delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/docs/CLI11_300.png delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/docs/Doxyfile delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/docs/mainpage.md delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/CMakeLists.txt delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/callback_passthrough.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/digit_args.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/enum.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/formatter.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/groups.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/inter_argument_order.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/json.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/modhelp.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/nested.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/option_groups.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/positional_arity.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/positional_validation.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/prefix_command.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/ranges.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/shapes.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/simple.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/subcom_help.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/subcom_in_files/CMakeLists.txt delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/subcom_in_files/subcommand_a.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/subcom_in_files/subcommand_a.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/subcom_in_files/subcommand_main.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/subcom_partitioned.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/subcommands.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/examples/validators.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/App.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/CLI.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Config.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/ConfigFwd.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Error.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Formatter.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/FormatterFwd.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Macros.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Option.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Optional.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Split.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/StringTools.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Timer.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/TypeTools.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Validators.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/include/CLI/Version.hpp delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/scripts/MakeSingleHeader.py delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/scripts/UpdateDownloadProj.py delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/scripts/check_style.sh delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/scripts/check_style_docker.sh delete mode 100755 libs/CommService/libs/libbattle-com/libs/CLI11/scripts/clang-format-pre-commit delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/test_package/CMakeLists.txt delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/test_package/conanfile.py delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/test_package/example.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/.syntastic_cpp_config delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/AppTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/CMakeLists.txt delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/CreationTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/DeprecatedTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/FormatterTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/HelpTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/HelpersTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/IniTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/NewParseTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/OptionGroupTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/OptionalTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/SetTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/SimpleTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/StringParseTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/SubcommandTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/TimerTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/TransformTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/TrueFalseTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/WindowsTest.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/app_helper.hpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/informational.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/link_test_1.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CLI11/tests/link_test_2.cpp delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/.gitignore delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/LICENSE delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/README.md delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/inc/CRC.h delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/test/prj/VS2015/UnitTest.sln delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/test/prj/VS2015/UnitTest.vcxproj delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/test/prj/VS2015/UnitTest.vcxproj.filters delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/test/prj/gcc/Makefile delete mode 100644 libs/CommService/libs/libbattle-com/libs/CRCpp/test/src/main.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/BasicMessageQueue.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/BasicQueueReceiver.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/BasicService.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/Message.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/Payloads/HotPlugJoin.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/Payloads/HotPlugLeave.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/Payloads/Ping.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/Payloads/Pong.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/SimpleServiceUDP.cpp delete mode 100644 libs/CommService/libs/libbattle-com/src/config.hpp.in delete mode 100644 libs/CommService/libs/libbattle-com/src/convert/stringConvert.cpp delete mode 100644 libs/CommService/libs/libbattle-com/tests/test_basic_message_queue.cpp delete mode 100644 libs/CommService/libs/libbattle-com/tests/test_basic_queue_receiver.cpp delete mode 100644 libs/CommService/libs/libbattle-com/tests/test_simple_conversion.cpp delete mode 100644 libs/CommService/libs/libbattle-com/tests/test_simple_service_udp.cpp delete mode 100644 libs/CommService/libs/loguru/.gitignore delete mode 100644 libs/CommService/libs/loguru/CMakeLists.txt delete mode 100644 libs/CommService/libs/loguru/README.md delete mode 100644 libs/CommService/libs/loguru/appveyor.yml delete mode 100644 libs/CommService/libs/loguru/docs/index.html delete mode 100644 libs/CommService/libs/loguru/docs/terminal_colors.png delete mode 100644 libs/CommService/libs/loguru/glog_bench/CMakeLists.txt delete mode 100755 libs/CommService/libs/loguru/glog_bench/build_and_run.sh delete mode 100644 libs/CommService/libs/loguru/glog_bench/glog_bench.cpp delete mode 100644 libs/CommService/libs/loguru/glog_example/CMakeLists.txt delete mode 100755 libs/CommService/libs/loguru/glog_example/build_and_run.sh delete mode 100644 libs/CommService/libs/loguru/glog_example/glog_example.hpp delete mode 100644 libs/CommService/libs/loguru/glog_example/main.cpp delete mode 100644 libs/CommService/libs/loguru/lnav_format_loguru_cpp.json delete mode 100644 libs/CommService/libs/loguru/loguru.cpp delete mode 100644 libs/CommService/libs/loguru/loguru.hpp delete mode 100644 libs/CommService/libs/loguru/loguru_bench/CMakeLists.txt delete mode 100755 libs/CommService/libs/loguru/loguru_bench/build_and_run.sh delete mode 100644 libs/CommService/libs/loguru/loguru_bench/loguru_bench.cpp delete mode 100644 libs/CommService/libs/loguru/loguru_example/CMakeLists.txt delete mode 100755 libs/CommService/libs/loguru/loguru_example/build_and_run.sh delete mode 100644 libs/CommService/libs/loguru/loguru_example/loguru_example.hpp delete mode 100644 libs/CommService/libs/loguru/loguru_example/main.cpp delete mode 100644 libs/CommService/libs/loguru/test/CMakeLists.txt delete mode 100644 libs/CommService/libs/loguru/test/appveyor.cmake delete mode 100755 libs/CommService/libs/loguru/test/build.sh delete mode 100644 libs/CommService/libs/loguru/test/build_and_run.cmake delete mode 100755 libs/CommService/libs/loguru/test/build_and_run.sh delete mode 100644 libs/CommService/libs/loguru/test/fail_test_wrapper.cmake delete mode 100644 libs/CommService/libs/loguru/test/loguru_test.cpp delete mode 100644 libs/CommService/src/CommService/CommService.cpp delete mode 100644 libs/CommService/src/CommService/Message.cpp delete mode 100644 libs/CommService/src/CommService/PayLoads/Join.cpp delete mode 100644 libs/CommService/src/CommService/PayLoads/Leave.cpp delete mode 100644 libs/CommService/src/CommService/PayLoads/Ping.cpp delete mode 100644 libs/CommService/src/CommService/PayLoads/Pong.cpp delete mode 100644 libs/CommService/src/main.cpp create mode 160000 libs/EntityLibrary delete mode 100644 libs/cli11/.all-contributorsrc delete mode 100644 libs/cli11/.appveyor.yml delete mode 100644 libs/cli11/.ci/azure-cmake.yml delete mode 100644 libs/cli11/.ci/azure-test.yml delete mode 100644 libs/cli11/.clang-format delete mode 100644 libs/cli11/.cmake-format.yaml delete mode 100644 libs/cli11/.codecov.yml delete mode 100644 libs/cli11/.editorconfig delete mode 100644 libs/cli11/.github/actions/quick_cmake/action.yml delete mode 100644 libs/cli11/.github/labeler_merged.yml delete mode 100644 libs/cli11/.github/workflows/pr_merged.yml delete mode 100644 libs/cli11/.gitignore delete mode 100644 libs/cli11/.remarkrc delete mode 100644 libs/cli11/CHANGELOG.md delete mode 100644 libs/cli11/CLI11.CPack.Description.txt delete mode 100644 libs/cli11/CPPLINT.cfg delete mode 100644 libs/cli11/LICENSE delete mode 100644 libs/cli11/README.md delete mode 100644 libs/cli11/book/.gitignore delete mode 100644 libs/cli11/book/CMakeLists.txt delete mode 100644 libs/cli11/book/README.md delete mode 100644 libs/cli11/book/SUMMARY.md delete mode 100644 libs/cli11/book/book.json delete mode 100644 libs/cli11/book/chapters/advanced-topics.md delete mode 100644 libs/cli11/book/chapters/an-advanced-example.md delete mode 100644 libs/cli11/book/chapters/basics.md delete mode 100644 libs/cli11/book/chapters/config.md delete mode 100644 libs/cli11/book/chapters/flags.md delete mode 100644 libs/cli11/book/chapters/formatting.md delete mode 100644 libs/cli11/book/chapters/installation.md delete mode 100644 libs/cli11/book/chapters/internals.md delete mode 100644 libs/cli11/book/chapters/options.md delete mode 100644 libs/cli11/book/chapters/subcommands.md delete mode 100644 libs/cli11/book/chapters/toolkits.md delete mode 100644 libs/cli11/book/chapters/validators.md delete mode 100644 libs/cli11/book/code/CMakeLists.txt delete mode 100644 libs/cli11/book/code/flags.cpp delete mode 100644 libs/cli11/book/code/geet.cpp delete mode 100644 libs/cli11/book/code/intro.cpp delete mode 100644 libs/cli11/book/code/simplest.cpp delete mode 100644 libs/cli11/cmake/CLI11.pc.in delete mode 100644 libs/cli11/cmake/CLI11ConfigVersion.cmake.in delete mode 100644 libs/cli11/cmake/CLI11GeneratePkgConfig.cmake delete mode 100644 libs/cli11/cmake/CodeCoverage.cmake delete mode 100644 libs/cli11/docs/.gitignore delete mode 100644 libs/cli11/docs/CLI11.svg delete mode 100644 libs/cli11/docs/CLI11_100.png delete mode 100644 libs/cli11/docs/CLI11_300.png delete mode 100644 libs/cli11/docs/CMakeLists.txt delete mode 100644 libs/cli11/docs/Doxyfile delete mode 100644 libs/cli11/docs/mainpage.md delete mode 100644 libs/cli11/examples/callback_passthrough.cpp delete mode 100644 libs/cli11/examples/config_app.cpp delete mode 100644 libs/cli11/examples/digit_args.cpp delete mode 100644 libs/cli11/examples/enum.cpp delete mode 100644 libs/cli11/examples/enum_ostream.cpp delete mode 100644 libs/cli11/examples/json.cpp delete mode 100644 libs/cli11/examples/nested.cpp delete mode 100644 libs/cli11/examples/positional_validation.cpp delete mode 100644 libs/cli11/examples/simple.cpp delete mode 100644 libs/cli11/examples/subcom_help.cpp delete mode 100644 libs/cli11/examples/subcom_in_files/CMakeLists.txt delete mode 100644 libs/cli11/examples/subcom_in_files/subcommand_a.hpp delete mode 100644 libs/cli11/examples/subcom_in_files/subcommand_main.cpp delete mode 100644 libs/cli11/examples/validators.cpp delete mode 100644 libs/cli11/include/CLI/CLI.hpp delete mode 100644 libs/cli11/meson.build delete mode 100644 libs/cli11/meson_options.txt delete mode 100755 libs/cli11/scripts/ExtractVersion.py delete mode 100755 libs/cli11/scripts/check_style.sh delete mode 100755 libs/cli11/scripts/check_style_docker.sh delete mode 100755 libs/cli11/scripts/clang-format-pre-commit delete mode 100644 libs/cli11/subprojects/catch2.wrap delete mode 100644 libs/cli11/test_package/CMakeLists.txt delete mode 100644 libs/cli11/test_package/conanfile.py delete mode 100644 libs/cli11/test_package/example.cpp delete mode 100644 libs/cli11/tests/.syntastic_cpp_config delete mode 100644 libs/cli11/tests/BoostOptionTypeTest.cpp delete mode 100644 libs/cli11/tests/DeprecatedTest.cpp delete mode 100644 libs/cli11/tests/OptionalTest.cpp delete mode 100644 libs/cli11/tests/SimpleTest.cpp delete mode 100644 libs/cli11/tests/TimerTest.cpp delete mode 100644 libs/cli11/tests/TrueFalseTest.cpp delete mode 100644 libs/cli11/tests/WindowsTest.cpp delete mode 100644 libs/cli11/tests/catch.hpp delete mode 100644 libs/cli11/tests/informational.cpp delete mode 100644 libs/cli11/tests/link_test_1.cpp delete mode 100644 libs/cli11/tests/link_test_2.cpp delete mode 100644 libs/cli11/tests/main.cpp delete mode 100644 libs/cli11/tests/meson.build delete mode 100644 libs/cli11/tests/mesonTest/README.md delete mode 100644 libs/cli11/tests/mesonTest/main.cpp delete mode 100644 libs/cli11/tests/mesonTest/meson.build diff --git a/.gitignore b/.gitignore index 975dac6..cbccdcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ .cache -build +build/ compile_commands.json \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..29a8f2f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/EntityLibrary"] + path = libs/EntityLibrary + url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/EntityLibrary.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b83fa4f..5b92a0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,19 +1,15 @@ cmake_minimum_required (VERSION 3.1 FATAL_ERROR) project (EntitiyManager VERSION 0.1.0 LANGUAGES CXX C) -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) include(defaultOptions) #find_package(Eigen3 REQUIRED NO_MODULE) IF (NOT TARGET CLI11) set(CLI11_TESTING OFF CACHE BOOL "disable testing") - add_subdirectory(libs/cli11 EXCLUDE_FROM_ALL) + add_subdirectory(libs/CLI11 EXCLUDE_FROM_ALL) ENDIF() -# IF(NOT TARGET nlohmann_json::nlohmann_json) -# set(JSON_BuildTests OFF CACHE INTERNAL "") -# add_subdirectory(libs/json EXCLUDE_FROM_ALL) -# ENDIF() IF(NOT TARGET loguru) add_subdirectory(libs/loguru EXCLUDE_FROM_ALL) @@ -21,12 +17,11 @@ IF(NOT TARGET loguru) ENDIF() -IF (NOT TARGET CommService) - add_subdirectory(libs/CommService EXCLUDE_FROM_ALL) +IF(NOT TARGET EntityLibrary) + add_subdirectory(libs/EntityLibrary EXCLUDE_FROM_ALL) ENDIF() - add_library(SimControl STATIC @@ -39,9 +34,9 @@ add_library(SimControl STATIC target_link_libraries(SimControl PUBLIC - CommService + CLI11 pthread - + EntityLibrary loguru ) diff --git a/cmake/Modules/defaultOptions.cmake b/cmake/Modules/defaultOptions.cmake index 2e1ffd2..87653ba 100644 --- a/cmake/Modules/defaultOptions.cmake +++ b/cmake/Modules/defaultOptions.cmake @@ -3,7 +3,7 @@ find_package(Git) enable_testing() cxx_20() -build_docs(PROCESS_DOXYFILE DOXYFILE_PATH "docs/Doxyfile.in" ) +# build_docs(PROCESS_DOXYFILE DOXYFILE_PATH "docs/Doxyfile.in" ) add_code_coverage_all_targets(EXCLUDE ${PROJECT_SOURCE_DIR}/libs/* ${PROJECT_SOURCE_DIR}/test/*) TEST_BIG_ENDIAN(IS_BIG_ENDIAN) diff --git a/cmake/Modules/protobuf.cmake b/cmake/Modules/protobuf.cmake new file mode 100644 index 0000000..d1d120f --- /dev/null +++ b/cmake/Modules/protobuf.cmake @@ -0,0 +1,38 @@ + + +function(protobuf_generate_cpp) + set(OPTIONS) + set(SINGLE_VALUE_KEYWORDS + PROTO_PATH + CPP_PATH + HPP_PATH + ) + set(MULTI_VALUE_KEYWORDS) + cmake_parse_arguments(protobuf + "${OPTIONS}" + "${SINGLE_VALUE_KEYWORDS}" + "${MULTI_VALUE_KEYWORDS}" + ${ARGN}) + + FILE(GLOB PROTO_FILES ${protobuf_PROTO_PATH}/*.proto) + set(PROTOC ${CMAKE_BINARY_DIR}/libs/EntityLibrary/libs/SimCore/libs/whisper-com/libs/protobuf/protoc) + message(STATUS "protoc path: " ${PROTOC}) + + FOREACH(proto ${PROTO_FILES}) + FILE(TO_NATIVE_PATH ${proto} proto_native) + get_filename_component(protoFILENAME ${proto} NAME_WLE ) + get_filename_component(protoDIR ${proto} DIRECTORY) + message(STATUS "proto file path: " ${proto}) + + + add_custom_command( + OUTPUT "${protoDIR}/${protoFILENAME}.pb.cc" + DEPENDS "${protoDIR}/${protoFILENAME}.proto" + COMMAND ${PROTOC} --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path="${CMAKE_SOURCE_DIR}/libs/EntityLibrary/libs/SimCore/include/SimCore/Messages/Protos" --proto_path="${CMAKE_SOURCE_DIR}/libs/EntityLibrary/libs/SimCore/libs/whisper-com/libs/protobuf/src" "${protoDIR}/${protoFILENAME}.proto" + + ) + + ENDFOREACH(proto) + + +endfunction() diff --git a/include/SimControl/SimControl.hpp b/include/SimControl/SimControl.hpp index 6284a3e..f38e638 100644 --- a/include/SimControl/SimControl.hpp +++ b/include/SimControl/SimControl.hpp @@ -1,7 +1,7 @@ #ifndef __SIMCONTROL__ #define __SIMCONTROL__ -#include "CommService/Message.hpp" +#include "DirectCommunicationClient.hpp" #include @@ -12,69 +12,24 @@ #include #include -#include namespace SimControl { -class SimControl : public std::enable_shared_from_this { +class SimControl{ + public: - SimControl(const std::string &addr,const std::int16_t port): - // UDPInboundQueue_(std::make_shared>()), - // UDPOutboundQueue_(std::make_shared>()), - - isMainThreadRunning_(false), - stopMainThread_(false), - isCommServiceThreadRunning_(false), - stopCommServiceThread_(false), - CommServiceThread(nullptr), - MainFunctionThread_(nullptr) - { - OutgoingMessageQueue_ = std::make_shared>(); - IncommingMessageQueue_ = nullptr; - } - - void start(); - void stop(); + SimControl(const std::string &addr,const std::int16_t port); + private: - std::unique_ptr CommServiceThread = nullptr; - std::unique_ptr MainFunctionThread_ = nullptr; - - std::shared_ptr> UDPInboundQueue_ = nullptr; - std::shared_ptr> UDPOutboundQueue_ = nullptr; - - std::atomic isCommServiceThreadRunning_; - std::atomic stopCommServiceThread_; - - std::atomic isMainThreadRunning_; - std::atomic stopMainThread_; - - // std::mutex mutexInboundQueue_; - // std::mutex mutexOutboundQueue_; - - ///pointer to the commservice - std::unique_ptr CommService_; - - ///threadsafe message queue from CommService - std::shared_ptr> IncommingMessageQueue_; - std::shared_ptr> OutgoingMessageQueue_; + void MainFunction_(); - void startMainFunction_(); - void stopMainFunction_(); - - void startCommService_(); - void stopCommService_(); - - - - void CommServiceFunction_(); - void MainFunction_(); - + std::shared_ptr TCPClient_; diff --git a/libs/CommService/libs/CLI11/.all-contributorsrc b/libs/CLI11/.all-contributorsrc similarity index 100% rename from libs/CommService/libs/CLI11/.all-contributorsrc rename to libs/CLI11/.all-contributorsrc diff --git a/libs/CommService/libs/CLI11/.appveyor.yml b/libs/CLI11/.appveyor.yml similarity index 93% rename from libs/CommService/libs/CLI11/.appveyor.yml rename to libs/CLI11/.appveyor.yml index 56b090c..08bba18 100644 --- a/libs/CommService/libs/CLI11/.appveyor.yml +++ b/libs/CLI11/.appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.0.{build} +version: 2.3.1.{build} branches: only: @@ -24,6 +24,7 @@ build_script: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_GENERATOR="Visual Studio 14 2015" - ps: cmake --build . - cd .. + - ps: set CTEST_OUTPUT_ON_FAILURE=1 - conan create . CLIUtils/CLI11 test_script: diff --git a/libs/cli11/.ci/azure-build.yml b/libs/CLI11/.ci/azure-build.yml similarity index 100% rename from libs/cli11/.ci/azure-build.yml rename to libs/CLI11/.ci/azure-build.yml diff --git a/libs/CommService/libs/CLI11/.ci/azure-cmake.yml b/libs/CLI11/.ci/azure-cmake.yml similarity index 100% rename from libs/CommService/libs/CLI11/.ci/azure-cmake.yml rename to libs/CLI11/.ci/azure-cmake.yml diff --git a/libs/CommService/libs/CLI11/.ci/azure-test.yml b/libs/CLI11/.ci/azure-test.yml similarity index 100% rename from libs/CommService/libs/CLI11/.ci/azure-test.yml rename to libs/CLI11/.ci/azure-test.yml diff --git a/libs/CommService/libs/CLI11/.clang-format b/libs/CLI11/.clang-format similarity index 100% rename from libs/CommService/libs/CLI11/.clang-format rename to libs/CLI11/.clang-format diff --git a/libs/cli11/.clang-tidy b/libs/CLI11/.clang-tidy similarity index 100% rename from libs/cli11/.clang-tidy rename to libs/CLI11/.clang-tidy diff --git a/libs/CommService/libs/CLI11/.cmake-format.yaml b/libs/CLI11/.cmake-format.yaml similarity index 100% rename from libs/CommService/libs/CLI11/.cmake-format.yaml rename to libs/CLI11/.cmake-format.yaml diff --git a/libs/CommService/libs/CLI11/.codecov.yml b/libs/CLI11/.codecov.yml similarity index 100% rename from libs/CommService/libs/CLI11/.codecov.yml rename to libs/CLI11/.codecov.yml diff --git a/libs/CommService/libs/CLI11/.editorconfig b/libs/CLI11/.editorconfig similarity index 100% rename from libs/CommService/libs/CLI11/.editorconfig rename to libs/CLI11/.editorconfig diff --git a/libs/cli11/.github/CONTRIBUTING.md b/libs/CLI11/.github/CONTRIBUTING.md similarity index 100% rename from libs/cli11/.github/CONTRIBUTING.md rename to libs/CLI11/.github/CONTRIBUTING.md diff --git a/libs/CommService/libs/CLI11/.github/actions/quick_cmake/action.yml b/libs/CLI11/.github/actions/quick_cmake/action.yml similarity index 100% rename from libs/CommService/libs/CLI11/.github/actions/quick_cmake/action.yml rename to libs/CLI11/.github/actions/quick_cmake/action.yml diff --git a/libs/cli11/.github/codecov.yml b/libs/CLI11/.github/codecov.yml similarity index 100% rename from libs/cli11/.github/codecov.yml rename to libs/CLI11/.github/codecov.yml diff --git a/libs/cli11/.github/dependabot.yml b/libs/CLI11/.github/dependabot.yml similarity index 100% rename from libs/cli11/.github/dependabot.yml rename to libs/CLI11/.github/dependabot.yml diff --git a/libs/CommService/libs/CLI11/.github/labeler_merged.yml b/libs/CLI11/.github/labeler_merged.yml similarity index 100% rename from libs/CommService/libs/CLI11/.github/labeler_merged.yml rename to libs/CLI11/.github/labeler_merged.yml diff --git a/libs/cli11/.github/workflows/build.yml b/libs/CLI11/.github/workflows/build.yml similarity index 100% rename from libs/cli11/.github/workflows/build.yml rename to libs/CLI11/.github/workflows/build.yml diff --git a/libs/CommService/libs/CLI11/.github/workflows/pr_merged.yml b/libs/CLI11/.github/workflows/pr_merged.yml similarity index 100% rename from libs/CommService/libs/CLI11/.github/workflows/pr_merged.yml rename to libs/CLI11/.github/workflows/pr_merged.yml diff --git a/libs/cli11/.github/workflows/tests.yml b/libs/CLI11/.github/workflows/tests.yml similarity index 95% rename from libs/cli11/.github/workflows/tests.yml rename to libs/CLI11/.github/workflows/tests.yml index a0b9e6c..febc813 100644 --- a/libs/cli11/.github/workflows/tests.yml +++ b/libs/CLI11/.github/workflows/tests.yml @@ -20,6 +20,8 @@ jobs: precompile: ["ON", "OFF"] steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Get LCov run: | @@ -50,12 +52,10 @@ jobs: lcov --list coverage.info working-directory: build - - name: Upload coverage - run: | - curl -Os https://uploader.codecov.io/latest/linux/codecov - chmod +x codecov - ./codecov - working-directory: build + - uses: codecov/codecov-action@v3 + with: + fail_ci_if_error: true + working-directory: build clang-tidy: name: Clang-Tidy @@ -84,7 +84,7 @@ jobs: - name: Add wget run: apt-get update && apt-get install -y wget - name: Get cmake - uses: jwlawson/actions-setup-cmake@v1.12 + uses: jwlawson/actions-setup-cmake@v1.13 - name: Configure run: cmake -S . -B build -DCLI11_CUDA_TESTS=ON - name: Build @@ -101,7 +101,7 @@ jobs: - name: Add deps run: apt-get update && apt-get install make - name: Get CMake - uses: jwlawson/actions-setup-cmake@v1.12 + uses: jwlawson/actions-setup-cmake@v1.13 - name: Configure run: cmake -S . -B build -DCLI11_BOOST=ON - name: Build diff --git a/libs/CommService/libs/CLI11/.gitignore b/libs/CLI11/.gitignore similarity index 100% rename from libs/CommService/libs/CLI11/.gitignore rename to libs/CLI11/.gitignore diff --git a/libs/cli11/.pre-commit-config.yaml b/libs/CLI11/.pre-commit-config.yaml similarity index 90% rename from libs/cli11/.pre-commit-config.yaml rename to libs/CLI11/.pre-commit-config.yaml index d00e376..14d633d 100644 --- a/libs/cli11/.pre-commit-config.yaml +++ b/libs/CLI11/.pre-commit-config.yaml @@ -4,12 +4,12 @@ ci: repos: - repo: https://github.com/psf/black - rev: 22.8.0 + rev: 22.10.0 hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -21,7 +21,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.6 + rev: v15.0.4 hooks: - id: clang-format types_or: [c++, c, cuda] @@ -33,17 +33,19 @@ repos: additional_dependencies: [pyyaml] - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0-alpha.0" + rev: "v3.0.0-alpha.4" hooks: - id: prettier types_or: [yaml, markdown, html, css, scss, javascript, json] args: [--prose-wrap=always] - repo: https://github.com/markdownlint/markdownlint - rev: v0.11.0 + rev: v0.12.0 hooks: - id: markdownlint args: ["--style=scripts/mdlint_style.rb"] + # Uncomment on macOS - Apple has deprecated Ruby, so macOS is stuck on 2.6 + # language_version: 3.1.2 # - repo: local # hooks: @@ -80,7 +82,7 @@ repos: exclude: .pre-commit-config.yaml - repo: https://github.com/codespell-project/codespell - rev: v2.2.1 + rev: v2.2.2 hooks: - id: codespell args: ["-L", "atleast,ans,doub,inout"] diff --git a/libs/CommService/libs/CLI11/.remarkrc b/libs/CLI11/.remarkrc similarity index 100% rename from libs/CommService/libs/CLI11/.remarkrc rename to libs/CLI11/.remarkrc diff --git a/libs/CommService/libs/CLI11/CHANGELOG.md b/libs/CLI11/CHANGELOG.md similarity index 95% rename from libs/CommService/libs/CLI11/CHANGELOG.md rename to libs/CLI11/CHANGELOG.md index 04b9cd2..e20369f 100644 --- a/libs/CommService/libs/CLI11/CHANGELOG.md +++ b/libs/CLI11/CHANGELOG.md @@ -1,5 +1,50 @@ # Changelog +## Version 2.3: Precompilation Support + +This version adds a pre-compiled mode to CLI11, which allows you to precompile +the library, saving time on incremental rebuilds, making CLI11 more competitive +on compile time with classic compiled CLI libraries. The header-only mode is +still default, and is not yet distributed via binaries. + +- Add `CLI11_PRECOMPILED` as an option. [#762][] +- Bugfix: Include `` in `FormatterFwd` [#727][] +- Bugfix: Add missing `Macros.hpp` to `Error.hpp` [#755][] +- Bugfix: Fix subcommand callback trigger [#733][] +- Bugfix: Variable rename to avoid warning [#734][] +- Bugfix: `split_program_name` single file name error [#740][] +- Bugfix: Better support for min/max overrides on MSVC [#741][] +- Bugfix: Support MSVC 2022 [#748][] +- Bugfix: Support negated flag in config file [#775][] +- Bugfix: Better errors for some confusing config file situations [#781][] +- Backend: Restore coverage testing (lost with Travis CI) [#747][] + +[#727]: https://github.com/CLIUtils/CLI11/pull/727 +[#733]: https://github.com/CLIUtils/CLI11/pull/733 +[#734]: https://github.com/CLIUtils/CLI11/pull/734 +[#740]: https://github.com/CLIUtils/CLI11/pull/740 +[#741]: https://github.com/CLIUtils/CLI11/pull/741 +[#747]: https://github.com/CLIUtils/CLI11/pull/747 +[#748]: https://github.com/CLIUtils/CLI11/pull/748 +[#755]: https://github.com/CLIUtils/CLI11/pull/755 +[#762]: https://github.com/CLIUtils/CLI11/pull/762 +[#775]: https://github.com/CLIUtils/CLI11/pull/775 +[#781]: https://github.com/CLIUtils/CLI11/pull/781 + +### Version 2.3.1: Missing implementation + +A function implementation was missing after the pre-compile move, missed due to +the fact we lost 100% after losing coverage checking. We are working on filling +out 100% coverage again to ensure this doesn't happen again! + +- Bugfix: `App::get_option_group` implementation missing [#793][] +- Bugfix: Fix spacing when setting an empty footer [#796][] +- Bugfix: Address Klocwork static analysis checking issues [#785][] + +[#785]: https://github.com/CLIUtils/CLI11/pull/785 +[#793]: https://github.com/CLIUtils/CLI11/pull/793 +[#796]: https://github.com/CLIUtils/CLI11/pull/796 + ## Version 2.2: Option and Configuration Flexibility New features include support for output of an empty vector, a summing option diff --git a/libs/CommService/libs/CLI11/CLI11.CPack.Description.txt b/libs/CLI11/CLI11.CPack.Description.txt similarity index 100% rename from libs/CommService/libs/CLI11/CLI11.CPack.Description.txt rename to libs/CLI11/CLI11.CPack.Description.txt diff --git a/libs/cli11/CLI11.hpp.in b/libs/CLI11/CLI11.hpp.in similarity index 100% rename from libs/cli11/CLI11.hpp.in rename to libs/CLI11/CLI11.hpp.in diff --git a/libs/cli11/CMakeLists.txt b/libs/CLI11/CMakeLists.txt similarity index 100% rename from libs/cli11/CMakeLists.txt rename to libs/CLI11/CMakeLists.txt diff --git a/libs/CommService/libs/CLI11/CPPLINT.cfg b/libs/CLI11/CPPLINT.cfg similarity index 100% rename from libs/CommService/libs/CLI11/CPPLINT.cfg rename to libs/CLI11/CPPLINT.cfg diff --git a/libs/CommService/libs/CLI11/LICENSE b/libs/CLI11/LICENSE similarity index 100% rename from libs/CommService/libs/CLI11/LICENSE rename to libs/CLI11/LICENSE diff --git a/libs/CommService/libs/CLI11/README.md b/libs/CLI11/README.md similarity index 99% rename from libs/CommService/libs/CLI11/README.md rename to libs/CLI11/README.md index 989ef43..05a3808 100644 --- a/libs/CommService/libs/CLI11/README.md +++ b/libs/CLI11/README.md @@ -530,7 +530,7 @@ Before parsing, you can set the following options: are `CLI::MultiOptionPolicy::Throw`, `CLI::MultiOptionPolicy::Throw`, `CLI::MultiOptionPolicy::TakeLast`, `CLI::MultiOptionPolicy::TakeFirst`, `CLI::MultiOptionPolicy::Join`, `CLI::MultiOptionPolicy::TakeAll`, and - `CLI::MultiOptionPolicy::Sum` 🚧. + `CLI::MultiOptionPolicy::Sum` 🆕. - `->check(std::string(const std::string &), validator_name="",validator_description="")`: Define a check function. The function should return a non empty string with the error message if the check fails @@ -571,7 +571,7 @@ Before parsing, you can set the following options: - `->trigger_on_parse()`: If set, causes the callback and all associated validation checks for the option to be executed when the option value is parsed vs. at the end of all parsing. This could cause the callback to be - executed multiple times. Also works with positional options 🆕. + executed multiple times. Also works with positional options. These options return the `Option` pointer, so you can chain them together, and even skip storing the pointer entirely. The `each` function takes any function @@ -658,7 +658,7 @@ CLI11 has several Validators built-in that perform some common checks - `CLI::ExistingDirectory`: Requires that the directory exists. - `CLI::ExistingPath`: Requires that the path (file or directory) exists. - `CLI::NonexistentPath`: Requires that the path does not exist. -- `CLI::FileOnDefaultPath`: 🆕 Best used as a transform, Will check that a file +- `CLI::FileOnDefaultPath`: Best used as a transform, Will check that a file exists either directly or in a default path and update the path appropriately. See [Transforming Validators](#transforming-validators) for more details - `CLI::Range(min,max)`: Requires that the option be between min and max (make diff --git a/libs/cli11/azure-pipelines.yml b/libs/CLI11/azure-pipelines.yml similarity index 100% rename from libs/cli11/azure-pipelines.yml rename to libs/CLI11/azure-pipelines.yml diff --git a/libs/CommService/libs/CLI11/book/.gitignore b/libs/CLI11/book/.gitignore similarity index 100% rename from libs/CommService/libs/CLI11/book/.gitignore rename to libs/CLI11/book/.gitignore diff --git a/libs/CommService/libs/CLI11/book/CMakeLists.txt b/libs/CLI11/book/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/CLI11/book/CMakeLists.txt rename to libs/CLI11/book/CMakeLists.txt diff --git a/libs/CommService/libs/CLI11/book/README.md b/libs/CLI11/book/README.md similarity index 100% rename from libs/CommService/libs/CLI11/book/README.md rename to libs/CLI11/book/README.md diff --git a/libs/CommService/libs/CLI11/book/SUMMARY.md b/libs/CLI11/book/SUMMARY.md similarity index 100% rename from libs/CommService/libs/CLI11/book/SUMMARY.md rename to libs/CLI11/book/SUMMARY.md diff --git a/libs/CommService/libs/CLI11/book/book.json b/libs/CLI11/book/book.json similarity index 100% rename from libs/CommService/libs/CLI11/book/book.json rename to libs/CLI11/book/book.json diff --git a/libs/CommService/libs/CLI11/book/chapters/advanced-topics.md b/libs/CLI11/book/chapters/advanced-topics.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/advanced-topics.md rename to libs/CLI11/book/chapters/advanced-topics.md diff --git a/libs/CommService/libs/CLI11/book/chapters/an-advanced-example.md b/libs/CLI11/book/chapters/an-advanced-example.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/an-advanced-example.md rename to libs/CLI11/book/chapters/an-advanced-example.md diff --git a/libs/CommService/libs/CLI11/book/chapters/basics.md b/libs/CLI11/book/chapters/basics.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/basics.md rename to libs/CLI11/book/chapters/basics.md diff --git a/libs/CommService/libs/CLI11/book/chapters/config.md b/libs/CLI11/book/chapters/config.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/config.md rename to libs/CLI11/book/chapters/config.md diff --git a/libs/CommService/libs/CLI11/book/chapters/flags.md b/libs/CLI11/book/chapters/flags.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/flags.md rename to libs/CLI11/book/chapters/flags.md diff --git a/libs/CommService/libs/CLI11/book/chapters/formatting.md b/libs/CLI11/book/chapters/formatting.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/formatting.md rename to libs/CLI11/book/chapters/formatting.md diff --git a/libs/CommService/libs/CLI11/book/chapters/installation.md b/libs/CLI11/book/chapters/installation.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/installation.md rename to libs/CLI11/book/chapters/installation.md diff --git a/libs/CommService/libs/CLI11/book/chapters/internals.md b/libs/CLI11/book/chapters/internals.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/internals.md rename to libs/CLI11/book/chapters/internals.md diff --git a/libs/CommService/libs/CLI11/book/chapters/options.md b/libs/CLI11/book/chapters/options.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/options.md rename to libs/CLI11/book/chapters/options.md diff --git a/libs/CommService/libs/CLI11/book/chapters/subcommands.md b/libs/CLI11/book/chapters/subcommands.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/subcommands.md rename to libs/CLI11/book/chapters/subcommands.md diff --git a/libs/CommService/libs/CLI11/book/chapters/toolkits.md b/libs/CLI11/book/chapters/toolkits.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/toolkits.md rename to libs/CLI11/book/chapters/toolkits.md diff --git a/libs/CommService/libs/CLI11/book/chapters/validators.md b/libs/CLI11/book/chapters/validators.md similarity index 100% rename from libs/CommService/libs/CLI11/book/chapters/validators.md rename to libs/CLI11/book/chapters/validators.md diff --git a/libs/CommService/libs/CLI11/book/code/CMakeLists.txt b/libs/CLI11/book/code/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/CLI11/book/code/CMakeLists.txt rename to libs/CLI11/book/code/CMakeLists.txt diff --git a/libs/CommService/libs/CLI11/book/code/flags.cpp b/libs/CLI11/book/code/flags.cpp similarity index 100% rename from libs/CommService/libs/CLI11/book/code/flags.cpp rename to libs/CLI11/book/code/flags.cpp diff --git a/libs/CommService/libs/CLI11/book/code/geet.cpp b/libs/CLI11/book/code/geet.cpp similarity index 100% rename from libs/CommService/libs/CLI11/book/code/geet.cpp rename to libs/CLI11/book/code/geet.cpp diff --git a/libs/CommService/libs/CLI11/book/code/intro.cpp b/libs/CLI11/book/code/intro.cpp similarity index 100% rename from libs/CommService/libs/CLI11/book/code/intro.cpp rename to libs/CLI11/book/code/intro.cpp diff --git a/libs/CommService/libs/CLI11/book/code/simplest.cpp b/libs/CLI11/book/code/simplest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/book/code/simplest.cpp rename to libs/CLI11/book/code/simplest.cpp diff --git a/libs/CommService/libs/CLI11/cmake/CLI11.pc.in b/libs/CLI11/cmake/CLI11.pc.in similarity index 100% rename from libs/CommService/libs/CLI11/cmake/CLI11.pc.in rename to libs/CLI11/cmake/CLI11.pc.in diff --git a/libs/CommService/libs/CLI11/cmake/CLI11ConfigVersion.cmake.in b/libs/CLI11/cmake/CLI11ConfigVersion.cmake.in similarity index 100% rename from libs/CommService/libs/CLI11/cmake/CLI11ConfigVersion.cmake.in rename to libs/CLI11/cmake/CLI11ConfigVersion.cmake.in diff --git a/libs/CommService/libs/CLI11/cmake/CLI11GeneratePkgConfig.cmake b/libs/CLI11/cmake/CLI11GeneratePkgConfig.cmake similarity index 100% rename from libs/CommService/libs/CLI11/cmake/CLI11GeneratePkgConfig.cmake rename to libs/CLI11/cmake/CLI11GeneratePkgConfig.cmake diff --git a/libs/cli11/cmake/CLI11Warnings.cmake b/libs/CLI11/cmake/CLI11Warnings.cmake similarity index 100% rename from libs/cli11/cmake/CLI11Warnings.cmake rename to libs/CLI11/cmake/CLI11Warnings.cmake diff --git a/libs/CommService/libs/CLI11/cmake/CodeCoverage.cmake b/libs/CLI11/cmake/CodeCoverage.cmake similarity index 100% rename from libs/CommService/libs/CLI11/cmake/CodeCoverage.cmake rename to libs/CLI11/cmake/CodeCoverage.cmake diff --git a/libs/cli11/conanfile.py b/libs/CLI11/conanfile.py similarity index 95% rename from libs/cli11/conanfile.py rename to libs/CLI11/conanfile.py index 9dc6ce3..b5b9e49 100644 --- a/libs/cli11/conanfile.py +++ b/libs/CLI11/conanfile.py @@ -37,7 +37,7 @@ class CLI11Conan(ConanFile): def build(self): # this is not building a library, just tests cmake = CMake(self) - cmake.definitions["CLI11_EXAMPLES"] = "OFF" + cmake.definitions["CLI11_BUILD_EXAMPLES"] = "OFF" cmake.definitions["CLI11_SINGLE_FILE"] = "OFF" cmake.configure() cmake.build() diff --git a/libs/CommService/libs/CLI11/docs/.gitignore b/libs/CLI11/docs/.gitignore similarity index 100% rename from libs/CommService/libs/CLI11/docs/.gitignore rename to libs/CLI11/docs/.gitignore diff --git a/libs/CommService/libs/CLI11/docs/CLI11.svg b/libs/CLI11/docs/CLI11.svg similarity index 100% rename from libs/CommService/libs/CLI11/docs/CLI11.svg rename to libs/CLI11/docs/CLI11.svg diff --git a/libs/CommService/libs/CLI11/docs/CLI11_100.png b/libs/CLI11/docs/CLI11_100.png similarity index 100% rename from libs/CommService/libs/CLI11/docs/CLI11_100.png rename to libs/CLI11/docs/CLI11_100.png diff --git a/libs/CommService/libs/CLI11/docs/CLI11_300.png b/libs/CLI11/docs/CLI11_300.png similarity index 100% rename from libs/CommService/libs/CLI11/docs/CLI11_300.png rename to libs/CLI11/docs/CLI11_300.png diff --git a/libs/CommService/libs/CLI11/docs/CMakeLists.txt b/libs/CLI11/docs/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/CLI11/docs/CMakeLists.txt rename to libs/CLI11/docs/CMakeLists.txt diff --git a/libs/CommService/libs/CLI11/docs/Doxyfile b/libs/CLI11/docs/Doxyfile similarity index 100% rename from libs/CommService/libs/CLI11/docs/Doxyfile rename to libs/CLI11/docs/Doxyfile diff --git a/libs/CommService/libs/CLI11/docs/mainpage.md b/libs/CLI11/docs/mainpage.md similarity index 100% rename from libs/CommService/libs/CLI11/docs/mainpage.md rename to libs/CLI11/docs/mainpage.md diff --git a/libs/cli11/examples/CMakeLists.txt b/libs/CLI11/examples/CMakeLists.txt similarity index 100% rename from libs/cli11/examples/CMakeLists.txt rename to libs/CLI11/examples/CMakeLists.txt diff --git a/libs/CommService/libs/CLI11/examples/callback_passthrough.cpp b/libs/CLI11/examples/callback_passthrough.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/callback_passthrough.cpp rename to libs/CLI11/examples/callback_passthrough.cpp diff --git a/libs/CommService/libs/CLI11/examples/config_app.cpp b/libs/CLI11/examples/config_app.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/config_app.cpp rename to libs/CLI11/examples/config_app.cpp diff --git a/libs/cli11/examples/custom_parse.cpp b/libs/CLI11/examples/custom_parse.cpp similarity index 100% rename from libs/cli11/examples/custom_parse.cpp rename to libs/CLI11/examples/custom_parse.cpp diff --git a/libs/CommService/libs/CLI11/examples/digit_args.cpp b/libs/CLI11/examples/digit_args.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/digit_args.cpp rename to libs/CLI11/examples/digit_args.cpp diff --git a/libs/CommService/libs/CLI11/examples/enum.cpp b/libs/CLI11/examples/enum.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/enum.cpp rename to libs/CLI11/examples/enum.cpp diff --git a/libs/CommService/libs/CLI11/examples/enum_ostream.cpp b/libs/CLI11/examples/enum_ostream.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/enum_ostream.cpp rename to libs/CLI11/examples/enum_ostream.cpp diff --git a/libs/cli11/examples/formatter.cpp b/libs/CLI11/examples/formatter.cpp similarity index 100% rename from libs/cli11/examples/formatter.cpp rename to libs/CLI11/examples/formatter.cpp diff --git a/libs/cli11/examples/groups.cpp b/libs/CLI11/examples/groups.cpp similarity index 100% rename from libs/cli11/examples/groups.cpp rename to libs/CLI11/examples/groups.cpp diff --git a/libs/cli11/examples/inter_argument_order.cpp b/libs/CLI11/examples/inter_argument_order.cpp similarity index 100% rename from libs/cli11/examples/inter_argument_order.cpp rename to libs/CLI11/examples/inter_argument_order.cpp diff --git a/libs/CommService/libs/CLI11/examples/json.cpp b/libs/CLI11/examples/json.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/json.cpp rename to libs/CLI11/examples/json.cpp diff --git a/libs/cli11/examples/modhelp.cpp b/libs/CLI11/examples/modhelp.cpp similarity index 100% rename from libs/cli11/examples/modhelp.cpp rename to libs/CLI11/examples/modhelp.cpp diff --git a/libs/CommService/libs/CLI11/examples/nested.cpp b/libs/CLI11/examples/nested.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/nested.cpp rename to libs/CLI11/examples/nested.cpp diff --git a/libs/cli11/examples/option_groups.cpp b/libs/CLI11/examples/option_groups.cpp similarity index 100% rename from libs/cli11/examples/option_groups.cpp rename to libs/CLI11/examples/option_groups.cpp diff --git a/libs/cli11/examples/positional_arity.cpp b/libs/CLI11/examples/positional_arity.cpp similarity index 100% rename from libs/cli11/examples/positional_arity.cpp rename to libs/CLI11/examples/positional_arity.cpp diff --git a/libs/CommService/libs/CLI11/examples/positional_validation.cpp b/libs/CLI11/examples/positional_validation.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/positional_validation.cpp rename to libs/CLI11/examples/positional_validation.cpp diff --git a/libs/cli11/examples/prefix_command.cpp b/libs/CLI11/examples/prefix_command.cpp similarity index 100% rename from libs/cli11/examples/prefix_command.cpp rename to libs/CLI11/examples/prefix_command.cpp diff --git a/libs/cli11/examples/ranges.cpp b/libs/CLI11/examples/ranges.cpp similarity index 100% rename from libs/cli11/examples/ranges.cpp rename to libs/CLI11/examples/ranges.cpp diff --git a/libs/cli11/examples/retired.cpp b/libs/CLI11/examples/retired.cpp similarity index 100% rename from libs/cli11/examples/retired.cpp rename to libs/CLI11/examples/retired.cpp diff --git a/libs/cli11/examples/shapes.cpp b/libs/CLI11/examples/shapes.cpp similarity index 100% rename from libs/cli11/examples/shapes.cpp rename to libs/CLI11/examples/shapes.cpp diff --git a/libs/CommService/libs/CLI11/examples/simple.cpp b/libs/CLI11/examples/simple.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/simple.cpp rename to libs/CLI11/examples/simple.cpp diff --git a/libs/CommService/libs/CLI11/examples/subcom_help.cpp b/libs/CLI11/examples/subcom_help.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/subcom_help.cpp rename to libs/CLI11/examples/subcom_help.cpp diff --git a/libs/CommService/libs/CLI11/examples/subcom_in_files/CMakeLists.txt b/libs/CLI11/examples/subcom_in_files/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/CLI11/examples/subcom_in_files/CMakeLists.txt rename to libs/CLI11/examples/subcom_in_files/CMakeLists.txt diff --git a/libs/cli11/examples/subcom_in_files/subcommand_a.cpp b/libs/CLI11/examples/subcom_in_files/subcommand_a.cpp similarity index 100% rename from libs/cli11/examples/subcom_in_files/subcommand_a.cpp rename to libs/CLI11/examples/subcom_in_files/subcommand_a.cpp diff --git a/libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_a.hpp b/libs/CLI11/examples/subcom_in_files/subcommand_a.hpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_a.hpp rename to libs/CLI11/examples/subcom_in_files/subcommand_a.hpp diff --git a/libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_main.cpp b/libs/CLI11/examples/subcom_in_files/subcommand_main.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_main.cpp rename to libs/CLI11/examples/subcom_in_files/subcommand_main.cpp diff --git a/libs/cli11/examples/subcom_partitioned.cpp b/libs/CLI11/examples/subcom_partitioned.cpp similarity index 100% rename from libs/cli11/examples/subcom_partitioned.cpp rename to libs/CLI11/examples/subcom_partitioned.cpp diff --git a/libs/cli11/examples/subcommands.cpp b/libs/CLI11/examples/subcommands.cpp similarity index 100% rename from libs/cli11/examples/subcommands.cpp rename to libs/CLI11/examples/subcommands.cpp diff --git a/libs/cli11/examples/testEXE.cpp b/libs/CLI11/examples/testEXE.cpp similarity index 100% rename from libs/cli11/examples/testEXE.cpp rename to libs/CLI11/examples/testEXE.cpp diff --git a/libs/CommService/libs/CLI11/examples/validators.cpp b/libs/CLI11/examples/validators.cpp similarity index 100% rename from libs/CommService/libs/CLI11/examples/validators.cpp rename to libs/CLI11/examples/validators.cpp diff --git a/libs/cli11/include/CLI/App.hpp b/libs/CLI11/include/CLI/App.hpp similarity index 100% rename from libs/cli11/include/CLI/App.hpp rename to libs/CLI11/include/CLI/App.hpp diff --git a/libs/CommService/libs/CLI11/include/CLI/CLI.hpp b/libs/CLI11/include/CLI/CLI.hpp similarity index 100% rename from libs/CommService/libs/CLI11/include/CLI/CLI.hpp rename to libs/CLI11/include/CLI/CLI.hpp diff --git a/libs/cli11/include/CLI/Config.hpp b/libs/CLI11/include/CLI/Config.hpp similarity index 100% rename from libs/cli11/include/CLI/Config.hpp rename to libs/CLI11/include/CLI/Config.hpp diff --git a/libs/cli11/include/CLI/ConfigFwd.hpp b/libs/CLI11/include/CLI/ConfigFwd.hpp similarity index 99% rename from libs/cli11/include/CLI/ConfigFwd.hpp rename to libs/CLI11/include/CLI/ConfigFwd.hpp index 44454b4..c5da8d2 100644 --- a/libs/cli11/include/CLI/ConfigFwd.hpp +++ b/libs/CLI11/include/CLI/ConfigFwd.hpp @@ -61,7 +61,7 @@ class Config { if(item.inputs.empty()) { return "{}"; } - throw ConversionError::TooManyInputsFlag(item.fullname()); + throw ConversionError::TooManyInputsFlag(item.fullname()); // LCOV_EXCL_LINE } /// Parse a config file, throw an error (ParseError:ConfigParseError or FileError) on failure diff --git a/libs/cli11/include/CLI/Error.hpp b/libs/CLI11/include/CLI/Error.hpp similarity index 100% rename from libs/cli11/include/CLI/Error.hpp rename to libs/CLI11/include/CLI/Error.hpp diff --git a/libs/cli11/include/CLI/Formatter.hpp b/libs/CLI11/include/CLI/Formatter.hpp similarity index 100% rename from libs/cli11/include/CLI/Formatter.hpp rename to libs/CLI11/include/CLI/Formatter.hpp diff --git a/libs/cli11/include/CLI/FormatterFwd.hpp b/libs/CLI11/include/CLI/FormatterFwd.hpp similarity index 96% rename from libs/cli11/include/CLI/FormatterFwd.hpp rename to libs/CLI11/include/CLI/FormatterFwd.hpp index 792ebbc..bdae54d 100644 --- a/libs/cli11/include/CLI/FormatterFwd.hpp +++ b/libs/CLI11/include/CLI/FormatterFwd.hpp @@ -57,6 +57,8 @@ class FormatterBase { FormatterBase() = default; FormatterBase(const FormatterBase &) = default; FormatterBase(FormatterBase &&) = default; + FormatterBase &operator=(const FormatterBase &) = default; + FormatterBase &operator=(FormatterBase &&) = default; /// Adding a destructor in this form to work around bug in GCC 4.7 virtual ~FormatterBase() noexcept {} // NOLINT(modernize-use-equals-default) @@ -118,6 +120,8 @@ class Formatter : public FormatterBase { Formatter() = default; Formatter(const Formatter &) = default; Formatter(Formatter &&) = default; + Formatter &operator=(const Formatter &) = default; + Formatter &operator=(Formatter &&) = default; /// @name Overridables ///@{ diff --git a/libs/cli11/include/CLI/Macros.hpp b/libs/CLI11/include/CLI/Macros.hpp similarity index 100% rename from libs/cli11/include/CLI/Macros.hpp rename to libs/CLI11/include/CLI/Macros.hpp diff --git a/libs/cli11/include/CLI/Option.hpp b/libs/CLI11/include/CLI/Option.hpp similarity index 100% rename from libs/cli11/include/CLI/Option.hpp rename to libs/CLI11/include/CLI/Option.hpp diff --git a/libs/cli11/include/CLI/Split.hpp b/libs/CLI11/include/CLI/Split.hpp similarity index 100% rename from libs/cli11/include/CLI/Split.hpp rename to libs/CLI11/include/CLI/Split.hpp diff --git a/libs/cli11/include/CLI/StringTools.hpp b/libs/CLI11/include/CLI/StringTools.hpp similarity index 100% rename from libs/cli11/include/CLI/StringTools.hpp rename to libs/CLI11/include/CLI/StringTools.hpp diff --git a/libs/cli11/include/CLI/Timer.hpp b/libs/CLI11/include/CLI/Timer.hpp similarity index 100% rename from libs/cli11/include/CLI/Timer.hpp rename to libs/CLI11/include/CLI/Timer.hpp diff --git a/libs/cli11/include/CLI/TypeTools.hpp b/libs/CLI11/include/CLI/TypeTools.hpp similarity index 98% rename from libs/cli11/include/CLI/TypeTools.hpp rename to libs/CLI11/include/CLI/TypeTools.hpp index 2048a01..a285726 100644 --- a/libs/cli11/include/CLI/TypeTools.hpp +++ b/libs/CLI11/include/CLI/TypeTools.hpp @@ -7,6 +7,7 @@ #pragma once // [CLI11:public_includes:set] +#include #include #include #include @@ -42,7 +43,9 @@ constexpr enabler dummy = {}; template using enable_if_t = typename std::enable_if::type; /// A copy of std::void_t from C++17 (helper for C++11 and C++14) -template struct make_void { using type = void; }; +template struct make_void { + using type = void; +}; /// A copy of std::void_t from C++17 - same reasoning as enable_if_t, it does not hurt to redefine template using void_t = typename make_void::type; @@ -71,10 +74,14 @@ template struct is_copyable_ptr { }; /// This can be specialized to override the type deduction for IsMember. -template struct IsMemberType { using type = T; }; +template struct IsMemberType { + using type = T; +}; /// The main custom type needed here is const char * should be a string. -template <> struct IsMemberType { using type = std::string; }; +template <> struct IsMemberType { + using type = std::string; +}; namespace detail { @@ -84,7 +91,9 @@ namespace detail { /// pointer_traits be valid. /// not a pointer -template struct element_type { using type = T; }; +template struct element_type { + using type = T; +}; template struct element_type::value>::type> { using type = typename std::pointer_traits::element_type; @@ -92,7 +101,9 @@ template struct element_type struct element_value_type { using type = typename element_type::type::value_type; }; +template struct element_value_type { + using type = typename element_type::type::value_type; +}; /// Adaptor for set-like structure: This just wraps a normal container in a few utilities that do almost nothing. template struct pair_adaptor : std::false_type { @@ -353,7 +364,9 @@ auto value_string(const T &value) -> decltype(to_string(value)) { } /// template to get the underlying value type if it exists or use a default -template struct wrapped_type { using type = def; }; +template struct wrapped_type { + using type = def; +}; /// Type size for regular object types that do not look like a tuple template struct wrapped_type::value>::type> { @@ -361,7 +374,9 @@ template struct wrapped_type struct type_count_base { static const int value{0}; }; +template struct type_count_base { + static const int value{0}; +}; /// Type size for regular object types that do not look like a tuple template @@ -391,7 +406,9 @@ template struct subtype_count; template struct subtype_count_min; /// This will only trigger for actual void type -template struct type_count { static const int value{0}; }; +template struct type_count { + static const int value{0}; +}; /// Type size for regular object types that do not look like a tuple template @@ -442,7 +459,9 @@ template struct subtype_count { }; /// This will only trigger for actual void type -template struct type_count_min { static const int value{0}; }; +template struct type_count_min { + static const int value{0}; +}; /// Type size for regular object types that do not look like a tuple template @@ -491,7 +510,9 @@ template struct subtype_count_min { }; /// This will only trigger for actual void type -template struct expected_count { static const int value{0}; }; +template struct expected_count { + static const int value{0}; +}; /// For most types the number of expected items is 1 template @@ -795,11 +816,15 @@ inline std::string type_name() { /// Convert to an unsigned integral template ::value, detail::enabler> = detail::dummy> bool integral_conversion(const std::string &input, T &output) noexcept { - if(input.empty()) { + if(input.empty() || input.front() == '-') { return false; } char *val = nullptr; + errno = 0; std::uint64_t output_ll = std::strtoull(input.c_str(), &val, 0); + if(errno == ERANGE) { + return false; + } output = static_cast(output_ll); if(val == (input.c_str() + input.size()) && static_cast(output) == output_ll) { return true; @@ -820,7 +845,11 @@ bool integral_conversion(const std::string &input, T &output) noexcept { return false; } char *val = nullptr; + errno = 0; std::int64_t output_ll = std::strtoll(input.c_str(), &val, 0); + if(errno == ERANGE) { + return false; + } output = static_cast(output_ll); if(val == (input.c_str() + input.size()) && static_cast(output) == output_ll) { return true; @@ -1545,8 +1574,7 @@ inline std::string sum_string_vector(const std::vector &values) { } else { if(val <= static_cast((std::numeric_limits::min)()) || val >= static_cast((std::numeric_limits::max)()) || - // NOLINTNEXTLINE(clang-diagnostic-float-equal,bugprone-narrowing-conversions) - val == static_cast(val)) { + std::ceil(val) == std::floor(val)) { output = detail::value_string(static_cast(val)); } else { output = detail::value_string(val); diff --git a/libs/cli11/include/CLI/Validators.hpp b/libs/CLI11/include/CLI/Validators.hpp similarity index 99% rename from libs/cli11/include/CLI/Validators.hpp rename to libs/CLI11/include/CLI/Validators.hpp index 9a6a364..8b0c5c1 100644 --- a/libs/cli11/include/CLI/Validators.hpp +++ b/libs/CLI11/include/CLI/Validators.hpp @@ -750,7 +750,7 @@ class AsNumberWithUnit : public Validator { // transform function func_ = [mapping, opts](std::string &input) -> std::string { - Number num; + Number num{}; detail::rtrim(input); if(input.empty()) { diff --git a/libs/cli11/include/CLI/Version.hpp b/libs/CLI11/include/CLI/Version.hpp similarity index 78% rename from libs/cli11/include/CLI/Version.hpp rename to libs/CLI11/include/CLI/Version.hpp index b03141b..c29daf9 100644 --- a/libs/cli11/include/CLI/Version.hpp +++ b/libs/CLI11/include/CLI/Version.hpp @@ -9,8 +9,8 @@ // [CLI11:version_hpp:verbatim] #define CLI11_VERSION_MAJOR 2 -#define CLI11_VERSION_MINOR 2 -#define CLI11_VERSION_PATCH 0 -#define CLI11_VERSION "2.2.0" +#define CLI11_VERSION_MINOR 3 +#define CLI11_VERSION_PATCH 1 +#define CLI11_VERSION "2.3.1" // [CLI11:version_hpp:end] diff --git a/libs/cli11/include/CLI/impl/App_inl.hpp b/libs/CLI11/include/CLI/impl/App_inl.hpp similarity index 98% rename from libs/cli11/include/CLI/impl/App_inl.hpp rename to libs/CLI11/include/CLI/impl/App_inl.hpp index bbda621..101f20c 100644 --- a/libs/cli11/include/CLI/impl/App_inl.hpp +++ b/libs/CLI11/include/CLI/impl/App_inl.hpp @@ -433,6 +433,15 @@ CLI11_NODISCARD CLI11_INLINE CLI::App_p App::get_subcommand_ptr(int index) const throw OptionNotFound(std::to_string(index)); } +CLI11_NODISCARD CLI11_INLINE CLI::App *App::get_option_group(std::string group_name) const { + for(const App_p &app : subcommands_) { + if(app->name_.empty() && app->group_ == group_name) { + return app.get(); + } + } + throw OptionNotFound(group_name); +} + CLI11_NODISCARD CLI11_INLINE std::size_t App::count_all() const { std::size_t cnt{0}; for(const auto &opt : options_) { @@ -1384,16 +1393,38 @@ CLI11_INLINE bool App::_parse_single_config(const ConfigItem &item, std::size_t if(op->empty()) { if(op->get_expected_min() == 0) { - // Flag parsing - auto res = config_formatter_->to_flag(item); - res = op->get_flag_value(item.name, res); + if(item.inputs.size() <= 1) { + // Flag parsing + auto res = config_formatter_->to_flag(item); + bool converted{false}; + if(op->get_disable_flag_override()) { - op->add_result(res); + try { + auto val = detail::to_flag_value(res); + if(val == 1) { + res = op->get_flag_value(item.name, "{}"); + converted = true; + } + } catch(...) { + } + } - } else { - op->add_result(item.inputs); - op->run_callback(); + if(!converted) { + res = op->get_flag_value(item.name, res); + } + + op->add_result(res); + return true; + } + if(static_cast(item.inputs.size()) > op->get_items_expected_max()) { + if(op->get_items_expected_max() > 1) { + throw ArgumentMismatch::AtMost(item.fullname(), op->get_items_expected_max(), item.inputs.size()); + } + throw ConversionError::TooManyInputsFlag(item.fullname()); + } } + op->add_result(item.inputs); + op->run_callback(); } return true; diff --git a/libs/cli11/include/CLI/impl/Config_inl.hpp b/libs/CLI11/include/CLI/impl/Config_inl.hpp similarity index 100% rename from libs/cli11/include/CLI/impl/Config_inl.hpp rename to libs/CLI11/include/CLI/impl/Config_inl.hpp diff --git a/libs/cli11/include/CLI/impl/Formatter_inl.hpp b/libs/CLI11/include/CLI/impl/Formatter_inl.hpp similarity index 98% rename from libs/cli11/include/CLI/impl/Formatter_inl.hpp rename to libs/CLI11/include/CLI/impl/Formatter_inl.hpp index 37249e0..a93098f 100644 --- a/libs/cli11/include/CLI/impl/Formatter_inl.hpp +++ b/libs/CLI11/include/CLI/impl/Formatter_inl.hpp @@ -75,7 +75,7 @@ CLI11_INLINE std::string Formatter::make_description(const App *app) const { if(min_options == 1) { desc += " \n[Exactly 1 of the following options is required]"; } else { - desc += " \n[Exactly " + std::to_string(min_options) + "options from the following list are required]"; + desc += " \n[Exactly " + std::to_string(min_options) + " options from the following list are required]"; } } else if(max_options > 0) { if(min_options > 0) { @@ -137,7 +137,7 @@ CLI11_INLINE std::string Formatter::make_footer(const App *app) const { if(footer.empty()) { return std::string{}; } - return footer + "\n"; + return "\n" + footer + "\n"; } CLI11_INLINE std::string Formatter::make_help(const App *app, std::string name, AppFormatMode mode) const { @@ -159,7 +159,7 @@ CLI11_INLINE std::string Formatter::make_help(const App *app, std::string name, out << make_positionals(app); out << make_groups(app, mode); out << make_subcommands(app, mode); - out << '\n' << make_footer(app); + out << make_footer(app); return out.str(); } diff --git a/libs/cli11/include/CLI/impl/Option_inl.hpp b/libs/CLI11/include/CLI/impl/Option_inl.hpp similarity index 100% rename from libs/cli11/include/CLI/impl/Option_inl.hpp rename to libs/CLI11/include/CLI/impl/Option_inl.hpp diff --git a/libs/cli11/include/CLI/impl/Split_inl.hpp b/libs/CLI11/include/CLI/impl/Split_inl.hpp similarity index 100% rename from libs/cli11/include/CLI/impl/Split_inl.hpp rename to libs/CLI11/include/CLI/impl/Split_inl.hpp diff --git a/libs/cli11/include/CLI/impl/StringTools_inl.hpp b/libs/CLI11/include/CLI/impl/StringTools_inl.hpp similarity index 100% rename from libs/cli11/include/CLI/impl/StringTools_inl.hpp rename to libs/CLI11/include/CLI/impl/StringTools_inl.hpp diff --git a/libs/cli11/include/CLI/impl/Validators_inl.hpp b/libs/CLI11/include/CLI/impl/Validators_inl.hpp similarity index 99% rename from libs/cli11/include/CLI/impl/Validators_inl.hpp rename to libs/CLI11/include/CLI/impl/Validators_inl.hpp index f2fe5e5..9c9e25b 100644 --- a/libs/cli11/include/CLI/impl/Validators_inl.hpp +++ b/libs/CLI11/include/CLI/impl/Validators_inl.hpp @@ -132,7 +132,7 @@ CLI11_INLINE path_type check_path(const char *file) noexcept { return path_type::nonexistent; } switch(stat.type()) { - case std::filesystem::file_type::none: + case std::filesystem::file_type::none: // LCOV_EXCL_LINE case std::filesystem::file_type::not_found: return path_type::nonexistent; case std::filesystem::file_type::directory: diff --git a/libs/CommService/libs/CLI11/meson.build b/libs/CLI11/meson.build similarity index 100% rename from libs/CommService/libs/CLI11/meson.build rename to libs/CLI11/meson.build diff --git a/libs/CommService/libs/CLI11/meson_options.txt b/libs/CLI11/meson_options.txt similarity index 100% rename from libs/CommService/libs/CLI11/meson_options.txt rename to libs/CLI11/meson_options.txt diff --git a/libs/CommService/libs/CLI11/scripts/ExtractVersion.py b/libs/CLI11/scripts/ExtractVersion.py similarity index 100% rename from libs/CommService/libs/CLI11/scripts/ExtractVersion.py rename to libs/CLI11/scripts/ExtractVersion.py diff --git a/libs/cli11/scripts/MakeSingleHeader.py b/libs/CLI11/scripts/MakeSingleHeader.py similarity index 100% rename from libs/cli11/scripts/MakeSingleHeader.py rename to libs/CLI11/scripts/MakeSingleHeader.py diff --git a/libs/CommService/libs/CLI11/scripts/check_style.sh b/libs/CLI11/scripts/check_style.sh similarity index 100% rename from libs/CommService/libs/CLI11/scripts/check_style.sh rename to libs/CLI11/scripts/check_style.sh diff --git a/libs/CommService/libs/CLI11/scripts/check_style_docker.sh b/libs/CLI11/scripts/check_style_docker.sh similarity index 100% rename from libs/CommService/libs/CLI11/scripts/check_style_docker.sh rename to libs/CLI11/scripts/check_style_docker.sh diff --git a/libs/CommService/libs/CLI11/scripts/clang-format-pre-commit b/libs/CLI11/scripts/clang-format-pre-commit similarity index 100% rename from libs/CommService/libs/CLI11/scripts/clang-format-pre-commit rename to libs/CLI11/scripts/clang-format-pre-commit diff --git a/libs/cli11/scripts/mdlint_style.rb b/libs/CLI11/scripts/mdlint_style.rb similarity index 90% rename from libs/cli11/scripts/mdlint_style.rb rename to libs/CLI11/scripts/mdlint_style.rb index 6fca85b..5cb3a97 100644 --- a/libs/cli11/scripts/mdlint_style.rb +++ b/libs/CLI11/scripts/mdlint_style.rb @@ -6,3 +6,4 @@ exclude_rule 'MD034' # Bare URL (for now) rule 'MD026', punctuation: '.,;:!' # Trailing punctuation in header (& in this case) rule 'MD029', style: :ordered +rule 'MD007', indent: 2 diff --git a/libs/cli11/src/CMakeLists.txt b/libs/CLI11/src/CMakeLists.txt similarity index 100% rename from libs/cli11/src/CMakeLists.txt rename to libs/CLI11/src/CMakeLists.txt diff --git a/libs/cli11/src/Precompile.cpp b/libs/CLI11/src/Precompile.cpp similarity index 100% rename from libs/cli11/src/Precompile.cpp rename to libs/CLI11/src/Precompile.cpp diff --git a/libs/CommService/libs/CLI11/subprojects/catch2.wrap b/libs/CLI11/subprojects/catch2.wrap similarity index 100% rename from libs/CommService/libs/CLI11/subprojects/catch2.wrap rename to libs/CLI11/subprojects/catch2.wrap diff --git a/libs/CommService/libs/CLI11/test_package/CMakeLists.txt b/libs/CLI11/test_package/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/CLI11/test_package/CMakeLists.txt rename to libs/CLI11/test_package/CMakeLists.txt diff --git a/libs/CommService/libs/CLI11/test_package/conanfile.py b/libs/CLI11/test_package/conanfile.py similarity index 100% rename from libs/CommService/libs/CLI11/test_package/conanfile.py rename to libs/CLI11/test_package/conanfile.py diff --git a/libs/CommService/libs/CLI11/test_package/example.cpp b/libs/CLI11/test_package/example.cpp similarity index 100% rename from libs/CommService/libs/CLI11/test_package/example.cpp rename to libs/CLI11/test_package/example.cpp diff --git a/libs/CommService/libs/CLI11/tests/.syntastic_cpp_config b/libs/CLI11/tests/.syntastic_cpp_config similarity index 100% rename from libs/CommService/libs/CLI11/tests/.syntastic_cpp_config rename to libs/CLI11/tests/.syntastic_cpp_config diff --git a/libs/cli11/tests/AppTest.cpp b/libs/CLI11/tests/AppTest.cpp similarity index 98% rename from libs/cli11/tests/AppTest.cpp rename to libs/CLI11/tests/AppTest.cpp index 994c890..a37958d 100644 --- a/libs/cli11/tests/AppTest.cpp +++ b/libs/CLI11/tests/AppTest.cpp @@ -981,7 +981,9 @@ TEST_CASE_METHOD(TApp, "emptyVectorReturn", "[app]") { std::vector strs; std::vector strs2; + std::vector strs3; auto *opt1 = app.add_option("--str", strs)->required()->expected(0, 2); + app.add_option("--str3", strs3)->expected(1, 3); app.add_option("--str2", strs2); args = {"--str"}; @@ -1004,6 +1006,11 @@ TEST_CASE_METHOD(TApp, "emptyVectorReturn", "[app]") { CHECK_NOTHROW(run()); CHECK(strs.empty()); + opt1->required(false); + args = {"--str3", "{}"}; + + CHECK_NOTHROW(run()); + CHECK_FALSE(strs3.empty()); } TEST_CASE_METHOD(TApp, "RequiredOptsDoubleShort", "[app]") { @@ -1988,6 +1995,31 @@ TEST_CASE_METHOD(TApp, "typeCheck", "[app]") { CHECK_THROWS_AS(run(), CLI::ValidationError); } +TEST_CASE_METHOD(TApp, "NeedsTrue", "[app]") { + std::string str; + app.add_option("-s,--string", str); + app.add_flag("--opt1")->check([&](const std::string &) { + return (str != "val_with_opt1") ? std::string("--opt1 requires --string val_with_opt1") : std::string{}; + }); + + run(); + + args = {"--opt1"}; + CHECK_THROWS_AS(run(), CLI::ValidationError); + + args = {"--string", "val"}; + run(); + + args = {"--string", "val", "--opt1"}; + CHECK_THROWS_AS(run(), CLI::ValidationError); + + args = {"--string", "val_with_opt1", "--opt1"}; + run(); + + args = {"--opt1", "--string", "val_with_opt1"}; // order is not revelant + run(); +} + // Check to make sure programmatic access to left over is available TEST_CASE_METHOD(TApp, "AllowExtras", "[app]") { diff --git a/libs/CommService/libs/CLI11/tests/BoostOptionTypeTest.cpp b/libs/CLI11/tests/BoostOptionTypeTest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/BoostOptionTypeTest.cpp rename to libs/CLI11/tests/BoostOptionTypeTest.cpp diff --git a/libs/cli11/tests/CMakeLists.txt b/libs/CLI11/tests/CMakeLists.txt similarity index 100% rename from libs/cli11/tests/CMakeLists.txt rename to libs/CLI11/tests/CMakeLists.txt diff --git a/libs/cli11/tests/ComplexTypeTest.cpp b/libs/CLI11/tests/ComplexTypeTest.cpp similarity index 100% rename from libs/cli11/tests/ComplexTypeTest.cpp rename to libs/CLI11/tests/ComplexTypeTest.cpp diff --git a/libs/cli11/tests/ConfigFileTest.cpp b/libs/CLI11/tests/ConfigFileTest.cpp similarity index 97% rename from libs/cli11/tests/ConfigFileTest.cpp rename to libs/CLI11/tests/ConfigFileTest.cpp index e6425f0..3aa92f9 100644 --- a/libs/cli11/tests/ConfigFileTest.cpp +++ b/libs/CLI11/tests/ConfigFileTest.cpp @@ -435,6 +435,8 @@ TEST_CASE("StringBased: file_error", "[config]") { CHECK_THROWS_AS(CLI::ConfigINI().from_file("nonexist_file"), CLI::FileError); } +static const int fclear1 = fileClear("TestIniTmp.ini"); + TEST_CASE_METHOD(TApp, "IniNotRequired", "[config]") { TempFile tmpini{"TestIniTmp.ini"}; @@ -595,6 +597,8 @@ TEST_CASE_METHOD(TApp, "IniNotRequiredbadConfigurator", "[config]") { REQUIRE_NOTHROW(run()); } +static const int fclear2 = fileClear("TestIniTmp2.ini"); + TEST_CASE_METHOD(TApp, "IniNotRequiredNotDefault", "[config]") { TempFile tmpini{"TestIniTmp.ini"}; @@ -1017,17 +1021,19 @@ TEST_CASE_METHOD(TApp, "TOMLStringVector", "[config]") { out << "zero1=[]\n"; out << "zero2={}\n"; out << "zero3={}\n"; + out << "zero4=[\"{}\",\"\"]\n"; out << "nzero={}\n"; out << "one=[\"1\"]\n"; out << "two=[\"2\",\"3\"]\n"; out << "three=[\"1\",\"2\",\"3\"]\n"; } - std::vector nzero, zero1, zero2, zero3, one, two, three; + std::vector nzero, zero1, zero2, zero3, zero4, one, two, three; app.add_option("--zero1", zero1)->required()->expected(0, 99)->default_str("{}"); app.add_option("--zero2", zero2)->required()->expected(0, 99)->default_val(std::vector{}); // if no default is specified the argument results in an empty string app.add_option("--zero3", zero3)->required()->expected(0, 99); + app.add_option("--zero4", zero4)->required()->expected(0, 99); app.add_option("--nzero", nzero)->required(); app.add_option("--one", one)->required(); app.add_option("--two", two)->required(); @@ -1038,6 +1044,7 @@ TEST_CASE_METHOD(TApp, "TOMLStringVector", "[config]") { CHECK(zero1 == std::vector({})); CHECK(zero2 == std::vector({})); CHECK(zero3 == std::vector({""})); + CHECK(zero4 == std::vector({"{}"})); CHECK(nzero == std::vector({"{}"})); CHECK(one == std::vector({"1"})); CHECK(two == std::vector({"2", "3"})); @@ -1735,6 +1742,23 @@ TEST_CASE_METHOD(TApp, "IniFlagDual", "[config]") { CHECK_THROWS_AS(run(), CLI::ConversionError); } +TEST_CASE_METHOD(TApp, "IniVectorMax", "[config]") { + + TempFile tmpini{"TestIniTmp.ini"}; + + std::vector v1; + app.config_formatter(std::make_shared()); + app.add_option("--vec", v1)->expected(0, 2); + app.set_config("--config", tmpini); + + { + std::ofstream out{tmpini}; + out << "vec=[a,b,c]" << std::endl; + } + + CHECK_THROWS_AS(run(), CLI::ArgumentMismatch); +} + TEST_CASE_METHOD(TApp, "IniShort", "[config]") { TempFile tmpini{"TestIniTmp.ini"}; @@ -2000,6 +2024,51 @@ TEST_CASE_METHOD(TApp, "IniFalseFlagsDefDisableOverrideSuccess", "[config]") { CHECK(val == 15); } +static const int fclear3 = fileClear("TestIniTmp3.ini"); + +TEST_CASE_METHOD(TApp, "IniDisableFlagOverride", "[config]") { + + TempFile tmpini{"TestIniTmp.ini"}; + TempFile tmpini2{"TestIniTmp2.ini"}; + TempFile tmpini3{"TestIniTmp3.ini"}; + + app.set_config("--config", tmpini); + + { + std::ofstream out{tmpini}; + out << "[default]" << std::endl; + out << "two=2" << std::endl; + } + + { + std::ofstream out{tmpini2}; + out << "[default]" << std::endl; + out << "two=7" << std::endl; + } + + { + std::ofstream out{tmpini3}; + out << "[default]" << std::endl; + out << "three=true" << std::endl; + } + + int val{0}; + app.add_flag("--one{1},--two{2},--three{3}", val)->disable_flag_override(); + + run(); + CHECK(tmpini.c_str() == app["--config"]->as()); + CHECK(val == 2); + + args = {"--config", tmpini2}; + CHECK_THROWS_AS(run(), CLI::ArgumentMismatch); + + args = {"--config", tmpini3}; + run(); + + CHECK(val == 3); + CHECK(tmpini3.c_str() == app.get_config_ptr()->as()); +} + TEST_CASE_METHOD(TApp, "TomlOutputSimple", "[config]") { int v{0}; diff --git a/libs/cli11/tests/CreationTest.cpp b/libs/CLI11/tests/CreationTest.cpp similarity index 100% rename from libs/cli11/tests/CreationTest.cpp rename to libs/CLI11/tests/CreationTest.cpp diff --git a/libs/CommService/libs/CLI11/tests/DeprecatedTest.cpp b/libs/CLI11/tests/DeprecatedTest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/DeprecatedTest.cpp rename to libs/CLI11/tests/DeprecatedTest.cpp diff --git a/libs/cli11/tests/FormatterTest.cpp b/libs/CLI11/tests/FormatterTest.cpp similarity index 95% rename from libs/cli11/tests/FormatterTest.cpp rename to libs/CLI11/tests/FormatterTest.cpp index 7f68cf1..1dc454b 100644 --- a/libs/cli11/tests/FormatterTest.cpp +++ b/libs/CLI11/tests/FormatterTest.cpp @@ -63,7 +63,7 @@ TEST_CASE("Formatter: OptCustomize", "[formatter]") { "Usage: [OPTIONS]\n\n" "Options:\n" " -h,--help Print this help message and exit\n" - " --opt INT (MUST HAVE) Something\n\n"); + " --opt INT (MUST HAVE) Something\n"); } TEST_CASE("Formatter: OptCustomizeSimple", "[formatter]") { @@ -82,7 +82,7 @@ TEST_CASE("Formatter: OptCustomizeSimple", "[formatter]") { "Usage: [OPTIONS]\n\n" "Options:\n" " -h,--help Print this help message and exit\n" - " --opt INT (MUST HAVE) Something\n\n"); + " --opt INT (MUST HAVE) Something\n"); } TEST_CASE("Formatter: OptCustomizeOptionText", "[formatter]") { @@ -100,7 +100,7 @@ TEST_CASE("Formatter: OptCustomizeOptionText", "[formatter]") { "Usage: [OPTIONS]\n\n" "Options:\n" " -h,--help Print this help message and exit\n" - " --opt (ARG) Something\n\n"); + " --opt (ARG) Something\n"); } TEST_CASE("Formatter: FalseFlagExample", "[formatter]") { @@ -140,7 +140,7 @@ TEST_CASE("Formatter: AppCustomize", "[formatter]") { " -h,--help Print this help message and exit\n\n" "Subcommands:\n" " subcom1 This\n" - " subcom2 This\n\n"); + " subcom2 This\n"); } TEST_CASE("Formatter: AppCustomizeSimple", "[formatter]") { @@ -159,7 +159,7 @@ TEST_CASE("Formatter: AppCustomizeSimple", "[formatter]") { " -h,--help Print this help message and exit\n\n" "Subcommands:\n" " subcom1 This\n" - " subcom2 This\n\n"); + " subcom2 This\n"); } TEST_CASE("Formatter: AllSub", "[formatter]") { diff --git a/libs/cli11/tests/HelpTest.cpp b/libs/CLI11/tests/HelpTest.cpp similarity index 98% rename from libs/cli11/tests/HelpTest.cpp rename to libs/CLI11/tests/HelpTest.cpp index eb0edd6..a09974a 100644 --- a/libs/cli11/tests/HelpTest.cpp +++ b/libs/CLI11/tests/HelpTest.cpp @@ -813,7 +813,7 @@ TEST_CASE_METHOD(CapturedHelp, "CallForAllHelpOutput", "[help]") { " One description\n\n" "two\n" " Options:\n" - " --three \n\n\n"); + " --three \n\n"); } TEST_CASE_METHOD(CapturedHelp, "NewFormattedHelp", "[help]") { app.formatter_fn([](const CLI::App *, std::string, CLI::AppFormatMode) { return "New Help"; }); @@ -974,6 +974,16 @@ TEST_CASE("THelp: GroupOrder", "[help]") { CHECK(aee_loc > zee_loc); } +TEST_CASE("THelp: GroupNameError", "[help]") { + CLI::App app; + + auto *f1 = app.add_flag("--one"); + auto *f2 = app.add_flag("--two"); + + CHECK_THROWS_AS(f1->group("evil group name\non two lines"), CLI::IncorrectConstruction); + CHECK_THROWS_AS(f2->group(std::string(5, '\0')), CLI::IncorrectConstruction); +} + TEST_CASE("THelp: ValidatorsText", "[help]") { CLI::App app; diff --git a/libs/cli11/tests/HelpersTest.cpp b/libs/CLI11/tests/HelpersTest.cpp similarity index 99% rename from libs/cli11/tests/HelpersTest.cpp rename to libs/CLI11/tests/HelpersTest.cpp index 44e1552..a5e5cbd 100644 --- a/libs/cli11/tests/HelpersTest.cpp +++ b/libs/CLI11/tests/HelpersTest.cpp @@ -525,6 +525,10 @@ TEST_CASE("Validators: ProgramNameSplit", "[helpers]") { res = CLI::detail::split_program_name(std::string(" ./") + std::string(myfile) + " "); CHECK(std::string("./") + std::string(myfile) == res.first); CHECK(res.second.empty()); + + res = CLI::detail::split_program_name("'odd_program_name.exe --arg --arg2=5"); + CHECK("'odd_program_name.exe" == res.first); + CHECK_FALSE(res.second.empty()); } TEST_CASE("CheckedMultiply: Int", "[helpers]") { @@ -1065,6 +1069,10 @@ TEST_CASE("Types: LexicalCastInt", "[helpers]") { std::string extra_input = "912i"; CHECK_FALSE(CLI::detail::lexical_cast(extra_input, y)); + extra_input = "true"; + CHECK(CLI::detail::lexical_cast(extra_input, x_signed)); + CHECK(x_signed != 0); + std::string empty_input{}; CHECK_FALSE(CLI::detail::lexical_cast(empty_input, x_signed)); CHECK_FALSE(CLI::detail::lexical_cast(empty_input, x_unsigned)); diff --git a/libs/cli11/tests/NewParseTest.cpp b/libs/CLI11/tests/NewParseTest.cpp similarity index 100% rename from libs/cli11/tests/NewParseTest.cpp rename to libs/CLI11/tests/NewParseTest.cpp diff --git a/libs/cli11/tests/OptionGroupTest.cpp b/libs/CLI11/tests/OptionGroupTest.cpp similarity index 99% rename from libs/cli11/tests/OptionGroupTest.cpp rename to libs/CLI11/tests/OptionGroupTest.cpp index bc3a945..8c5dc38 100644 --- a/libs/cli11/tests/OptionGroupTest.cpp +++ b/libs/CLI11/tests/OptionGroupTest.cpp @@ -448,6 +448,12 @@ TEST_CASE_METHOD(ManyGroups, "SingleGroup", "[optiongroup]") { CHECK_THROWS_AS(run(), CLI::RequiredError); } +TEST_CASE_METHOD(ManyGroups, "getGroup", "[optiongroup]") { + auto *mn = app.get_option_group("main"); + CHECK(mn == main); + CHECK_THROWS_AS(app.get_option_group("notfound"), CLI::OptionNotFound); +} + TEST_CASE_METHOD(ManyGroups, "ExcludesGroup", "[optiongroup]") { // only 1 group can be used g1->excludes(g2); diff --git a/libs/cli11/tests/OptionTypeTest.cpp b/libs/CLI11/tests/OptionTypeTest.cpp similarity index 93% rename from libs/cli11/tests/OptionTypeTest.cpp rename to libs/CLI11/tests/OptionTypeTest.cpp index b48ba6d..4c23ecc 100644 --- a/libs/cli11/tests/OptionTypeTest.cpp +++ b/libs/CLI11/tests/OptionTypeTest.cpp @@ -405,6 +405,86 @@ TEST_CASE_METHOD(TApp, "VectorIndexedValidator", "[optiontype]") { CHECK_THROWS_AS(run(), CLI::ValidationError); } +TEST_CASE_METHOD(TApp, "IntegerOverFlowShort", "[optiontype]") { + std::int16_t A{0}; + std::uint16_t B{0}; + + app.add_option("-a", A); + app.add_option("-b", B); + + args = {"-a", "2626254242"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "2626254242"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-26262"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-262624262525"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); +} + +TEST_CASE_METHOD(TApp, "IntegerOverFlowInt", "[optiontype]") { + int A{0}; + unsigned int B{0}; + + app.add_option("-a", A); + app.add_option("-b", B); + + args = {"-a", "262625424225252"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "262625424225252"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-2626225252"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-26262426252525252"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); +} + +TEST_CASE_METHOD(TApp, "IntegerOverFlowLong", "[optiontype]") { + std::int32_t A{0}; + std::uint32_t B{0}; + + app.add_option("-a", A); + app.add_option("-b", B); + + args = {"-a", "1111111111111111111111111111"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "1111111111111111111111111111"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-2626225252"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-111111111111111111111111"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); +} + +TEST_CASE_METHOD(TApp, "IntegerOverFlowLongLong", "[optiontype]") { + std::int64_t A{0}; + std::uint64_t B{0}; + + app.add_option("-a", A); + app.add_option("-b", B); + + args = {"-a", "1111111111111111111111111111111111111111111111111111111111"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "1111111111111111111111111111111111111111111111111111111111"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-2626225252"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); + + args = {"-b", "-111111111111111111111111111111111111111111111111111111111"}; + CHECK_THROWS_AS(run(), CLI::ConversionError); +} + TEST_CASE_METHOD(TApp, "VectorUnlimString", "[optiontype]") { std::vector strvec; std::vector answer{"mystring", "mystring2", "mystring3"}; diff --git a/libs/CommService/libs/CLI11/tests/OptionalTest.cpp b/libs/CLI11/tests/OptionalTest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/OptionalTest.cpp rename to libs/CLI11/tests/OptionalTest.cpp diff --git a/libs/cli11/tests/SetTest.cpp b/libs/CLI11/tests/SetTest.cpp similarity index 98% rename from libs/cli11/tests/SetTest.cpp rename to libs/CLI11/tests/SetTest.cpp index 8184350..ffb15eb 100644 --- a/libs/cli11/tests/SetTest.cpp +++ b/libs/CLI11/tests/SetTest.cpp @@ -492,6 +492,23 @@ TEST_CASE_METHOD(TApp, "FailSet", "[set]") { CHECK_THROWS_AS(run(), CLI::ValidationError); } +TEST_CASE_METHOD(TApp, "shortStringCheck", "[set]") { + + std::string choice; + app.add_option("-q,--quick", choice)->check([](const std::string &v) { + if(v.size() > 5) { + return std::string{"string too long"}; + } + return std::string{}; + }); + + args = {"--quick", "3"}; + CHECK_NOTHROW(run()); + + args = {"--quick=hello_goodbye"}; + CHECK_THROWS_AS(run(), CLI::ValidationError); +} + TEST_CASE_METHOD(TApp, "FailMutableSet", "[set]") { int choice{0}; diff --git a/libs/CommService/libs/CLI11/tests/SimpleTest.cpp b/libs/CLI11/tests/SimpleTest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/SimpleTest.cpp rename to libs/CLI11/tests/SimpleTest.cpp diff --git a/libs/cli11/tests/StringParseTest.cpp b/libs/CLI11/tests/StringParseTest.cpp similarity index 100% rename from libs/cli11/tests/StringParseTest.cpp rename to libs/CLI11/tests/StringParseTest.cpp diff --git a/libs/cli11/tests/SubcommandTest.cpp b/libs/CLI11/tests/SubcommandTest.cpp similarity index 100% rename from libs/cli11/tests/SubcommandTest.cpp rename to libs/CLI11/tests/SubcommandTest.cpp diff --git a/libs/CommService/libs/CLI11/tests/TimerTest.cpp b/libs/CLI11/tests/TimerTest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/TimerTest.cpp rename to libs/CLI11/tests/TimerTest.cpp diff --git a/libs/cli11/tests/TransformTest.cpp b/libs/CLI11/tests/TransformTest.cpp similarity index 100% rename from libs/cli11/tests/TransformTest.cpp rename to libs/CLI11/tests/TransformTest.cpp diff --git a/libs/CommService/libs/CLI11/tests/TrueFalseTest.cpp b/libs/CLI11/tests/TrueFalseTest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/TrueFalseTest.cpp rename to libs/CLI11/tests/TrueFalseTest.cpp diff --git a/libs/CommService/libs/CLI11/tests/WindowsTest.cpp b/libs/CLI11/tests/WindowsTest.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/WindowsTest.cpp rename to libs/CLI11/tests/WindowsTest.cpp diff --git a/libs/cli11/tests/app_helper.hpp b/libs/CLI11/tests/app_helper.hpp similarity index 94% rename from libs/cli11/tests/app_helper.hpp rename to libs/CLI11/tests/app_helper.hpp index f8d7e72..db98b29 100644 --- a/libs/cli11/tests/app_helper.hpp +++ b/libs/CLI11/tests/app_helper.hpp @@ -33,6 +33,8 @@ class TApp { } }; +CLI11_INLINE int fileClear(const std::string &name) { return std::remove(name.c_str()); } + class TempFile { std::string _name{}; diff --git a/libs/CommService/libs/CLI11/tests/catch.hpp b/libs/CLI11/tests/catch.hpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/catch.hpp rename to libs/CLI11/tests/catch.hpp diff --git a/libs/CommService/libs/CLI11/tests/informational.cpp b/libs/CLI11/tests/informational.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/informational.cpp rename to libs/CLI11/tests/informational.cpp diff --git a/libs/CommService/libs/CLI11/tests/link_test_1.cpp b/libs/CLI11/tests/link_test_1.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/link_test_1.cpp rename to libs/CLI11/tests/link_test_1.cpp diff --git a/libs/CommService/libs/CLI11/tests/link_test_2.cpp b/libs/CLI11/tests/link_test_2.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/link_test_2.cpp rename to libs/CLI11/tests/link_test_2.cpp diff --git a/libs/CommService/libs/CLI11/tests/main.cpp b/libs/CLI11/tests/main.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/main.cpp rename to libs/CLI11/tests/main.cpp diff --git a/libs/CommService/libs/CLI11/tests/meson.build b/libs/CLI11/tests/meson.build similarity index 100% rename from libs/CommService/libs/CLI11/tests/meson.build rename to libs/CLI11/tests/meson.build diff --git a/libs/CommService/libs/CLI11/tests/mesonTest/README.md b/libs/CLI11/tests/mesonTest/README.md similarity index 100% rename from libs/CommService/libs/CLI11/tests/mesonTest/README.md rename to libs/CLI11/tests/mesonTest/README.md diff --git a/libs/CommService/libs/CLI11/tests/mesonTest/main.cpp b/libs/CLI11/tests/mesonTest/main.cpp similarity index 100% rename from libs/CommService/libs/CLI11/tests/mesonTest/main.cpp rename to libs/CLI11/tests/mesonTest/main.cpp diff --git a/libs/CommService/libs/CLI11/tests/mesonTest/meson.build b/libs/CLI11/tests/mesonTest/meson.build similarity index 100% rename from libs/CommService/libs/CLI11/tests/mesonTest/meson.build rename to libs/CLI11/tests/mesonTest/meson.build diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.clang-format b/libs/Catch2/.clang-format similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.clang-format rename to libs/Catch2/.clang-format diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.conan/build.py b/libs/Catch2/.conan/build.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.conan/build.py rename to libs/Catch2/.conan/build.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.conan/test_package/CMakeLists.txt b/libs/Catch2/.conan/test_package/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.conan/test_package/CMakeLists.txt rename to libs/Catch2/.conan/test_package/CMakeLists.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.conan/test_package/conanfile.py b/libs/Catch2/.conan/test_package/conanfile.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.conan/test_package/conanfile.py rename to libs/Catch2/.conan/test_package/conanfile.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.conan/test_package/test_package.cpp b/libs/Catch2/.conan/test_package/test_package.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.conan/test_package/test_package.cpp rename to libs/Catch2/.conan/test_package/test_package.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.gitattributes b/libs/Catch2/.gitattributes similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.gitattributes rename to libs/Catch2/.gitattributes diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.github/FUNDING.yml b/libs/Catch2/.github/FUNDING.yml similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.github/FUNDING.yml rename to libs/Catch2/.github/FUNDING.yml diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.github/ISSUE_TEMPLATE/bug_report.md b/libs/Catch2/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.github/ISSUE_TEMPLATE/bug_report.md rename to libs/Catch2/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.github/ISSUE_TEMPLATE/feature_request.md b/libs/Catch2/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.github/ISSUE_TEMPLATE/feature_request.md rename to libs/Catch2/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.github/pull_request_template.md b/libs/Catch2/.github/pull_request_template.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.github/pull_request_template.md rename to libs/Catch2/.github/pull_request_template.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.gitignore b/libs/Catch2/.gitignore similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.gitignore rename to libs/Catch2/.gitignore diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/.travis.yml b/libs/Catch2/.travis.yml similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/.travis.yml rename to libs/Catch2/.travis.yml diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/BUILD.bazel b/libs/Catch2/BUILD.bazel similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/BUILD.bazel rename to libs/Catch2/BUILD.bazel diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMake/Catch2Config.cmake.in b/libs/Catch2/CMake/Catch2Config.cmake.in similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMake/Catch2Config.cmake.in rename to libs/Catch2/CMake/Catch2Config.cmake.in diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMake/FindGcov.cmake b/libs/Catch2/CMake/FindGcov.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMake/FindGcov.cmake rename to libs/Catch2/CMake/FindGcov.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMake/FindLcov.cmake b/libs/Catch2/CMake/FindLcov.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMake/FindLcov.cmake rename to libs/Catch2/CMake/FindLcov.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMake/Findcodecov.cmake b/libs/Catch2/CMake/Findcodecov.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMake/Findcodecov.cmake rename to libs/Catch2/CMake/Findcodecov.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMake/MiscFunctions.cmake b/libs/Catch2/CMake/MiscFunctions.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMake/MiscFunctions.cmake rename to libs/Catch2/CMake/MiscFunctions.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMake/catch2.pc.in b/libs/Catch2/CMake/catch2.pc.in similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMake/catch2.pc.in rename to libs/Catch2/CMake/catch2.pc.in diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMake/llvm-cov-wrapper b/libs/Catch2/CMake/llvm-cov-wrapper similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMake/llvm-cov-wrapper rename to libs/Catch2/CMake/llvm-cov-wrapper diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CMakeLists.txt b/libs/Catch2/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CMakeLists.txt rename to libs/Catch2/CMakeLists.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/CODE_OF_CONDUCT.md b/libs/Catch2/CODE_OF_CONDUCT.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/CODE_OF_CONDUCT.md rename to libs/Catch2/CODE_OF_CONDUCT.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/LICENSE.txt b/libs/Catch2/LICENSE.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/LICENSE.txt rename to libs/Catch2/LICENSE.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/README.md b/libs/Catch2/README.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/README.md rename to libs/Catch2/README.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/WORKSPACE b/libs/Catch2/WORKSPACE similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/WORKSPACE rename to libs/Catch2/WORKSPACE diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/appveyor.yml b/libs/Catch2/appveyor.yml similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/appveyor.yml rename to libs/Catch2/appveyor.yml diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/artwork/catch2-c-logo.png b/libs/Catch2/artwork/catch2-c-logo.png similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/artwork/catch2-c-logo.png rename to libs/Catch2/artwork/catch2-c-logo.png diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/artwork/catch2-hand-logo.png b/libs/Catch2/artwork/catch2-hand-logo.png similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/artwork/catch2-hand-logo.png rename to libs/Catch2/artwork/catch2-hand-logo.png diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/artwork/catch2-logo-small.png b/libs/Catch2/artwork/catch2-logo-small.png similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/artwork/catch2-logo-small.png rename to libs/Catch2/artwork/catch2-logo-small.png diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/codecov.yml b/libs/Catch2/codecov.yml similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/codecov.yml rename to libs/Catch2/codecov.yml diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/conanfile.py b/libs/Catch2/conanfile.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/conanfile.py rename to libs/Catch2/conanfile.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/contrib/Catch.cmake b/libs/Catch2/contrib/Catch.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/contrib/Catch.cmake rename to libs/Catch2/contrib/Catch.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/contrib/CatchAddTests.cmake b/libs/Catch2/contrib/CatchAddTests.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/contrib/CatchAddTests.cmake rename to libs/Catch2/contrib/CatchAddTests.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/contrib/ParseAndAddCatchTests.cmake b/libs/Catch2/contrib/ParseAndAddCatchTests.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/contrib/ParseAndAddCatchTests.cmake rename to libs/Catch2/contrib/ParseAndAddCatchTests.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/contrib/gdbinit b/libs/Catch2/contrib/gdbinit similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/contrib/gdbinit rename to libs/Catch2/contrib/gdbinit diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/contrib/lldbinit b/libs/Catch2/contrib/lldbinit similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/contrib/lldbinit rename to libs/Catch2/contrib/lldbinit diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/Readme.md b/libs/Catch2/docs/Readme.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/Readme.md rename to libs/Catch2/docs/Readme.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/assertions.md b/libs/Catch2/docs/assertions.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/assertions.md rename to libs/Catch2/docs/assertions.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/benchmarks.md b/libs/Catch2/docs/benchmarks.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/benchmarks.md rename to libs/Catch2/docs/benchmarks.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/ci-and-misc.md b/libs/Catch2/docs/ci-and-misc.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/ci-and-misc.md rename to libs/Catch2/docs/ci-and-misc.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/cmake-integration.md b/libs/Catch2/docs/cmake-integration.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/cmake-integration.md rename to libs/Catch2/docs/cmake-integration.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/command-line.md b/libs/Catch2/docs/command-line.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/command-line.md rename to libs/Catch2/docs/command-line.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/commercial-users.md b/libs/Catch2/docs/commercial-users.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/commercial-users.md rename to libs/Catch2/docs/commercial-users.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/configuration.md b/libs/Catch2/docs/configuration.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/configuration.md rename to libs/Catch2/docs/configuration.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/contributing.md b/libs/Catch2/docs/contributing.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/contributing.md rename to libs/Catch2/docs/contributing.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/deprecations.md b/libs/Catch2/docs/deprecations.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/deprecations.md rename to libs/Catch2/docs/deprecations.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/event-listeners.md b/libs/Catch2/docs/event-listeners.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/event-listeners.md rename to libs/Catch2/docs/event-listeners.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/generators.md b/libs/Catch2/docs/generators.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/generators.md rename to libs/Catch2/docs/generators.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/limitations.md b/libs/Catch2/docs/limitations.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/limitations.md rename to libs/Catch2/docs/limitations.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/list-of-examples.md b/libs/Catch2/docs/list-of-examples.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/list-of-examples.md rename to libs/Catch2/docs/list-of-examples.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/logging.md b/libs/Catch2/docs/logging.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/logging.md rename to libs/Catch2/docs/logging.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/matchers.md b/libs/Catch2/docs/matchers.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/matchers.md rename to libs/Catch2/docs/matchers.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/opensource-users.md b/libs/Catch2/docs/opensource-users.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/opensource-users.md rename to libs/Catch2/docs/opensource-users.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/other-macros.md b/libs/Catch2/docs/other-macros.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/other-macros.md rename to libs/Catch2/docs/other-macros.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/own-main.md b/libs/Catch2/docs/own-main.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/own-main.md rename to libs/Catch2/docs/own-main.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/release-notes.md b/libs/Catch2/docs/release-notes.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/release-notes.md rename to libs/Catch2/docs/release-notes.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/release-process.md b/libs/Catch2/docs/release-process.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/release-process.md rename to libs/Catch2/docs/release-process.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/reporters.md b/libs/Catch2/docs/reporters.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/reporters.md rename to libs/Catch2/docs/reporters.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/slow-compiles.md b/libs/Catch2/docs/slow-compiles.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/slow-compiles.md rename to libs/Catch2/docs/slow-compiles.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/test-cases-and-sections.md b/libs/Catch2/docs/test-cases-and-sections.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/test-cases-and-sections.md rename to libs/Catch2/docs/test-cases-and-sections.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/test-fixtures.md b/libs/Catch2/docs/test-fixtures.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/test-fixtures.md rename to libs/Catch2/docs/test-fixtures.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/tostring.md b/libs/Catch2/docs/tostring.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/tostring.md rename to libs/Catch2/docs/tostring.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/tutorial.md b/libs/Catch2/docs/tutorial.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/tutorial.md rename to libs/Catch2/docs/tutorial.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/docs/why-catch.md b/libs/Catch2/docs/why-catch.md similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/docs/why-catch.md rename to libs/Catch2/docs/why-catch.md diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/000-CatchMain.cpp b/libs/Catch2/examples/000-CatchMain.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/000-CatchMain.cpp rename to libs/Catch2/examples/000-CatchMain.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/010-TestCase.cpp b/libs/Catch2/examples/010-TestCase.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/010-TestCase.cpp rename to libs/Catch2/examples/010-TestCase.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/020-TestCase-1.cpp b/libs/Catch2/examples/020-TestCase-1.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/020-TestCase-1.cpp rename to libs/Catch2/examples/020-TestCase-1.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/020-TestCase-2.cpp b/libs/Catch2/examples/020-TestCase-2.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/020-TestCase-2.cpp rename to libs/Catch2/examples/020-TestCase-2.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/030-Asn-Require-Check.cpp b/libs/Catch2/examples/030-Asn-Require-Check.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/030-Asn-Require-Check.cpp rename to libs/Catch2/examples/030-Asn-Require-Check.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/100-Fix-Section.cpp b/libs/Catch2/examples/100-Fix-Section.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/100-Fix-Section.cpp rename to libs/Catch2/examples/100-Fix-Section.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/110-Fix-ClassFixture.cpp b/libs/Catch2/examples/110-Fix-ClassFixture.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/110-Fix-ClassFixture.cpp rename to libs/Catch2/examples/110-Fix-ClassFixture.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp b/libs/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp rename to libs/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/200-Rpt-CatchMain.cpp b/libs/Catch2/examples/200-Rpt-CatchMain.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/200-Rpt-CatchMain.cpp rename to libs/Catch2/examples/200-Rpt-CatchMain.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/207-Rpt-TeamCityReporter.cpp b/libs/Catch2/examples/207-Rpt-TeamCityReporter.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/207-Rpt-TeamCityReporter.cpp rename to libs/Catch2/examples/207-Rpt-TeamCityReporter.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/210-Evt-EventListeners.cpp b/libs/Catch2/examples/210-Evt-EventListeners.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/210-Evt-EventListeners.cpp rename to libs/Catch2/examples/210-Evt-EventListeners.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/231-Cfg-OutputStreams.cpp b/libs/Catch2/examples/231-Cfg-OutputStreams.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/231-Cfg-OutputStreams.cpp rename to libs/Catch2/examples/231-Cfg-OutputStreams.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/300-Gen-OwnGenerator.cpp b/libs/Catch2/examples/300-Gen-OwnGenerator.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/300-Gen-OwnGenerator.cpp rename to libs/Catch2/examples/300-Gen-OwnGenerator.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/301-Gen-MapTypeConversion.cpp b/libs/Catch2/examples/301-Gen-MapTypeConversion.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/301-Gen-MapTypeConversion.cpp rename to libs/Catch2/examples/301-Gen-MapTypeConversion.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/302-Gen-Table.cpp b/libs/Catch2/examples/302-Gen-Table.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/302-Gen-Table.cpp rename to libs/Catch2/examples/302-Gen-Table.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/310-Gen-VariablesInGenerators.cpp b/libs/Catch2/examples/310-Gen-VariablesInGenerators.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/310-Gen-VariablesInGenerators.cpp rename to libs/Catch2/examples/310-Gen-VariablesInGenerators.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/311-Gen-CustomCapture.cpp b/libs/Catch2/examples/311-Gen-CustomCapture.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/311-Gen-CustomCapture.cpp rename to libs/Catch2/examples/311-Gen-CustomCapture.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/examples/CMakeLists.txt b/libs/Catch2/examples/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/examples/CMakeLists.txt rename to libs/Catch2/examples/CMakeLists.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/catch.hpp b/libs/Catch2/include/catch.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/catch.hpp rename to libs/Catch2/include/catch.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/catch_with_main.hpp b/libs/Catch2/include/catch_with_main.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/catch_with_main.hpp rename to libs/Catch2/include/catch_with_main.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/external/clara.hpp b/libs/Catch2/include/external/clara.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/external/clara.hpp rename to libs/Catch2/include/external/clara.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_benchmark.hpp b/libs/Catch2/include/internal/benchmark/catch_benchmark.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_benchmark.hpp rename to libs/Catch2/include/internal/benchmark/catch_benchmark.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_benchmarking_all.hpp b/libs/Catch2/include/internal/benchmark/catch_benchmarking_all.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_benchmarking_all.hpp rename to libs/Catch2/include/internal/benchmark/catch_benchmarking_all.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_chronometer.hpp b/libs/Catch2/include/internal/benchmark/catch_chronometer.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_chronometer.hpp rename to libs/Catch2/include/internal/benchmark/catch_chronometer.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_clock.hpp b/libs/Catch2/include/internal/benchmark/catch_clock.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_clock.hpp rename to libs/Catch2/include/internal/benchmark/catch_clock.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_constructor.hpp b/libs/Catch2/include/internal/benchmark/catch_constructor.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_constructor.hpp rename to libs/Catch2/include/internal/benchmark/catch_constructor.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_environment.hpp b/libs/Catch2/include/internal/benchmark/catch_environment.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_environment.hpp rename to libs/Catch2/include/internal/benchmark/catch_environment.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_estimate.hpp b/libs/Catch2/include/internal/benchmark/catch_estimate.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_estimate.hpp rename to libs/Catch2/include/internal/benchmark/catch_estimate.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_execution_plan.hpp b/libs/Catch2/include/internal/benchmark/catch_execution_plan.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_execution_plan.hpp rename to libs/Catch2/include/internal/benchmark/catch_execution_plan.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_optimizer.hpp b/libs/Catch2/include/internal/benchmark/catch_optimizer.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_optimizer.hpp rename to libs/Catch2/include/internal/benchmark/catch_optimizer.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_outlier_classification.hpp b/libs/Catch2/include/internal/benchmark/catch_outlier_classification.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_outlier_classification.hpp rename to libs/Catch2/include/internal/benchmark/catch_outlier_classification.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_sample_analysis.hpp b/libs/Catch2/include/internal/benchmark/catch_sample_analysis.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/catch_sample_analysis.hpp rename to libs/Catch2/include/internal/benchmark/catch_sample_analysis.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_analyse.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_analyse.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_analyse.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_analyse.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_benchmark_function.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_benchmark_function.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_benchmark_function.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_benchmark_function.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_complete_invoke.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_complete_invoke.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_complete_invoke.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_complete_invoke.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_estimate_clock.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_estimate_clock.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_estimate_clock.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_estimate_clock.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_measure.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_measure.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_measure.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_measure.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_repeat.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_repeat.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_repeat.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_repeat.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_run_for_at_least.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_run_for_at_least.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_run_for_at_least.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_run_for_at_least.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_stats.cpp b/libs/Catch2/include/internal/benchmark/detail/catch_stats.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_stats.cpp rename to libs/Catch2/include/internal/benchmark/detail/catch_stats.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_stats.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_stats.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_stats.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_stats.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_timing.hpp b/libs/Catch2/include/internal/benchmark/detail/catch_timing.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/benchmark/detail/catch_timing.hpp rename to libs/Catch2/include/internal/benchmark/detail/catch_timing.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_approx.cpp b/libs/Catch2/include/internal/catch_approx.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_approx.cpp rename to libs/Catch2/include/internal/catch_approx.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_approx.h b/libs/Catch2/include/internal/catch_approx.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_approx.h rename to libs/Catch2/include/internal/catch_approx.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionhandler.cpp b/libs/Catch2/include/internal/catch_assertionhandler.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionhandler.cpp rename to libs/Catch2/include/internal/catch_assertionhandler.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionhandler.h b/libs/Catch2/include/internal/catch_assertionhandler.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionhandler.h rename to libs/Catch2/include/internal/catch_assertionhandler.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertioninfo.h b/libs/Catch2/include/internal/catch_assertioninfo.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertioninfo.h rename to libs/Catch2/include/internal/catch_assertioninfo.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionresult.cpp b/libs/Catch2/include/internal/catch_assertionresult.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionresult.cpp rename to libs/Catch2/include/internal/catch_assertionresult.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionresult.h b/libs/Catch2/include/internal/catch_assertionresult.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_assertionresult.h rename to libs/Catch2/include/internal/catch_assertionresult.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_capture.hpp b/libs/Catch2/include/internal/catch_capture.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_capture.hpp rename to libs/Catch2/include/internal/catch_capture.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_capture_matchers.cpp b/libs/Catch2/include/internal/catch_capture_matchers.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_capture_matchers.cpp rename to libs/Catch2/include/internal/catch_capture_matchers.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_capture_matchers.h b/libs/Catch2/include/internal/catch_capture_matchers.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_capture_matchers.h rename to libs/Catch2/include/internal/catch_capture_matchers.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_clara.h b/libs/Catch2/include/internal/catch_clara.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_clara.h rename to libs/Catch2/include/internal/catch_clara.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_commandline.cpp b/libs/Catch2/include/internal/catch_commandline.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_commandline.cpp rename to libs/Catch2/include/internal/catch_commandline.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_commandline.h b/libs/Catch2/include/internal/catch_commandline.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_commandline.h rename to libs/Catch2/include/internal/catch_commandline.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_common.cpp b/libs/Catch2/include/internal/catch_common.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_common.cpp rename to libs/Catch2/include/internal/catch_common.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_common.h b/libs/Catch2/include/internal/catch_common.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_common.h rename to libs/Catch2/include/internal/catch_common.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_compiler_capabilities.h b/libs/Catch2/include/internal/catch_compiler_capabilities.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_compiler_capabilities.h rename to libs/Catch2/include/internal/catch_compiler_capabilities.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_config.cpp b/libs/Catch2/include/internal/catch_config.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_config.cpp rename to libs/Catch2/include/internal/catch_config.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_config.hpp b/libs/Catch2/include/internal/catch_config.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_config.hpp rename to libs/Catch2/include/internal/catch_config.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_config_uncaught_exceptions.hpp b/libs/Catch2/include/internal/catch_config_uncaught_exceptions.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_config_uncaught_exceptions.hpp rename to libs/Catch2/include/internal/catch_config_uncaught_exceptions.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_console_colour.cpp b/libs/Catch2/include/internal/catch_console_colour.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_console_colour.cpp rename to libs/Catch2/include/internal/catch_console_colour.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_console_colour.h b/libs/Catch2/include/internal/catch_console_colour.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_console_colour.h rename to libs/Catch2/include/internal/catch_console_colour.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_context.cpp b/libs/Catch2/include/internal/catch_context.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_context.cpp rename to libs/Catch2/include/internal/catch_context.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_context.h b/libs/Catch2/include/internal/catch_context.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_context.h rename to libs/Catch2/include/internal/catch_context.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debug_console.cpp b/libs/Catch2/include/internal/catch_debug_console.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debug_console.cpp rename to libs/Catch2/include/internal/catch_debug_console.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debug_console.h b/libs/Catch2/include/internal/catch_debug_console.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debug_console.h rename to libs/Catch2/include/internal/catch_debug_console.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debugger.cpp b/libs/Catch2/include/internal/catch_debugger.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debugger.cpp rename to libs/Catch2/include/internal/catch_debugger.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debugger.h b/libs/Catch2/include/internal/catch_debugger.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_debugger.h rename to libs/Catch2/include/internal/catch_debugger.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_decomposer.cpp b/libs/Catch2/include/internal/catch_decomposer.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_decomposer.cpp rename to libs/Catch2/include/internal/catch_decomposer.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_decomposer.h b/libs/Catch2/include/internal/catch_decomposer.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_decomposer.h rename to libs/Catch2/include/internal/catch_decomposer.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_default_main.hpp b/libs/Catch2/include/internal/catch_default_main.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_default_main.hpp rename to libs/Catch2/include/internal/catch_default_main.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enforce.cpp b/libs/Catch2/include/internal/catch_enforce.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enforce.cpp rename to libs/Catch2/include/internal/catch_enforce.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enforce.h b/libs/Catch2/include/internal/catch_enforce.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enforce.h rename to libs/Catch2/include/internal/catch_enforce.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enum_values_registry.cpp b/libs/Catch2/include/internal/catch_enum_values_registry.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enum_values_registry.cpp rename to libs/Catch2/include/internal/catch_enum_values_registry.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enum_values_registry.h b/libs/Catch2/include/internal/catch_enum_values_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_enum_values_registry.h rename to libs/Catch2/include/internal/catch_enum_values_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_errno_guard.cpp b/libs/Catch2/include/internal/catch_errno_guard.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_errno_guard.cpp rename to libs/Catch2/include/internal/catch_errno_guard.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_errno_guard.h b/libs/Catch2/include/internal/catch_errno_guard.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_errno_guard.h rename to libs/Catch2/include/internal/catch_errno_guard.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_exception_translator_registry.cpp b/libs/Catch2/include/internal/catch_exception_translator_registry.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_exception_translator_registry.cpp rename to libs/Catch2/include/internal/catch_exception_translator_registry.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_exception_translator_registry.h b/libs/Catch2/include/internal/catch_exception_translator_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_exception_translator_registry.h rename to libs/Catch2/include/internal/catch_exception_translator_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_external_interfaces.h b/libs/Catch2/include/internal/catch_external_interfaces.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_external_interfaces.h rename to libs/Catch2/include/internal/catch_external_interfaces.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_fatal_condition.cpp b/libs/Catch2/include/internal/catch_fatal_condition.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_fatal_condition.cpp rename to libs/Catch2/include/internal/catch_fatal_condition.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_fatal_condition.h b/libs/Catch2/include/internal/catch_fatal_condition.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_fatal_condition.h rename to libs/Catch2/include/internal/catch_fatal_condition.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators.cpp b/libs/Catch2/include/internal/catch_generators.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators.cpp rename to libs/Catch2/include/internal/catch_generators.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators.hpp b/libs/Catch2/include/internal/catch_generators.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators.hpp rename to libs/Catch2/include/internal/catch_generators.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators_generic.hpp b/libs/Catch2/include/internal/catch_generators_generic.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators_generic.hpp rename to libs/Catch2/include/internal/catch_generators_generic.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators_specific.hpp b/libs/Catch2/include/internal/catch_generators_specific.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_generators_specific.hpp rename to libs/Catch2/include/internal/catch_generators_specific.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_impl.hpp b/libs/Catch2/include/internal/catch_impl.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_impl.hpp rename to libs/Catch2/include/internal/catch_impl.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_capture.cpp b/libs/Catch2/include/internal/catch_interfaces_capture.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_capture.cpp rename to libs/Catch2/include/internal/catch_interfaces_capture.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_capture.h b/libs/Catch2/include/internal/catch_interfaces_capture.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_capture.h rename to libs/Catch2/include/internal/catch_interfaces_capture.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_config.cpp b/libs/Catch2/include/internal/catch_interfaces_config.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_config.cpp rename to libs/Catch2/include/internal/catch_interfaces_config.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_config.h b/libs/Catch2/include/internal/catch_interfaces_config.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_config.h rename to libs/Catch2/include/internal/catch_interfaces_config.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_enum_values_registry.h b/libs/Catch2/include/internal/catch_interfaces_enum_values_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_enum_values_registry.h rename to libs/Catch2/include/internal/catch_interfaces_enum_values_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_exception.cpp b/libs/Catch2/include/internal/catch_interfaces_exception.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_exception.cpp rename to libs/Catch2/include/internal/catch_interfaces_exception.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_exception.h b/libs/Catch2/include/internal/catch_interfaces_exception.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_exception.h rename to libs/Catch2/include/internal/catch_interfaces_exception.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_generatortracker.h b/libs/Catch2/include/internal/catch_interfaces_generatortracker.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_generatortracker.h rename to libs/Catch2/include/internal/catch_interfaces_generatortracker.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_registry_hub.cpp b/libs/Catch2/include/internal/catch_interfaces_registry_hub.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_registry_hub.cpp rename to libs/Catch2/include/internal/catch_interfaces_registry_hub.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_registry_hub.h b/libs/Catch2/include/internal/catch_interfaces_registry_hub.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_registry_hub.h rename to libs/Catch2/include/internal/catch_interfaces_registry_hub.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_reporter.cpp b/libs/Catch2/include/internal/catch_interfaces_reporter.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_reporter.cpp rename to libs/Catch2/include/internal/catch_interfaces_reporter.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_reporter.h b/libs/Catch2/include/internal/catch_interfaces_reporter.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_reporter.h rename to libs/Catch2/include/internal/catch_interfaces_reporter.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_runner.cpp b/libs/Catch2/include/internal/catch_interfaces_runner.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_runner.cpp rename to libs/Catch2/include/internal/catch_interfaces_runner.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_runner.h b/libs/Catch2/include/internal/catch_interfaces_runner.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_runner.h rename to libs/Catch2/include/internal/catch_interfaces_runner.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_tag_alias_registry.h b/libs/Catch2/include/internal/catch_interfaces_tag_alias_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_tag_alias_registry.h rename to libs/Catch2/include/internal/catch_interfaces_tag_alias_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_testcase.cpp b/libs/Catch2/include/internal/catch_interfaces_testcase.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_testcase.cpp rename to libs/Catch2/include/internal/catch_interfaces_testcase.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_testcase.h b/libs/Catch2/include/internal/catch_interfaces_testcase.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_interfaces_testcase.h rename to libs/Catch2/include/internal/catch_interfaces_testcase.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_leak_detector.cpp b/libs/Catch2/include/internal/catch_leak_detector.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_leak_detector.cpp rename to libs/Catch2/include/internal/catch_leak_detector.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_leak_detector.h b/libs/Catch2/include/internal/catch_leak_detector.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_leak_detector.h rename to libs/Catch2/include/internal/catch_leak_detector.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_list.cpp b/libs/Catch2/include/internal/catch_list.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_list.cpp rename to libs/Catch2/include/internal/catch_list.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_list.h b/libs/Catch2/include/internal/catch_list.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_list.h rename to libs/Catch2/include/internal/catch_list.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers.cpp b/libs/Catch2/include/internal/catch_matchers.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers.cpp rename to libs/Catch2/include/internal/catch_matchers.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers.h b/libs/Catch2/include/internal/catch_matchers.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers.h rename to libs/Catch2/include/internal/catch_matchers.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_exception.cpp b/libs/Catch2/include/internal/catch_matchers_exception.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_exception.cpp rename to libs/Catch2/include/internal/catch_matchers_exception.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_exception.hpp b/libs/Catch2/include/internal/catch_matchers_exception.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_exception.hpp rename to libs/Catch2/include/internal/catch_matchers_exception.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_floating.cpp b/libs/Catch2/include/internal/catch_matchers_floating.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_floating.cpp rename to libs/Catch2/include/internal/catch_matchers_floating.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_floating.h b/libs/Catch2/include/internal/catch_matchers_floating.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_floating.h rename to libs/Catch2/include/internal/catch_matchers_floating.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_generic.cpp b/libs/Catch2/include/internal/catch_matchers_generic.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_generic.cpp rename to libs/Catch2/include/internal/catch_matchers_generic.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_generic.hpp b/libs/Catch2/include/internal/catch_matchers_generic.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_generic.hpp rename to libs/Catch2/include/internal/catch_matchers_generic.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_string.cpp b/libs/Catch2/include/internal/catch_matchers_string.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_string.cpp rename to libs/Catch2/include/internal/catch_matchers_string.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_string.h b/libs/Catch2/include/internal/catch_matchers_string.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_string.h rename to libs/Catch2/include/internal/catch_matchers_string.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_vector.h b/libs/Catch2/include/internal/catch_matchers_vector.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_matchers_vector.h rename to libs/Catch2/include/internal/catch_matchers_vector.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_message.cpp b/libs/Catch2/include/internal/catch_message.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_message.cpp rename to libs/Catch2/include/internal/catch_message.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_message.h b/libs/Catch2/include/internal/catch_message.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_message.h rename to libs/Catch2/include/internal/catch_message.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_meta.hpp b/libs/Catch2/include/internal/catch_meta.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_meta.hpp rename to libs/Catch2/include/internal/catch_meta.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_objc.hpp b/libs/Catch2/include/internal/catch_objc.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_objc.hpp rename to libs/Catch2/include/internal/catch_objc.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_objc_arc.hpp b/libs/Catch2/include/internal/catch_objc_arc.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_objc_arc.hpp rename to libs/Catch2/include/internal/catch_objc_arc.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_option.hpp b/libs/Catch2/include/internal/catch_option.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_option.hpp rename to libs/Catch2/include/internal/catch_option.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_output_redirect.cpp b/libs/Catch2/include/internal/catch_output_redirect.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_output_redirect.cpp rename to libs/Catch2/include/internal/catch_output_redirect.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_output_redirect.h b/libs/Catch2/include/internal/catch_output_redirect.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_output_redirect.h rename to libs/Catch2/include/internal/catch_output_redirect.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_platform.h b/libs/Catch2/include/internal/catch_platform.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_platform.h rename to libs/Catch2/include/internal/catch_platform.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_polyfills.cpp b/libs/Catch2/include/internal/catch_polyfills.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_polyfills.cpp rename to libs/Catch2/include/internal/catch_polyfills.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_polyfills.hpp b/libs/Catch2/include/internal/catch_polyfills.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_polyfills.hpp rename to libs/Catch2/include/internal/catch_polyfills.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_preprocessor.hpp b/libs/Catch2/include/internal/catch_preprocessor.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_preprocessor.hpp rename to libs/Catch2/include/internal/catch_preprocessor.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_random_number_generator.cpp b/libs/Catch2/include/internal/catch_random_number_generator.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_random_number_generator.cpp rename to libs/Catch2/include/internal/catch_random_number_generator.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_random_number_generator.h b/libs/Catch2/include/internal/catch_random_number_generator.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_random_number_generator.h rename to libs/Catch2/include/internal/catch_random_number_generator.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reenable_warnings.h b/libs/Catch2/include/internal/catch_reenable_warnings.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reenable_warnings.h rename to libs/Catch2/include/internal/catch_reenable_warnings.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_registry_hub.cpp b/libs/Catch2/include/internal/catch_registry_hub.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_registry_hub.cpp rename to libs/Catch2/include/internal/catch_registry_hub.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reporter_registrars.hpp b/libs/Catch2/include/internal/catch_reporter_registrars.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reporter_registrars.hpp rename to libs/Catch2/include/internal/catch_reporter_registrars.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reporter_registry.cpp b/libs/Catch2/include/internal/catch_reporter_registry.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reporter_registry.cpp rename to libs/Catch2/include/internal/catch_reporter_registry.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reporter_registry.h b/libs/Catch2/include/internal/catch_reporter_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_reporter_registry.h rename to libs/Catch2/include/internal/catch_reporter_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_result_type.cpp b/libs/Catch2/include/internal/catch_result_type.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_result_type.cpp rename to libs/Catch2/include/internal/catch_result_type.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_result_type.h b/libs/Catch2/include/internal/catch_result_type.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_result_type.h rename to libs/Catch2/include/internal/catch_result_type.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_run_context.cpp b/libs/Catch2/include/internal/catch_run_context.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_run_context.cpp rename to libs/Catch2/include/internal/catch_run_context.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_run_context.h b/libs/Catch2/include/internal/catch_run_context.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_run_context.h rename to libs/Catch2/include/internal/catch_run_context.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section.cpp b/libs/Catch2/include/internal/catch_section.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section.cpp rename to libs/Catch2/include/internal/catch_section.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section.h b/libs/Catch2/include/internal/catch_section.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section.h rename to libs/Catch2/include/internal/catch_section.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section_info.cpp b/libs/Catch2/include/internal/catch_section_info.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section_info.cpp rename to libs/Catch2/include/internal/catch_section_info.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section_info.h b/libs/Catch2/include/internal/catch_section_info.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_section_info.h rename to libs/Catch2/include/internal/catch_section_info.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_session.cpp b/libs/Catch2/include/internal/catch_session.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_session.cpp rename to libs/Catch2/include/internal/catch_session.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_session.h b/libs/Catch2/include/internal/catch_session.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_session.h rename to libs/Catch2/include/internal/catch_session.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_singletons.cpp b/libs/Catch2/include/internal/catch_singletons.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_singletons.cpp rename to libs/Catch2/include/internal/catch_singletons.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_singletons.hpp b/libs/Catch2/include/internal/catch_singletons.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_singletons.hpp rename to libs/Catch2/include/internal/catch_singletons.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_startup_exception_registry.cpp b/libs/Catch2/include/internal/catch_startup_exception_registry.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_startup_exception_registry.cpp rename to libs/Catch2/include/internal/catch_startup_exception_registry.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_startup_exception_registry.h b/libs/Catch2/include/internal/catch_startup_exception_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_startup_exception_registry.h rename to libs/Catch2/include/internal/catch_startup_exception_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stream.cpp b/libs/Catch2/include/internal/catch_stream.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stream.cpp rename to libs/Catch2/include/internal/catch_stream.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stream.h b/libs/Catch2/include/internal/catch_stream.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stream.h rename to libs/Catch2/include/internal/catch_stream.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_string_manip.cpp b/libs/Catch2/include/internal/catch_string_manip.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_string_manip.cpp rename to libs/Catch2/include/internal/catch_string_manip.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_string_manip.h b/libs/Catch2/include/internal/catch_string_manip.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_string_manip.h rename to libs/Catch2/include/internal/catch_string_manip.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stringref.cpp b/libs/Catch2/include/internal/catch_stringref.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stringref.cpp rename to libs/Catch2/include/internal/catch_stringref.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stringref.h b/libs/Catch2/include/internal/catch_stringref.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_stringref.h rename to libs/Catch2/include/internal/catch_stringref.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_suppress_warnings.h b/libs/Catch2/include/internal/catch_suppress_warnings.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_suppress_warnings.h rename to libs/Catch2/include/internal/catch_suppress_warnings.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias.cpp b/libs/Catch2/include/internal/catch_tag_alias.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias.cpp rename to libs/Catch2/include/internal/catch_tag_alias.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias.h b/libs/Catch2/include/internal/catch_tag_alias.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias.h rename to libs/Catch2/include/internal/catch_tag_alias.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_autoregistrar.cpp b/libs/Catch2/include/internal/catch_tag_alias_autoregistrar.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_autoregistrar.cpp rename to libs/Catch2/include/internal/catch_tag_alias_autoregistrar.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_autoregistrar.h b/libs/Catch2/include/internal/catch_tag_alias_autoregistrar.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_autoregistrar.h rename to libs/Catch2/include/internal/catch_tag_alias_autoregistrar.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_registry.cpp b/libs/Catch2/include/internal/catch_tag_alias_registry.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_registry.cpp rename to libs/Catch2/include/internal/catch_tag_alias_registry.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_registry.h b/libs/Catch2/include/internal/catch_tag_alias_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tag_alias_registry.h rename to libs/Catch2/include/internal/catch_tag_alias_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_info.cpp b/libs/Catch2/include/internal/catch_test_case_info.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_info.cpp rename to libs/Catch2/include/internal/catch_test_case_info.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_info.h b/libs/Catch2/include/internal/catch_test_case_info.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_info.h rename to libs/Catch2/include/internal/catch_test_case_info.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_registry_impl.cpp b/libs/Catch2/include/internal/catch_test_case_registry_impl.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_registry_impl.cpp rename to libs/Catch2/include/internal/catch_test_case_registry_impl.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_registry_impl.h b/libs/Catch2/include/internal/catch_test_case_registry_impl.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_registry_impl.h rename to libs/Catch2/include/internal/catch_test_case_registry_impl.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_tracker.cpp b/libs/Catch2/include/internal/catch_test_case_tracker.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_tracker.cpp rename to libs/Catch2/include/internal/catch_test_case_tracker.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_tracker.h b/libs/Catch2/include/internal/catch_test_case_tracker.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_case_tracker.h rename to libs/Catch2/include/internal/catch_test_case_tracker.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_registry.cpp b/libs/Catch2/include/internal/catch_test_registry.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_registry.cpp rename to libs/Catch2/include/internal/catch_test_registry.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_registry.h b/libs/Catch2/include/internal/catch_test_registry.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_registry.h rename to libs/Catch2/include/internal/catch_test_registry.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec.cpp b/libs/Catch2/include/internal/catch_test_spec.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec.cpp rename to libs/Catch2/include/internal/catch_test_spec.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec.h b/libs/Catch2/include/internal/catch_test_spec.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec.h rename to libs/Catch2/include/internal/catch_test_spec.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec_parser.cpp b/libs/Catch2/include/internal/catch_test_spec_parser.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec_parser.cpp rename to libs/Catch2/include/internal/catch_test_spec_parser.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec_parser.h b/libs/Catch2/include/internal/catch_test_spec_parser.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_test_spec_parser.h rename to libs/Catch2/include/internal/catch_test_spec_parser.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_text.h b/libs/Catch2/include/internal/catch_text.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_text.h rename to libs/Catch2/include/internal/catch_text.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_timer.cpp b/libs/Catch2/include/internal/catch_timer.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_timer.cpp rename to libs/Catch2/include/internal/catch_timer.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_timer.h b/libs/Catch2/include/internal/catch_timer.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_timer.h rename to libs/Catch2/include/internal/catch_timer.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_to_string.hpp b/libs/Catch2/include/internal/catch_to_string.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_to_string.hpp rename to libs/Catch2/include/internal/catch_to_string.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tostring.cpp b/libs/Catch2/include/internal/catch_tostring.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tostring.cpp rename to libs/Catch2/include/internal/catch_tostring.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tostring.h b/libs/Catch2/include/internal/catch_tostring.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_tostring.h rename to libs/Catch2/include/internal/catch_tostring.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_totals.cpp b/libs/Catch2/include/internal/catch_totals.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_totals.cpp rename to libs/Catch2/include/internal/catch_totals.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_totals.h b/libs/Catch2/include/internal/catch_totals.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_totals.h rename to libs/Catch2/include/internal/catch_totals.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_uncaught_exceptions.cpp b/libs/Catch2/include/internal/catch_uncaught_exceptions.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_uncaught_exceptions.cpp rename to libs/Catch2/include/internal/catch_uncaught_exceptions.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_uncaught_exceptions.h b/libs/Catch2/include/internal/catch_uncaught_exceptions.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_uncaught_exceptions.h rename to libs/Catch2/include/internal/catch_uncaught_exceptions.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_user_interfaces.h b/libs/Catch2/include/internal/catch_user_interfaces.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_user_interfaces.h rename to libs/Catch2/include/internal/catch_user_interfaces.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_version.cpp b/libs/Catch2/include/internal/catch_version.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_version.cpp rename to libs/Catch2/include/internal/catch_version.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_version.h b/libs/Catch2/include/internal/catch_version.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_version.h rename to libs/Catch2/include/internal/catch_version.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_wildcard_pattern.cpp b/libs/Catch2/include/internal/catch_wildcard_pattern.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_wildcard_pattern.cpp rename to libs/Catch2/include/internal/catch_wildcard_pattern.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_wildcard_pattern.h b/libs/Catch2/include/internal/catch_wildcard_pattern.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_wildcard_pattern.h rename to libs/Catch2/include/internal/catch_wildcard_pattern.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_windows_h_proxy.h b/libs/Catch2/include/internal/catch_windows_h_proxy.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_windows_h_proxy.h rename to libs/Catch2/include/internal/catch_windows_h_proxy.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_xmlwriter.cpp b/libs/Catch2/include/internal/catch_xmlwriter.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_xmlwriter.cpp rename to libs/Catch2/include/internal/catch_xmlwriter.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_xmlwriter.h b/libs/Catch2/include/internal/catch_xmlwriter.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/internal/catch_xmlwriter.h rename to libs/Catch2/include/internal/catch_xmlwriter.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_automake.hpp b/libs/Catch2/include/reporters/catch_reporter_automake.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_automake.hpp rename to libs/Catch2/include/reporters/catch_reporter_automake.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_bases.cpp b/libs/Catch2/include/reporters/catch_reporter_bases.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_bases.cpp rename to libs/Catch2/include/reporters/catch_reporter_bases.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_bases.hpp b/libs/Catch2/include/reporters/catch_reporter_bases.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_bases.hpp rename to libs/Catch2/include/reporters/catch_reporter_bases.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_compact.cpp b/libs/Catch2/include/reporters/catch_reporter_compact.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_compact.cpp rename to libs/Catch2/include/reporters/catch_reporter_compact.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_compact.h b/libs/Catch2/include/reporters/catch_reporter_compact.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_compact.h rename to libs/Catch2/include/reporters/catch_reporter_compact.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_console.cpp b/libs/Catch2/include/reporters/catch_reporter_console.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_console.cpp rename to libs/Catch2/include/reporters/catch_reporter_console.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_console.h b/libs/Catch2/include/reporters/catch_reporter_console.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_console.h rename to libs/Catch2/include/reporters/catch_reporter_console.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_junit.cpp b/libs/Catch2/include/reporters/catch_reporter_junit.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_junit.cpp rename to libs/Catch2/include/reporters/catch_reporter_junit.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_junit.h b/libs/Catch2/include/reporters/catch_reporter_junit.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_junit.h rename to libs/Catch2/include/reporters/catch_reporter_junit.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_listening.cpp b/libs/Catch2/include/reporters/catch_reporter_listening.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_listening.cpp rename to libs/Catch2/include/reporters/catch_reporter_listening.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_listening.h b/libs/Catch2/include/reporters/catch_reporter_listening.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_listening.h rename to libs/Catch2/include/reporters/catch_reporter_listening.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_sonarqube.hpp b/libs/Catch2/include/reporters/catch_reporter_sonarqube.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_sonarqube.hpp rename to libs/Catch2/include/reporters/catch_reporter_sonarqube.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_tap.hpp b/libs/Catch2/include/reporters/catch_reporter_tap.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_tap.hpp rename to libs/Catch2/include/reporters/catch_reporter_tap.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_teamcity.hpp b/libs/Catch2/include/reporters/catch_reporter_teamcity.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_teamcity.hpp rename to libs/Catch2/include/reporters/catch_reporter_teamcity.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_xml.cpp b/libs/Catch2/include/reporters/catch_reporter_xml.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_xml.cpp rename to libs/Catch2/include/reporters/catch_reporter_xml.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_xml.h b/libs/Catch2/include/reporters/catch_reporter_xml.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/include/reporters/catch_reporter_xml.h rename to libs/Catch2/include/reporters/catch_reporter_xml.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/misc/CMakeLists.txt b/libs/Catch2/misc/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/misc/CMakeLists.txt rename to libs/Catch2/misc/CMakeLists.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/misc/appveyorBuildConfigurationScript.bat b/libs/Catch2/misc/appveyorBuildConfigurationScript.bat similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/misc/appveyorBuildConfigurationScript.bat rename to libs/Catch2/misc/appveyorBuildConfigurationScript.bat diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/misc/appveyorMergeCoverageScript.py b/libs/Catch2/misc/appveyorMergeCoverageScript.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/misc/appveyorMergeCoverageScript.py rename to libs/Catch2/misc/appveyorMergeCoverageScript.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/misc/appveyorTestRunScript.bat b/libs/Catch2/misc/appveyorTestRunScript.bat similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/misc/appveyorTestRunScript.bat rename to libs/Catch2/misc/appveyorTestRunScript.bat diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/misc/coverage-helper.cpp b/libs/Catch2/misc/coverage-helper.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/misc/coverage-helper.cpp rename to libs/Catch2/misc/coverage-helper.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/misc/installOpenCppCoverage.ps1 b/libs/Catch2/misc/installOpenCppCoverage.ps1 similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/misc/installOpenCppCoverage.ps1 rename to libs/Catch2/misc/installOpenCppCoverage.ps1 diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/CMakeLists.txt b/libs/Catch2/projects/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/CMakeLists.txt rename to libs/Catch2/projects/CMakeLists.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/CMakeLists.txt b/libs/Catch2/projects/ExtraTests/CMakeLists.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/CMakeLists.txt rename to libs/Catch2/projects/ExtraTests/CMakeLists.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/ToDo.txt b/libs/Catch2/projects/ExtraTests/ToDo.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/ToDo.txt rename to libs/Catch2/projects/ExtraTests/ToDo.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X01-PrefixedMacros.cpp b/libs/Catch2/projects/ExtraTests/X01-PrefixedMacros.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X01-PrefixedMacros.cpp rename to libs/Catch2/projects/ExtraTests/X01-PrefixedMacros.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X02-DisabledMacros.cpp b/libs/Catch2/projects/ExtraTests/X02-DisabledMacros.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X02-DisabledMacros.cpp rename to libs/Catch2/projects/ExtraTests/X02-DisabledMacros.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp b/libs/Catch2/projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp rename to libs/Catch2/projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp b/libs/Catch2/projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp rename to libs/Catch2/projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X10-FallbackStringifier.cpp b/libs/Catch2/projects/ExtraTests/X10-FallbackStringifier.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X10-FallbackStringifier.cpp rename to libs/Catch2/projects/ExtraTests/X10-FallbackStringifier.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X11-DisableStringification.cpp b/libs/Catch2/projects/ExtraTests/X11-DisableStringification.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X11-DisableStringification.cpp rename to libs/Catch2/projects/ExtraTests/X11-DisableStringification.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X12-CustomDebugBreakMacro.cpp b/libs/Catch2/projects/ExtraTests/X12-CustomDebugBreakMacro.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X12-CustomDebugBreakMacro.cpp rename to libs/Catch2/projects/ExtraTests/X12-CustomDebugBreakMacro.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X20-BenchmarkingMacros.cpp b/libs/Catch2/projects/ExtraTests/X20-BenchmarkingMacros.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X20-BenchmarkingMacros.cpp rename to libs/Catch2/projects/ExtraTests/X20-BenchmarkingMacros.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X90-WindowsHeaderInclusion.cpp b/libs/Catch2/projects/ExtraTests/X90-WindowsHeaderInclusion.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/ExtraTests/X90-WindowsHeaderInclusion.cpp rename to libs/Catch2/projects/ExtraTests/X90-WindowsHeaderInclusion.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/automake.std.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/automake.std.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/automake.std.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/automake.std.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/console.std.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/console.std.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/console.std.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/console.std.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/sonarqube.sw.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/sonarqube.sw.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/sonarqube.sw.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/sonarqube.sw.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt b/libs/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt rename to libs/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/CompileTimePerfTests/10.tests.cpp b/libs/Catch2/projects/SelfTest/CompileTimePerfTests/10.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/CompileTimePerfTests/10.tests.cpp rename to libs/Catch2/projects/SelfTest/CompileTimePerfTests/10.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/CompileTimePerfTests/100.tests.cpp b/libs/Catch2/projects/SelfTest/CompileTimePerfTests/100.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/CompileTimePerfTests/100.tests.cpp rename to libs/Catch2/projects/SelfTest/CompileTimePerfTests/100.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/CompileTimePerfTests/All.tests.cpp b/libs/Catch2/projects/SelfTest/CompileTimePerfTests/All.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/CompileTimePerfTests/All.tests.cpp rename to libs/Catch2/projects/SelfTest/CompileTimePerfTests/All.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/Details.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/Details.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/Details.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/Details.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/String.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/String.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/String.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/String.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp b/libs/Catch2/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp rename to libs/Catch2/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Misc/invalid-test-names.input b/libs/Catch2/projects/SelfTest/Misc/invalid-test-names.input similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Misc/invalid-test-names.input rename to libs/Catch2/projects/SelfTest/Misc/invalid-test-names.input diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Misc/plain-old-tests.input b/libs/Catch2/projects/SelfTest/Misc/plain-old-tests.input similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Misc/plain-old-tests.input rename to libs/Catch2/projects/SelfTest/Misc/plain-old-tests.input diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Misc/special-characters-in-file.input b/libs/Catch2/projects/SelfTest/Misc/special-characters-in-file.input similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/Misc/special-characters-in-file.input rename to libs/Catch2/projects/SelfTest/Misc/special-characters-in-file.input diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_debugger.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_debugger.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_debugger.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_debugger.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_option.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_option.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_option.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_option.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_stream.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_stream.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_stream.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_stream.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp b/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp rename to libs/Catch2/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/TestMain.cpp b/libs/Catch2/projects/SelfTest/TestMain.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/TestMain.cpp rename to libs/Catch2/projects/SelfTest/TestMain.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/TimingTests/Sleep.tests.cpp b/libs/Catch2/projects/SelfTest/TimingTests/Sleep.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/TimingTests/Sleep.tests.cpp rename to libs/Catch2/projects/SelfTest/TimingTests/Sleep.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Approx.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Approx.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Approx.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Approx.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/BDD.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/BDD.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/BDD.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/BDD.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Benchmark.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Benchmark.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Benchmark.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Benchmark.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Class.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Class.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Class.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Class.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Compilation.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Compilation.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Compilation.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Compilation.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Condition.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Condition.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Condition.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Condition.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Decomposition.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Decomposition.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Decomposition.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Decomposition.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/EnumToString.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/EnumToString.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/EnumToString.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/EnumToString.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Exception.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Exception.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Exception.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Exception.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Generators.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Generators.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Generators.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Generators.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Message.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Message.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Message.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Message.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Misc.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Misc.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Misc.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Misc.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringByte.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringByte.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringByte.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringByte.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringChrono.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringChrono.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringChrono.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringChrono.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringGeneral.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringGeneral.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringGeneral.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringGeneral.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringOptional.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringOptional.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringOptional.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringOptional.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringPair.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringPair.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringPair.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringPair.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringTuple.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringTuple.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringTuple.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringTuple.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringVector.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringVector.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringVector.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringVector.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringWhich.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/ToStringWhich.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/ToStringWhich.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/ToStringWhich.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Tricky.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/Tricky.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/Tricky.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/Tricky.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/VariadicMacros.tests.cpp b/libs/Catch2/projects/SelfTest/UsageTests/VariadicMacros.tests.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/UsageTests/VariadicMacros.tests.cpp rename to libs/Catch2/projects/SelfTest/UsageTests/VariadicMacros.tests.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/WarnAboutNoTests.cmake b/libs/Catch2/projects/SelfTest/WarnAboutNoTests.cmake similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/SelfTest/WarnAboutNoTests.cmake rename to libs/Catch2/projects/SelfTest/WarnAboutNoTests.cmake diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/TestScripts/testRandomOrder.py b/libs/Catch2/projects/TestScripts/testRandomOrder.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/TestScripts/testRandomOrder.py rename to libs/Catch2/projects/TestScripts/testRandomOrder.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj b/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj rename to libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to libs/Catch2/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.h b/libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.h rename to libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.mm b/libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.mm similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.mm rename to libs/Catch2/projects/XCode/OCTest/OCTest/CatchOCTestCase.mm diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/Main.mm b/libs/Catch2/projects/XCode/OCTest/OCTest/Main.mm similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/Main.mm rename to libs/Catch2/projects/XCode/OCTest/OCTest/Main.mm diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.1 b/libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.1 similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.1 rename to libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.1 diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.mm b/libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.mm similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.mm rename to libs/Catch2/projects/XCode/OCTest/OCTest/OCTest.mm diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.h b/libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.h similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.h rename to libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.h diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.m b/libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.m similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.m rename to libs/Catch2/projects/XCode/OCTest/OCTest/TestObj.m diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/catch_objc_impl.mm b/libs/Catch2/projects/XCode/OCTest/catch_objc_impl.mm similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/projects/XCode/OCTest/catch_objc_impl.mm rename to libs/Catch2/projects/XCode/OCTest/catch_objc_impl.mm diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/approvalTests.py b/libs/Catch2/scripts/approvalTests.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/approvalTests.py rename to libs/Catch2/scripts/approvalTests.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/approve.py b/libs/Catch2/scripts/approve.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/approve.py rename to libs/Catch2/scripts/approve.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/benchmarkCompile.py b/libs/Catch2/scripts/benchmarkCompile.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/benchmarkCompile.py rename to libs/Catch2/scripts/benchmarkCompile.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/benchmarkRunner.py b/libs/Catch2/scripts/benchmarkRunner.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/benchmarkRunner.py rename to libs/Catch2/scripts/benchmarkRunner.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/developBuild.py b/libs/Catch2/scripts/developBuild.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/developBuild.py rename to libs/Catch2/scripts/developBuild.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/embed.py b/libs/Catch2/scripts/embed.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/embed.py rename to libs/Catch2/scripts/embed.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/embedClara.py b/libs/Catch2/scripts/embedClara.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/embedClara.py rename to libs/Catch2/scripts/embedClara.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/extractFeaturesFromReleaseNotes.py b/libs/Catch2/scripts/extractFeaturesFromReleaseNotes.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/extractFeaturesFromReleaseNotes.py rename to libs/Catch2/scripts/extractFeaturesFromReleaseNotes.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/fixWhitespace.py b/libs/Catch2/scripts/fixWhitespace.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/fixWhitespace.py rename to libs/Catch2/scripts/fixWhitespace.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/generateSingleHeader.py b/libs/Catch2/scripts/generateSingleHeader.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/generateSingleHeader.py rename to libs/Catch2/scripts/generateSingleHeader.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/majorRelease.py b/libs/Catch2/scripts/majorRelease.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/majorRelease.py rename to libs/Catch2/scripts/majorRelease.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/minorRelease.py b/libs/Catch2/scripts/minorRelease.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/minorRelease.py rename to libs/Catch2/scripts/minorRelease.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/patchRelease.py b/libs/Catch2/scripts/patchRelease.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/patchRelease.py rename to libs/Catch2/scripts/patchRelease.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/releaseCommon.py b/libs/Catch2/scripts/releaseCommon.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/releaseCommon.py rename to libs/Catch2/scripts/releaseCommon.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/releaseNotes.py b/libs/Catch2/scripts/releaseNotes.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/releaseNotes.py rename to libs/Catch2/scripts/releaseNotes.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/scriptCommon.py b/libs/Catch2/scripts/scriptCommon.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/scriptCommon.py rename to libs/Catch2/scripts/scriptCommon.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/updateDocumentToC.py b/libs/Catch2/scripts/updateDocumentToC.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/updateDocumentToC.py rename to libs/Catch2/scripts/updateDocumentToC.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/scripts/updateWandbox.py b/libs/Catch2/scripts/updateWandbox.py similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/scripts/updateWandbox.py rename to libs/Catch2/scripts/updateWandbox.py diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch.hpp b/libs/Catch2/single_include/catch2/catch.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch.hpp rename to libs/Catch2/single_include/catch2/catch.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_automake.hpp b/libs/Catch2/single_include/catch2/catch_reporter_automake.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_automake.hpp rename to libs/Catch2/single_include/catch2/catch_reporter_automake.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_sonarqube.hpp b/libs/Catch2/single_include/catch2/catch_reporter_sonarqube.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_sonarqube.hpp rename to libs/Catch2/single_include/catch2/catch_reporter_sonarqube.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_tap.hpp b/libs/Catch2/single_include/catch2/catch_reporter_tap.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_tap.hpp rename to libs/Catch2/single_include/catch2/catch_reporter_tap.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_teamcity.hpp b/libs/Catch2/single_include/catch2/catch_reporter_teamcity.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/single_include/catch2/catch_reporter_teamcity.hpp rename to libs/Catch2/single_include/catch2/catch_reporter_teamcity.hpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/src/catch_with_main.cpp b/libs/Catch2/src/catch_with_main.cpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/src/catch_with_main.cpp rename to libs/Catch2/src/catch_with_main.cpp diff --git a/libs/CommService/libs/libbattle-com/libs/Catch2/third_party/clara.hpp b/libs/Catch2/third_party/clara.hpp similarity index 100% rename from libs/CommService/libs/libbattle-com/libs/Catch2/third_party/clara.hpp rename to libs/Catch2/third_party/clara.hpp diff --git a/libs/CommService/.gitignore b/libs/CommService/.gitignore deleted file mode 100644 index 975dac6..0000000 --- a/libs/CommService/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.cache -build -compile_commands.json \ No newline at end of file diff --git a/libs/CommService/.gitmodules b/libs/CommService/.gitmodules deleted file mode 100644 index f190599..0000000 --- a/libs/CommService/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libs/CLI11"] - path = libs/CLI11 - url = https://github.com/CLIUtils/CLI11.git diff --git a/libs/CommService/CMakeLists.txt b/libs/CommService/CMakeLists.txt deleted file mode 100644 index 18db0fd..0000000 --- a/libs/CommService/CMakeLists.txt +++ /dev/null @@ -1,74 +0,0 @@ -cmake_minimum_required (VERSION 3.1 FATAL_ERROR) -project (UDPService VERSION 0.1.0 LANGUAGES CXX C) -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) -include(defaultOptions) - -# IF(NOT TARGET nlohmann_json::nlohmann_json) -# set(JSON_BuildTests OFF CACHE INTERNAL "") -# add_subdirectory(libs/json EXCLUDE_FROM_ALL) -# ENDIF() - -IF(NOT TARGET loguru) - add_subdirectory(libs/loguru EXCLUDE_FROM_ALL) - set_property(TARGET loguru PROPERTY POSITION_INDEPENDENT_CODE 1) -ENDIF() - - - -add_library(CommService STATIC - - include/CommService/Convert.hpp - include/CommService/transmittable.hpp - - - include/CommService/CommService.hpp - src/CommService/CommService.cpp - - include/CommService/Message.hpp - src/CommService/Message.cpp - - include/CommService/ThreadsafeQueue.hpp - - - # include/UDPService/BasicMessageQueue.hpp - # src/UDPService/BasicMessageQueue.cpp - - include/CommService/PayLoads/Join.hpp - src/CommService/PayLoads/Join.cpp - include/CommService/PayLoads/Leave.hpp - src/CommService/PayLoads/Leave.cpp - - include/CommService/PayLoads/Ping.hpp - src/CommService/PayLoads/Ping.cpp - include/CommService/PayLoads/Pong.hpp - src/CommService/PayLoads/Pong.cpp - - - - - ) - -target_link_libraries(CommService -PUBLIC -# nlohmann_json::nlohmann_json -loguru -pthread -) - -target_include_directories(CommService - PUBLIC - $ - $ - PRIVATE - src - ) - - - add_executable(main - src/main.cpp - ) - -target_link_libraries(main - CommService - loguru -) \ No newline at end of file diff --git a/libs/CommService/cmake/Jenkinsfile b/libs/CommService/cmake/Jenkinsfile deleted file mode 100644 index 865fd8a..0000000 --- a/libs/CommService/cmake/Jenkinsfile +++ /dev/null @@ -1,59 +0,0 @@ -@Library('ftewa-jenkins-library@main') _ - -@NonCPS -def getPipelineJobNames() { - Hudson.instance.getAllItems(org.jenkinsci.plugins.workflow.job.WorkflowJob)*.fullName -} - -@NonCPS -def triggerJobs() { - def jobs = getPipelineJobNames(); - - for (job in jobs) - { - echo "Trigger ${job}" - if (job.contains("Integration")) - { - build job: job, - parameters: [ - string(name: 'REPO_NAME', value: "cmake"), - string(name: 'TAG', value: "main") - ], - wait: false - - } - } -} - -pipeline { - agent { - kubernetes { - //workspaceVolume: dynamicPVC(accessModes: 'ReadWriteOnce', requestsSize: '20G', storageClassName: 'csi-rbd-sc') - yaml libraryResource("files/pod-build.yml") - defaultContainer 'clang-build' - } - } // agent - options { - // Only keep the 1 most recent builds - buildDiscarder(logRotator(numToKeepStr: "1")) - } - - -stages { - - stage("Build") - { - - steps { - echo "build" - triggerJobs() - } - - - - - - } // stage("Build") - - } -} diff --git a/libs/CommService/cmake/Modules/CheckParent.cmake b/libs/CommService/cmake/Modules/CheckParent.cmake deleted file mode 100644 index c33bfd5..0000000 --- a/libs/CommService/cmake/Modules/CheckParent.cmake +++ /dev/null @@ -1 +0,0 @@ -get_directory_property(hasParent PARENT_DIRECTORY) diff --git a/libs/CommService/cmake/Modules/CppCheck.cmake b/libs/CommService/cmake/Modules/CppCheck.cmake deleted file mode 100644 index 1161f52..0000000 --- a/libs/CommService/cmake/Modules/CppCheck.cmake +++ /dev/null @@ -1,28 +0,0 @@ -option(CPPCHECK "Turns cppcheck processing on if executable is found." OFF) - -find_program(CPPCHECK_PATH NAMES cppcheck) - -# export compile commands to json file to be used by cppcheck -set(CMAKE_EXPORT_COMPILE_COMMANDS 1) -set(CPPCHECK_COMPILE_COMMANDS "${CMAKE_BINARY_DIR}/compile_commands.json") - -# output directory for codecheck analysis -set(CPPCHECK_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/cppcheck_results) - -if(CPPCHECK AND CPPCHECK_PATH AND NOT CPPCHECK_ADDED) - - set(CPPCHECK_ADDED ON) - - if (NOT TARGET cppcheck) - - add_custom_target(cppcheck - COMMAND rm -rf ${CPPCHECK_OUTPUT_DIRECTORY}\; - mkdir -p ${CPPCHECK_OUTPUT_DIRECTORY}\; - ${CPPCHECK_PATH} - --project=${CPPCHECK_COMPILE_COMMANDS} - --plist-output=${CPPCHECK_OUTPUT_DIRECTORY} - --enable=all - --inline-suppr - ) - endif() -endif() diff --git a/libs/CommService/cmake/Modules/FindGMP.cmake b/libs/CommService/cmake/Modules/FindGMP.cmake deleted file mode 100644 index 96d4a55..0000000 --- a/libs/CommService/cmake/Modules/FindGMP.cmake +++ /dev/null @@ -1,76 +0,0 @@ -# Try to find the GMP library -# https://gmplib.org/ -# -# This module supports requiring a minimum version, e.g. you can do -# find_package(GMP 6.0.0) -# to require version 6.0.0 to newer of GMP. -# -# Once done this will define -# -# GMP_FOUND - system has GMP lib with correct version -# GMP_INCLUDES - the GMP include directory -# GMP_LIBRARIES - the GMP library -# GMP_VERSION - GMP version -# -# Copyright (c) 2016 Jack Poulson, -# Redistribution and use is allowed according to the terms of the BSD license. - -find_path(GMP_INCLUDES NAMES gmp.h PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR}) - -# Set GMP_FIND_VERSION to 5.1.0 if no minimum version is specified -if(NOT GMP_FIND_VERSION) - if(NOT GMP_FIND_VERSION_MAJOR) - set(GMP_FIND_VERSION_MAJOR 5) - endif() - if(NOT GMP_FIND_VERSION_MINOR) - set(GMP_FIND_VERSION_MINOR 1) - endif() - if(NOT GMP_FIND_VERSION_PATCH) - set(GMP_FIND_VERSION_PATCH 0) - endif() - set(GMP_FIND_VERSION - "${GMP_FIND_VERSION_MAJOR}.${GMP_FIND_VERSION_MINOR}.${GMP_FIND_VERSION_PATCH}") -endif() - -message("GMP_INCLUDES=${GMP_INCLUDES}") -if(GMP_INCLUDES) - # Since the GMP version macros may be in a file included by gmp.h of the form - # gmp-.*[_]?.*.h (e.g., gmp-x86_64.h), we search each of them. - file(GLOB GMP_HEADERS "${GMP_INCLUDES}/gmp.h" "${GMP_INCLUDES}/gmp-*.h") - foreach(gmp_header_filename ${GMP_HEADERS}) - file(READ "${gmp_header_filename}" _gmp_version_header) - string(REGEX MATCH - "define[ \t]+__GNU_MP_VERSION[ \t]+([0-9]+)" _gmp_major_version_match - "${_gmp_version_header}") - if(_gmp_major_version_match) - set(GMP_MAJOR_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_MINOR[ \t]+([0-9]+)" - _gmp_minor_version_match "${_gmp_version_header}") - set(GMP_MINOR_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_PATCHLEVEL[ \t]+([0-9]+)" - _gmp_patchlevel_version_match "${_gmp_version_header}") - set(GMP_PATCHLEVEL_VERSION "${CMAKE_MATCH_1}") - set(GMP_VERSION - ${GMP_MAJOR_VERSION}.${GMP_MINOR_VERSION}.${GMP_PATCHLEVEL_VERSION}) - endif() - endforeach() - - # Check whether found version exists and exceeds the minimum requirement - if(NOT GMP_VERSION) - set(GMP_VERSION_OK FALSE) - message(STATUS "GMP version was not detected") - elseif(${GMP_VERSION} VERSION_LESS ${GMP_FIND_VERSION}) - set(GMP_VERSION_OK FALSE) - message(STATUS "GMP version ${GMP_VERSION} found in ${GMP_INCLUDES}, " - "but at least version ${GMP_FIND_VERSION} is required") - else() - set(GMP_VERSION_OK TRUE) - endif() -endif() - -find_library(GMP_LIBRARIES gmp PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GMP DEFAULT_MSG - GMP_INCLUDES GMP_LIBRARIES GMP_VERSION_OK) -mark_as_advanced(GMP_INCLUDES GMP_LIBRARIES) diff --git a/libs/CommService/cmake/Modules/FindValgrind.cmake b/libs/CommService/cmake/Modules/FindValgrind.cmake deleted file mode 100644 index bb1205d..0000000 --- a/libs/CommService/cmake/Modules/FindValgrind.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# Find Valgrind. -# -# This module defines: -# VALGRIND_INCLUDE_DIR, where to find valgrind/memcheck.h, etc. -# VALGRIND_PROGRAM, the valgrind executable. -# VALGRIND_FOUND, If false, do not try to use valgrind. -# -# If you have valgrind installed in a non-standard place, you can define -# VALGRIND_PREFIX to tell cmake where it is. -# -# NOTE: Copied from the opencog project, where it is distributed under the -# terms of the New BSD License. - -message(STATUS "Valgrind Prefix: ${VALGRIND_PREFIX}") - -find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h - /usr/include /usr/local/include ${VALGRIND_PREFIX}/include) -find_program(VALGRIND_PROGRAM NAMES valgrind PATH - /usr/bin /usr/local/bin ${VALGRIND_PREFIX}/bin) - -find_package_handle_standard_args(VALGRIND DEFAULT_MSG - VALGRIND_INCLUDE_DIR - VALGRIND_PROGRAM) - -mark_as_advanced(VALGRIND_INCLUDE_DIR VALGRIND_PROGRAM) diff --git a/libs/CommService/cmake/Modules/Findsodium.cmake b/libs/CommService/cmake/Modules/Findsodium.cmake deleted file mode 100644 index 9d306d1..0000000 --- a/libs/CommService/cmake/Modules/Findsodium.cmake +++ /dev/null @@ -1,269 +0,0 @@ -# Written in 2016 by Henrik Steffen Gaßmann -# -# To the extent possible under law, the author(s) have dedicated all -# copyright and related and neighboring rights to this software to the -# public domain worldwide. This software is distributed without any warranty. -# -# You should have received a copy of the CC0 Public Domain Dedication -# along with this software. If not, see -# -# http://creativecommons.org/publicdomain/zero/1.0/ -# -######################################################################## -# Tries to find the local libsodium installation. -# -# On Windows the sodium_DIR environment variable is used as a default -# hint which can be overridden by setting the corresponding cmake variable. -# -# Once done the following variables will be defined: -# -# sodium_FOUND -# sodium_INCLUDE_DIR -# sodium_LIBRARY_DEBUG -# sodium_LIBRARY_RELEASE -# -# -# Furthermore an imported "sodium" target is created. -# - -if (CMAKE_C_COMPILER_ID STREQUAL "GNU" - OR CMAKE_C_COMPILER_ID STREQUAL "Clang") - set(_GCC_COMPATIBLE 1) -endif() - -# static library option -option(sodium_USE_STATIC_LIBS "enable to statically link against sodium") -if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST)) - unset(sodium_LIBRARY CACHE) - unset(sodium_LIBRARY_DEBUG CACHE) - unset(sodium_LIBRARY_RELEASE CACHE) - unset(sodium_DLL_DEBUG CACHE) - unset(sodium_DLL_RELEASE CACHE) - set(sodium_USE_STATIC_LIBS_LAST ${sodium_USE_STATIC_LIBS} CACHE INTERNAL "internal change tracking variable") -endif() - - -######################################################################## -# UNIX -if (UNIX) - # import pkg-config - find_package(PkgConfig QUIET) - if (PKG_CONFIG_FOUND) - pkg_check_modules(sodium_PKG QUIET libsodium) - endif() - - if(sodium_USE_STATIC_LIBS) - set(XPREFIX sodium_PKG_STATIC) - else() - set(XPREFIX sodium_PKG) - endif() - - find_path(sodium_INCLUDE_DIR sodium.h - HINTS ${${XPREFIX}_INCLUDE_DIRS} - ) - find_library(sodium_LIBRARY_DEBUG NAMES ${${XPREFIX}_LIBRARIES} sodium - HINTS ${${XPREFIX}_LIBRARY_DIRS} - ) - find_library(sodium_LIBRARY_RELEASE NAMES ${${XPREFIX}_LIBRARIES} sodium - HINTS ${${XPREFIX}_LIBRARY_DIRS} - ) - - -######################################################################## -# Windows -elseif (WIN32) - set(sodium_DIR "$ENV{sodium_DIR}" CACHE FILEPATH "sodium install directory") - mark_as_advanced(sodium_DIR) - - find_path(sodium_INCLUDE_DIR sodium.h - HINTS ${sodium_DIR} - PATH_SUFFIXES include - ) - - if (MSVC) - # detect target architecture - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[ - #if defined _M_IX86 - #error ARCH_VALUE x86_32 - #elif defined _M_X64 - #error ARCH_VALUE x86_64 - #endif - #error ARCH_VALUE unknown - ]=]) - try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.c" - OUTPUT_VARIABLE _COMPILATION_LOG - ) - string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}") - - # construct library path - if (_TARGET_ARCH STREQUAL "x86_32") - string(APPEND _PLATFORM_PATH "Win32") - elseif(_TARGET_ARCH STREQUAL "x86_64") - string(APPEND _PLATFORM_PATH "x64") - else() - message(FATAL_ERROR "the ${_TARGET_ARCH} architecture is not supported by Findsodium.cmake.") - endif() - string(APPEND _PLATFORM_PATH "/$$CONFIG$$") - - if (MSVC_VERSION LESS 1900) - math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60") - else() - math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50") - endif() - string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}") - - if (sodium_USE_STATIC_LIBS) - string(APPEND _PLATFORM_PATH "/static") - else() - string(APPEND _PLATFORM_PATH "/dynamic") - endif() - - string(REPLACE "$$CONFIG$$" "Debug" _DEBUG_PATH_SUFFIX "${_PLATFORM_PATH}") - string(REPLACE "$$CONFIG$$" "Release" _RELEASE_PATH_SUFFIX "${_PLATFORM_PATH}") - - find_library(sodium_LIBRARY_DEBUG libsodium.lib - HINTS ${sodium_DIR} - PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX} - ) - find_library(sodium_LIBRARY_RELEASE libsodium.lib - HINTS ${sodium_DIR} - PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX} - ) - if (NOT sodium_USE_STATIC_LIBS) - set(CMAKE_FIND_LIBRARY_SUFFIXES_BCK ${CMAKE_FIND_LIBRARY_SUFFIXES}) - set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") - find_library(sodium_DLL_DEBUG libsodium - HINTS ${sodium_DIR} - PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX} - ) - find_library(sodium_DLL_RELEASE libsodium - HINTS ${sodium_DIR} - PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX} - ) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK}) - endif() - - elseif(_GCC_COMPATIBLE) - if (sodium_USE_STATIC_LIBS) - find_library(sodium_LIBRARY_DEBUG libsodium.a - HINTS ${sodium_DIR} - PATH_SUFFIXES lib - ) - find_library(sodium_LIBRARY_RELEASE libsodium.a - HINTS ${sodium_DIR} - PATH_SUFFIXES lib - ) - else() - find_library(sodium_LIBRARY_DEBUG libsodium.dll.a - HINTS ${sodium_DIR} - PATH_SUFFIXES lib - ) - find_library(sodium_LIBRARY_RELEASE libsodium.dll.a - HINTS ${sodium_DIR} - PATH_SUFFIXES lib - ) - - file(GLOB _DLL - LIST_DIRECTORIES false - RELATIVE "${sodium_DIR}/bin" - "${sodium_DIR}/bin/libsodium*.dll" - ) - find_library(sodium_DLL_DEBUG ${_DLL} libsodium - HINTS ${sodium_DIR} - PATH_SUFFIXES bin - ) - find_library(sodium_DLL_RELEASE ${_DLL} libsodium - HINTS ${sodium_DIR} - PATH_SUFFIXES bin - ) - endif() - else() - message(FATAL_ERROR "this platform is not supported by FindSodium.cmake") - endif() - - -######################################################################## -# unsupported -else() - message(FATAL_ERROR "this platform is not supported by FindSodium.cmake") -endif() - - -######################################################################## -# common stuff - -# extract sodium version -if (sodium_INCLUDE_DIR) - set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h") - if (EXISTS _VERSION_HEADER) - file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT) - string(REGEX REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" "\\1" - sodium_VERSION "${_VERSION_HEADER_CONTENT}") - set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE) - endif() -endif() - -# communicate results -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(sodium - REQUIRED_VARS - sodium_LIBRARY_RELEASE - sodium_LIBRARY_DEBUG - sodium_INCLUDE_DIR - VERSION_VAR - sodium_VERSION -) - -# mark file paths as advanced -mark_as_advanced(sodium_INCLUDE_DIR) -mark_as_advanced(sodium_LIBRARY_DEBUG) -mark_as_advanced(sodium_LIBRARY_RELEASE) -if (WIN32) - mark_as_advanced(sodium_DLL_DEBUG) - mark_as_advanced(sodium_DLL_RELEASE) -endif() - -# create imported target -if(sodium_USE_STATIC_LIBS) - set(_LIB_TYPE STATIC) -else() - set(_LIB_TYPE SHARED) -endif() -add_library(sodium ${_LIB_TYPE} IMPORTED) - -set_target_properties(sodium PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" -) - -if (sodium_USE_STATIC_LIBS) - set_target_properties(sodium PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "SODIUM_STATIC" - IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}" - IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}" - ) -else() - if (UNIX) - set_target_properties(sodium PROPERTIES - IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}" - IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}" - ) - elseif (WIN32) - set_target_properties(sodium PROPERTIES - IMPORTED_IMPLIB "${sodium_LIBRARY_RELEASE}" - IMPORTED_IMPLIB_DEBUG "${sodium_LIBRARY_DEBUG}" - ) - if (NOT (sodium_DLL_DEBUG MATCHES ".*-NOTFOUND")) - set_target_properties(sodium PROPERTIES - IMPORTED_LOCATION_DEBUG "${sodium_DLL_DEBUG}" - ) - endif() - if (NOT (sodium_DLL_RELEASE MATCHES ".*-NOTFOUND")) - set_target_properties(sodium PROPERTIES - IMPORTED_LOCATION_RELWITHDEBINFO "${sodium_DLL_RELEASE}" - IMPORTED_LOCATION_MINSIZEREL "${sodium_DLL_RELEASE}" - IMPORTED_LOCATION_RELEASE "${sodium_DLL_RELEASE}" - ) - endif() - endif() -endif() diff --git a/libs/CommService/cmake/Modules/GenerateCccc.cmake b/libs/CommService/cmake/Modules/GenerateCccc.cmake deleted file mode 100644 index 9c6f1e3..0000000 --- a/libs/CommService/cmake/Modules/GenerateCccc.cmake +++ /dev/null @@ -1,47 +0,0 @@ -INCLUDE(CheckParent) -# search for CCCC binary -FIND_PROGRAM(CCCC cccc ) - -# -# check if the GENERATE_CCCC function has already been defined -# -get_property(_GENERATE_CCCC GLOBAL PROPERTY _GENERATE_CCCC) -IF (NOT _GENERATE_CCCC) - -# set that we have defined GENERATE_CCCC -set_property(GLOBAL PROPERTY _GENERATE_CCCC "YES") - - - FUNCTION(GENERATE_CCCC) - IF(CCCC) - CMAKE_PARSE_ARGUMENTS(ARG "" "" "TARGETS" ${ARGN}) - get_property(_ccccfiles GLOBAL PROPERTY _ccccfiles) - foreach(_target ${ARG_TARGETS}) - get_target_property(_sources ${_target} SOURCES) - get_target_property(_source_dir ${_target} SOURCE_DIR) - - foreach(_source ${_sources}) - set(_fullsource "${_source_dir}/${_source}") - list(APPEND _ccccfiles "${_fullsource}") - endforeach() - endforeach() - set_property(GLOBAL PROPERTY _ccccfiles ${_ccccfiles}) - ENDIF() - ENDFUNCTION() - - FUNCTION(RESET_CCCC) - set_property(GLOBAL PROPERTY _ccccfiles "") - ENDFUNCTION() - - FUNCTION(GENERATE_CCCC_TARGET) - IF (NOT hasParent AND CCCC) - get_property(_targetccccfiles GLOBAL PROPERTY _ccccfiles) - - ADD_CUSTOM_TARGET(cccc - COMMAND ${CCCC} --outdir=cccc ${_targetccccfiles} - COMMENT "Generating cccc result") - ENDIF() - ENDFUNCTION() - - -ENDIF() diff --git a/libs/CommService/cmake/Modules/GenerateCppCheck.cmake b/libs/CommService/cmake/Modules/GenerateCppCheck.cmake deleted file mode 100644 index a33ec73..0000000 --- a/libs/CommService/cmake/Modules/GenerateCppCheck.cmake +++ /dev/null @@ -1,74 +0,0 @@ -INCLUDE(CheckParent) -find_program(CPPCHECK NAMES cppcheck) - -# -# check if the GENERATE_CPPCHECK function has already been defined -# -get_property(_GENERATE_CPPCHECK GLOBAL PROPERTY _GENERATE_CPPCHECK) -IF (NOT _GENERATE_CPPCHECK) - - # set that we have defined GENERATE_CCCC - set_property(GLOBAL PROPERTY _GENERATE_CPPCHECK "YES") - - FUNCTION(GENERATE_CPPCHECK) - IF(NOT TARGET cppcheck) - IF(CPPCHECK) - CMAKE_PARSE_ARGUMENTS(ARG "" "" "TARGETS" ${ARGN}) - get_property(_cppcheckfiles GLOBAL PROPERTY _cppcheckfiles) - get_property(_cppcheckincludedirs GLOBAL PROPERTY _cppcheckincludedirs) - - foreach(_target ${ARG_TARGETS}) - get_target_property(_sources ${_target} SOURCES) - get_target_property(_source_dir ${_target} SOURCE_DIR) - get_target_property(_include_dir ${_target} INCLUDE_DIRECTORIES) - string(REPLACE "$<" ";" _include_dirs ${_include_dir}) - - foreach(_dir ${_include_dirs}) - list(APPEND _cppcheckincludedirs -I${_include_dir}) - endforeach() - - foreach(_source ${_sources}) - set(_fullsource "${_source_dir}/${_source}") - list(APPEND _cppcheckfiles ${_fullsource}) - endforeach() - endforeach() - set_property(GLOBAL PROPERTY _cppcheckfiles ${_cppcheckfiles}) - set_property(GLOBAL PROPERTY _cppcheckincludedirs ${_cppcheckincludedirs}) - ENDIF() - ENDIF() - ENDFUNCTION() - - FUNCTION(RESET_CPPCHECK) - set_property(GLOBAL PROPERTY _cppcheckfiles "") - set_property(GLOBAL PROPERTY _cppcheckincludedirs "") - ENDFUNCTION() - - - FUNCTION(GENERATE_CPPCHECK_TARGET) - IF ( NOT hasParent AND CPPCHECK) - message("generate cppcheck target") - get_property(_targetcppcheckfiles GLOBAL PROPERTY _cppcheckfiles) - get_property(_targetcppcheckincludedirs GLOBAL PROPERTY _cppcheckincludedirs) - - add_custom_target(cppcheck - COMMAND - ${CPPCHECK} - --xml - --xml-version=2 - --enable=all - --inconclusive - --force - --inline-suppr - ${_targetcppcheckincludedirs} - ${_targetcppcheckfiles} - 2> cppcheck.xml - WORKING_DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR} - COMMENT - "cppcheck: Running cppcheck on target ${_targetname}..." - VERBATIM) - - ENDIF() - ENDFUNCTION() - -ENDIF() diff --git a/libs/CommService/cmake/Modules/ProcessDOXYGEN.cmake b/libs/CommService/cmake/Modules/ProcessDOXYGEN.cmake deleted file mode 100644 index a49dcb9..0000000 --- a/libs/CommService/cmake/Modules/ProcessDOXYGEN.cmake +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE(CheckParent) - -IF(NOT hasParent) - find_package(Doxygen) - - - IF (DOXYGEN_FOUND) - # set input and output files - set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in) - set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) - - # request to configure the file - configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY) - - # note the option ALL which allows to build the docs together with the application - add_custom_target( doxygen - COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating API documentation with Doxygen" - VERBATIM ) - ENDIF() - -ENDIF() diff --git a/libs/CommService/cmake/Modules/ProcessGIT.cmake b/libs/CommService/cmake/Modules/ProcessGIT.cmake deleted file mode 100644 index c2c6d13..0000000 --- a/libs/CommService/cmake/Modules/ProcessGIT.cmake +++ /dev/null @@ -1,17 +0,0 @@ -if (GIT_FOUND) - execute_process( - COMMAND git rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_BRANCH - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -# Get the latest abbreviated commit hash of the working branch -execute_process( - COMMAND git log -1 --format=%h - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_COMMIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -endif() diff --git a/libs/CommService/cmake/Modules/add_my_test.cmake b/libs/CommService/cmake/Modules/add_my_test.cmake deleted file mode 100644 index d5a90f0..0000000 --- a/libs/CommService/cmake/Modules/add_my_test.cmake +++ /dev/null @@ -1,22 +0,0 @@ -get_property(_ADD_MY_TEST GLOBAL PROPERTY _ADD_MY_TEST) -IF (NOT _ADD_MY_TEST) - - # set that we have defined GENERATE_CCCC - set_property(GLOBAL PROPERTY _ADD_MY_TEST "YES") - - - FUNCTION(ADD_MY_TEST) - CMAKE_PARSE_ARGUMENTS(ARG "" "TEST" "SOURCES;LIBS" ${ARGN}) - get_property(_mytests GLOBAL PROPERTY _mytests) - - list(APPEND _mytests "${ARG_TEST}") - - add_executable(${ARG_TEST} ${ARG_SOURCES}) - target_link_libraries(${ARG_TEST} ${ARG_LIBS}) - add_test(${ARG_TEST} ${ARG_TEST}) - - set_property(GLOBAL PROPERTY _mytests ${_mytests}) - ENDFUNCTION() - - -ENDIF() diff --git a/libs/CommService/cmake/Modules/c++-standards.cmake b/libs/CommService/cmake/Modules/c++-standards.cmake deleted file mode 100644 index 87a894f..0000000 --- a/libs/CommService/cmake/Modules/c++-standards.cmake +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -# Set the compiler standard to C++11 -macro(cxx_11) - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - if(MSVC_VERSION GREATER_EQUAL "1900" AND CMAKE_VERSION LESS 3.10) - include(CheckCXXCompilerFlag) - check_cxx_compiler_flag("/std:c++11" _cpp_latest_flag_supported) - if(_cpp_latest_flag_supported) - add_compile_options("/std:c++11") - endif() - endif() -endmacro() - -# Set the compiler standard to C++14 -macro(cxx_14) - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - if(MSVC_VERSION GREATER_EQUAL "1900" AND CMAKE_VERSION LESS 3.10) - include(CheckCXXCompilerFlag) - check_cxx_compiler_flag("/std:c++14" _cpp_latest_flag_supported) - if(_cpp_latest_flag_supported) - add_compile_options("/std:c++14") - endif() - endif() -endmacro() - -# Set the compiler standard to C++17 -macro(cxx_17) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - if(MSVC_VERSION GREATER_EQUAL "1900" AND CMAKE_VERSION LESS 3.10) - include(CheckCXXCompilerFlag) - check_cxx_compiler_flag("/std:c++17" _cpp_latest_flag_supported) - if(_cpp_latest_flag_supported) - add_compile_options("/std:c++17") - endif() - endif() -endmacro() - -# Set the compiler standard to C++20 -macro(cxx_20) - set(CMAKE_CXX_STANDARD 20) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -endmacro() diff --git a/libs/CommService/cmake/Modules/code-coverage.cmake b/libs/CommService/cmake/Modules/code-coverage.cmake deleted file mode 100644 index 6f1a917..0000000 --- a/libs/CommService/cmake/Modules/code-coverage.cmake +++ /dev/null @@ -1,588 +0,0 @@ -# -# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -# USAGE: To enable any code coverage instrumentation/targets, the single CMake -# option of `CODE_COVERAGE` needs to be set to 'ON', either by GUI, ccmake, or -# on the command line. -# -# From this point, there are two primary methods for adding instrumentation to -# targets: 1 - A blanket instrumentation by calling `add_code_coverage()`, where -# all targets in that directory and all subdirectories are automatically -# instrumented. 2 - Per-target instrumentation by calling -# `target_code_coverage()`, where the target is given and thus only -# that target is instrumented. This applies to both libraries and executables. -# -# To add coverage targets, such as calling `make ccov` to generate the actual -# coverage information for perusal or consumption, call -# `target_code_coverage()` on an *executable* target. -# -# Example 1: All targets instrumented -# -# In this case, the coverage information reported will will be that of the -# `theLib` library target and `theExe` executable. -# -# 1a: Via global command -# -# ~~~ -# add_code_coverage() # Adds instrumentation to all targets -# -# add_library(theLib lib.cpp) -# -# add_executable(theExe main.cpp) -# target_link_libraries(theExe PRIVATE theLib) -# target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target (instrumentation already added via global anyways) for generating code coverage reports. -# ~~~ -# -# 1b: Via target commands -# -# ~~~ -# add_library(theLib lib.cpp) -# target_code_coverage(theLib) # As a library target, adds coverage instrumentation but no targets. -# -# add_executable(theExe main.cpp) -# target_link_libraries(theExe PRIVATE theLib) -# target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target and instrumentation for generating code coverage reports. -# ~~~ -# -# Example 2: Target instrumented, but with regex pattern of files to be excluded -# from report -# -# ~~~ -# add_executable(theExe main.cpp non_covered.cpp) -# target_code_coverage(theExe EXCLUDE non_covered.cpp test/*) # As an executable target, the reports will exclude the non-covered.cpp file, and any files in a test/ folder. -# ~~~ -# -# Example 3: Target added to the 'ccov' and 'ccov-all' targets -# -# ~~~ -# add_code_coverage_all_targets(EXCLUDE test/*) # Adds the 'ccov-all' target set and sets it to exclude all files in test/ folders. -# -# add_executable(theExe main.cpp non_covered.cpp) -# target_code_coverage(theExe AUTO ALL EXCLUDE non_covered.cpp test/*) # As an executable target, adds to the 'ccov' and ccov-all' targets, and the reports will exclude the non-covered.cpp file, and any files in a test/ folder. -# ~~~ - -# Options -option( - CODE_COVERAGE - "Builds targets with code coverage instrumentation. (Requires GCC or Clang)" - OFF) - -# Programs -find_program(LLVM_COV_PATH NAMES llvm-cov llvm-cov-8 llvm-cov-7 llvm-cov-6) -find_program(LLVM_PROFDATA_PATH NAMES llvm-profdata llvm-profdata-8 llvm-profdata-7 llvm-profdata-6) -find_program(LCOV_PATH lcov) -find_program(GENHTML_PATH genhtml) - -# Variables -set(CMAKE_COVERAGE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/ccov) - -# Common initialization/checks -if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED) - set(CODE_COVERAGE_ADDED ON) - - # Common Targets - add_custom_target(ccov-preprocessing - COMMAND ${CMAKE_COMMAND} - -E - make_directory - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY} - DEPENDS ccov-clean) - - if("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - # Messages - message(STATUS "Building with llvm Code Coverage Tools") - - if(NOT LLVM_COV_PATH) - message(FATAL_ERROR "llvm-cov not found! Aborting.") - else() - # Version number checking for 'EXCLUDE' compatability - execute_process(COMMAND ${LLVM_COV_PATH} --version - OUTPUT_VARIABLE LLVM_COV_VERSION_CALL_OUTPUT) - string(REGEX MATCH - "[0-9]+\\.[0-9]+\\.[0-9]+" - LLVM_COV_VERSION - ${LLVM_COV_VERSION_CALL_OUTPUT}) - - if(LLVM_COV_VERSION VERSION_LESS "7.0.0") - message( - WARNING - "target_code_coverage()/add_code_coverage_all_targets() 'EXCLUDE' option only available on llvm-cov >= 7.0.0" - ) - endif() - endif() - - # Targets - add_custom_target(ccov-clean - COMMAND rm -f - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list - COMMAND rm -f - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list) - - # Used to get the shared object file list before doing the main all-processing - add_custom_target(ccov-libs - COMMAND ; - COMMENT "libs ready for coverage report.") - - elseif(CMAKE_COMPILER_IS_GNUCXX) - # Messages - message(STATUS "Building with lcov Code Coverage Tools") - - if(CMAKE_BUILD_TYPE) - string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type) - if(NOT ${upper_build_type} STREQUAL "DEBUG") - message( - WARNING - "Code coverage results with an optimized (non-Debug) build may be misleading" - ) - endif() - else() - message( - WARNING - "Code coverage results with an optimized (non-Debug) build may be misleading" - ) - endif() - if(NOT LCOV_PATH) - message(FATAL_ERROR "lcov not found! Aborting...") - endif() - if(NOT GENHTML_PATH) - message(FATAL_ERROR "genhtml not found! Aborting...") - endif() - - # Targets - add_custom_target(ccov-clean - COMMAND ${LCOV_PATH} - --directory - ${CMAKE_BINARY_DIR} - --zerocounters) - - else() - message(FATAL_ERROR "Code coverage requires Clang or GCC. Aborting.") - endif() -endif() - -# Adds code coverage instrumentation to a library, or instrumentation/targets -# for an executable target. -# ~~~ -# EXECUTABLE ADDED TARGETS: -# GCOV/LCOV: -# ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter. -# ccov-${TARGET_NAME} : Generates HTML code coverage report for the associated named target. -# ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report. -# -# LLVM-COV: -# ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter. -# ccov-report : Generates HTML code coverage report for every target added with 'AUTO' parameter. -# ccov-${TARGET_NAME} : Generates HTML code coverage report. -# ccov-report-${TARGET_NAME} : Prints to command line summary per-file coverage information. -# ccov-show-${TARGET_NAME} : Prints to command line detailed per-line coverage information. -# ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report. -# ccov-all-report : Prints summary per-file coverage information for every target added with ALL' parameter to the command line. -# -# Required: -# TARGET_NAME - Name of the target to generate code coverage for. -# Optional: -# AUTO - Adds the target to the 'ccov' target so that it can be run in a batch with others easily. Effective on executable targets. -# ALL - Adds the target to the 'ccov-all' and 'ccov-all-report' targets, which merge several executable targets coverage data to a single report. Effective on executable targets. -# EXTERNAL - For GCC's lcov, allows the profiling of 'external' files from the processing directory -# EXCLUDE - Excludes files of the patterns provided from coverage. **These do not copy to the 'all' targets.** -# OBJECTS - For executables ONLY, if the provided targets are shared libraries, adds coverage information to the output -# ~~~ -function(target_code_coverage TARGET_NAME) - # Argument parsing - set(options AUTO ALL EXTERNAL) - set(multi_value_keywords EXCLUDE OBJECTS) - cmake_parse_arguments(target_code_coverage - "${options}" - "" - "${multi_value_keywords}" - ${ARGN}) - - if(CODE_COVERAGE) - - # Add code coverage instrumentation to the target's linker command - if("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - target_compile_options( - ${TARGET_NAME} - PRIVATE -fprofile-instr-generate -fcoverage-mapping) - set_property(TARGET ${TARGET_NAME} - APPEND_STRING - PROPERTY LINK_FLAGS "-fprofile-instr-generate ") - set_property(TARGET ${TARGET_NAME} - APPEND_STRING - PROPERTY LINK_FLAGS "-fcoverage-mapping ") - elseif(CMAKE_COMPILER_IS_GNUCXX) - target_compile_options(${TARGET_NAME} - PRIVATE -fprofile-arcs -ftest-coverage) - target_link_libraries(${TARGET_NAME} PRIVATE gcov) - endif() - - # Targets - get_target_property(target_type ${TARGET_NAME} TYPE) - - # Add shared library to processing for 'all' targets - if(target_type STREQUAL "SHARED_LIBRARY" AND target_code_coverage_ALL) - if("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - add_custom_target( - ccov-run-${TARGET_NAME} - COMMAND echo - "-object=$" - >> - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list - DEPENDS ccov-preprocessing ${TARGET_NAME}) - - if(NOT TARGET ccov-libs) - message( - FATAL_ERROR - "Calling target_code_coverage with 'ALL' must be after a call to 'add_code_coverage_all_targets'." - ) - endif() - - add_dependencies(ccov-libs ccov-run-${TARGET_NAME}) - endif() - endif() - - # For executables add targets to run and produce output - if(target_type STREQUAL "EXECUTABLE") - if("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - - # If there are shared objects to also work with, generate the string to add them here - foreach(SO_TARGET ${target_code_coverage_OBJECTS}) - # Check to see if the target is a shared object - if(TARGET ${SO_TARGET}) - get_target_property(SO_TARGET_TYPE ${SO_TARGET} TYPE) - if(${SO_TARGET_TYPE} STREQUAL "SHARED_LIBRARY") - set(SO_OBJECTS ${SO_OBJECTS} -object=$) - endif() - endif() - endforeach() - - # Run the executable, generating raw profile data - add_custom_target( - ccov-run-${TARGET_NAME} - COMMAND LLVM_PROFILE_FILE=${TARGET_NAME}.profraw - $ - COMMAND echo - "-object=$" - >> - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list - COMMAND echo - "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}.profraw " - >> - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list - DEPENDS ccov-preprocessing ccov-libs ${TARGET_NAME}) - - # Merge the generated profile data so llvm-cov can process it - add_custom_target(ccov-processing-${TARGET_NAME} - COMMAND ${LLVM_PROFDATA_PATH} - merge - -sparse - ${TARGET_NAME}.profraw - -o - ${TARGET_NAME}.profdata - DEPENDS ccov-run-${TARGET_NAME}) - - # Ignore regex only works on LLVM >= 7 - if(LLVM_COV_VERSION VERSION_GREATER_EQUAL "7.0.0") - foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE}) - set(EXCLUDE_REGEX ${EXCLUDE_REGEX} - -ignore-filename-regex='${EXCLUDE_ITEM}') - endforeach() - endif() - - # Print out details of the coverage information to the command line - add_custom_target(ccov-show-${TARGET_NAME} - COMMAND ${LLVM_COV_PATH} - show - $ - ${SO_OBJECTS} - -instr-profile=${TARGET_NAME}.profdata - -show-line-counts-or-regions - ${EXCLUDE_REGEX} - DEPENDS ccov-processing-${TARGET_NAME}) - - # Print out a summary of the coverage information to the command line - add_custom_target(ccov-report-${TARGET_NAME} - COMMAND ${LLVM_COV_PATH} - report - $ - ${SO_OBJECTS} - -instr-profile=${TARGET_NAME}.profdata - ${EXCLUDE_REGEX} - DEPENDS ccov-processing-${TARGET_NAME}) - - # Generates HTML output of the coverage information for perusal - add_custom_target( - ccov-${TARGET_NAME} - COMMAND ${LLVM_COV_PATH} - show - $ - ${SO_OBJECTS} - -instr-profile=${TARGET_NAME}.profdata - -show-line-counts-or-regions - -output-dir=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME} - -format="html" - ${EXCLUDE_REGEX} - DEPENDS ccov-processing-${TARGET_NAME}) - - elseif(CMAKE_COMPILER_IS_GNUCXX) - set(COVERAGE_INFO - "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME}.info") - - # Run the executable, generating coverage information - add_custom_target(ccov-run-${TARGET_NAME} - COMMAND $ - DEPENDS ccov-preprocessing ${TARGET_NAME}) - - # Generate exclusion string for use - foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE}) - set(EXCLUDE_REGEX - ${EXCLUDE_REGEX} - --remove - ${COVERAGE_INFO} - '${EXCLUDE_ITEM}') - endforeach() - - if(EXCLUDE_REGEX) - set(EXCLUDE_COMMAND - ${LCOV_PATH} - ${EXCLUDE_REGEX} - --output-file - ${COVERAGE_INFO}) - else() - set(EXCLUDE_COMMAND ;) - endif() - - if(NOT ${target_code_coverage_EXTERNAL}) - set(EXTERNAL_OPTION --no-external) - endif() - - # Generates HTML output of the coverage information for perusal - add_custom_target( - ccov-${TARGET_NAME} - COMMAND ${CMAKE_COMMAND} - -E - remove - ${COVERAGE_INFO} - COMMAND ${LCOV_PATH} - --directory - ${CMAKE_BINARY_DIR} - --zerocounters - COMMAND $ - COMMAND ${LCOV_PATH} - --directory - ${CMAKE_BINARY_DIR} - --base-directory - ${CMAKE_SOURCE_DIR} - --capture - ${EXTERNAL_OPTION} - --output-file - ${COVERAGE_INFO} - COMMAND ${EXCLUDE_COMMAND} - COMMAND ${GENHTML_PATH} - -o - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME} - ${COVERAGE_INFO} - DEPENDS ccov-preprocessing ${TARGET_NAME}) - endif() - - add_custom_command( - TARGET ccov-${TARGET_NAME} POST_BUILD - COMMAND ; - COMMENT - "Open ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${TARGET_NAME}/index.html in your browser to view the coverage report." - ) - - # AUTO - if(target_code_coverage_AUTO) - if(NOT TARGET ccov) - add_custom_target(ccov) - endif() - add_dependencies(ccov ccov-${TARGET_NAME}) - - if(NOT CMAKE_COMPILER_IS_GNUCXX) - if(NOT TARGET ccov-report) - add_custom_target(ccov-report) - endif() - add_dependencies(ccov-report ccov-report-${TARGET_NAME}) - endif() - endif() - - # ALL - if(target_code_coverage_ALL) - if(NOT TARGET ccov-all-processing) - message( - FATAL_ERROR - "Calling target_code_coverage with 'ALL' must be after a call to 'add_code_coverage_all_targets'." - ) - endif() - - add_dependencies(ccov-all-processing ccov-run-${TARGET_NAME}) - endif() - endif() - endif() -endfunction() - -# Adds code coverage instrumentation to all targets in the current directory and -# any subdirectories. To add coverage instrumentation to only specific targets, -# use `target_code_coverage`. -function(add_code_coverage) - if("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - add_compile_options(-fprofile-instr-generate -fcoverage-mapping) - add_link_options(-fprofile-instr-generate -fcoverage-mapping) - elseif(CMAKE_COMPILER_IS_GNUCXX) - add_compile_options(-fprofile-arcs -ftest-coverage) - link_libraries(gcov) - endif() -endfunction() - -# Adds the 'ccov-all' type targets that calls all targets added via -# `target_code_coverage` with the `ALL` parameter, but merges all the coverage -# data from them into a single large report instead of the numerous smaller -# reports. -# ~~~ -# Optional: -# EXCLUDE - Excludes files of the regex patterns provided from coverage. -# ~~~ -function(add_code_coverage_all_targets) - # Argument parsing - set(multi_value_keywords EXCLUDE) - cmake_parse_arguments(add_code_coverage_all_targets - "" - "" - "${multi_value_keywords}" - ${ARGN}) - - if(CODE_COVERAGE) - if("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - - # Merge the profile data for all of the run executables - add_custom_target( - ccov-all-processing - COMMAND ${LLVM_PROFDATA_PATH} - merge - -o - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata - -sparse - `cat - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list`) - - # Regex exclude only available for LLVM >= 7 - if(LLVM_COV_VERSION VERSION_GREATER_EQUAL "7.0.0") - foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE}) - set(EXCLUDE_REGEX ${EXCLUDE_REGEX} - -ignore-filename-regex='${EXCLUDE_ITEM}') - endforeach() - endif() - - # Print summary of the code coverage information to the command line - add_custom_target( - ccov-all-report - COMMAND - ${LLVM_COV_PATH} - report - `cat - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list` - -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata - ${EXCLUDE_REGEX} - DEPENDS ccov-all-processing) - - # Export coverage information so continuous integration tools (e.g. Jenkins) can consume it - add_custom_target( - ccov-all-export - COMMAND - ${LLVM_COV_PATH} - export - `cat - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list` - -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata - -format="text" - ${EXCLUDE_REGEX} > ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/coverage.json - DEPENDS ccov-all-processing) - - # Generate HTML output of all added targets for perusal - add_custom_target( - ccov-all - COMMAND - ${LLVM_COV_PATH} - show - `cat - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list` - -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata - -show-line-counts-or-regions - -output-dir=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged - -format="html" - ${EXCLUDE_REGEX} - DEPENDS ccov-all-processing) - - elseif(CMAKE_COMPILER_IS_GNUCXX) - set(COVERAGE_INFO "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.info") - - # Nothing required for gcov - add_custom_target(ccov-all-processing COMMAND ;) - - # Exclusion regex string creation - foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE}) - set(EXCLUDE_REGEX - ${EXCLUDE_REGEX} - --remove - ${COVERAGE_INFO} - '${EXCLUDE_ITEM}') - endforeach() - - if(EXCLUDE_REGEX) - set(EXCLUDE_COMMAND - ${LCOV_PATH} - ${EXCLUDE_REGEX} - --output-file - ${COVERAGE_INFO}) - else() - set(EXCLUDE_COMMAND ;) - endif() - - # Generates HTML output of all targets for perusal - add_custom_target(ccov-all - COMMAND ${LCOV_PATH} - --directory - ${CMAKE_BINARY_DIR} - --capture - --output-file - ${COVERAGE_INFO} - COMMAND ${EXCLUDE_COMMAND} - COMMAND ${GENHTML_PATH} - -o - ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged - ${COVERAGE_INFO} - COMMAND ${CMAKE_COMMAND} - -E - remove - ${COVERAGE_INFO} - DEPENDS ccov-all-processing) - - endif() - - add_custom_command( - TARGET ccov-all POST_BUILD - COMMAND ; - COMMENT - "Open ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged/index.html in your browser to view the coverage report." - ) - endif() -endfunction() diff --git a/libs/CommService/cmake/Modules/codecheck.cmake b/libs/CommService/cmake/Modules/codecheck.cmake deleted file mode 100644 index 621aec0..0000000 --- a/libs/CommService/cmake/Modules/codecheck.cmake +++ /dev/null @@ -1,83 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at https://mozilla.org/MPL/2.0/. -# -option(CODECHECKER "Turns on codecheck processing if it is found." OFF) -option(CODECHECKER_STORE "Store results on central codechecker server" OFF) -option(CODECHECKER_RUN "Name of the codechecker run" "run-1") -option(CODECHECKER_BRANCH "Name of the branch codecheker is run for" "unknown") -option(CODECHECKER_URL "URL and product link to codechecker server" "http://localhost:8001/Default") -option(CODECHECK_TRIM_PATH "beginning of the path to be removed when storing" "/tmp") - -find_program(CODECHECKER_PATH - NAME CodeChecker - PATHS ~/bin/ - /usr/bin/ - /usr/local/bin -) - -if (CODECHECKER_PATH ) - message(STATUS "CodeChecker found") -else() - message(STATUS "CodeChecker not found") -endif() - -# export compile commands to json file to be used by atom c++ ide (clangd) -set(CMAKE_EXPORT_COMPILE_COMMANDS 1) -set(CODECHECKER_COMPILE_COMMANDS "${CMAKE_BINARY_DIR}/compile_commands.json") - -# check if a skip file exists -if(EXISTS ${CMAKE_SOURCE_DIR}/codecheck.skip) - set(CODECHECKER_SKIP "-i${CMAKE_SOURCE_DIR}/codecheck.skip") -endif() - - -# output directory for codecheck analysis -set(CODECHECKER_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/codechecker_results) - -# html output directory -set(CODECHECKER_HTML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/codechecker_html) - -# Common initialization/checks -if(CODECHECKER AND CODECHECKER_PATH AND NOT CODECHECKER_ADDED) - set(CODECHECKER_ADDED ON) - - IF(NOT TARGET codechecker) - - add_custom_target(codechecker - COMMAND ${CODECHECKER_PATH} - analyze - ${CODECHECKER_SKIP} - -j 4 - -o ${CODECHECKER_OUTPUT_DIRECTORY} - ${CODECHECKER_COMPILE_COMMANDS} - ) - - add_custom_target(codechecker-clean - COMMAND rm -rf ${CODECHECKER_OUTPUT_DIRECTORY} - ) - - - add_custom_target(codechecker-html - COMMAND ${CODECHECKER_PATH} - parse - ${CODECHECKER_OUTPUT_DIRECTORY} - -e html - -o ${CODECHECKER_HTML_OUTPUT_DIRECTORY} - ) - - if (CODECHECKER_STORE) - add_custom_target(codechecker-store - COMMAND ${CODECHECKER_PATH} - store - --trim-path-prefix \"${CODECHECK_TRIM_PATH}\" - --tag \"${CODECHECKER_BRANCH}\" - -n \"${CODECHECKER_RUN}\" - --url ${CODECHECKER_URL} - ${CODECHECKER_OUTPUT_DIRECTORY} - ) - endif() - -endif() -endif() diff --git a/libs/CommService/cmake/Modules/compdb.cmake b/libs/CommService/cmake/Modules/compdb.cmake deleted file mode 100644 index a169208..0000000 --- a/libs/CommService/cmake/Modules/compdb.cmake +++ /dev/null @@ -1,23 +0,0 @@ -find_program(COMPDB_PATH - NAME compdb - PATHS ~/.local/bin/ - /bin - /sbin - /usr/bin - /usr/sbin - /usr/local/bin - /usr/local/sbin - ) - - - -if (COMPDB_PATH) - IF(NOT TARGET COMPD) - add_custom_target(COMPD - ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${COMPDB_PATH} -p ${CMAKE_CURRENT_BINARY_DIR} list >compile_commands.json - ) - endif() -endif() diff --git a/libs/CommService/cmake/Modules/compiler-options.cmake b/libs/CommService/cmake/Modules/compiler-options.cmake deleted file mode 100644 index 1d8a146..0000000 --- a/libs/CommService/cmake/Modules/compiler-options.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -option(ENABLE_ALL_WARNINGS "Compile with all warnings for the major compilers." - OFF) -option(ENABLE_EFFECTIVE_CXX "Enable Effective C++ warnings." OFF) - -if(ENABLE_ALL_WARNINGS) - if(CMAKE_COMPILER_IS_GNUCXX) - # GCC - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - elseif("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - # Clang - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - elseif(MSVC) - # MSVC - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") - endif() -endif() - -if(ENABLE_EFFECTIVE_CXX) - if(CMAKE_COMPILER_IS_GNUCXX) - # GCC - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++") - elseif("${CMAKE_C_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang" - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - # Clang - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++") - endif() -endif() diff --git a/libs/CommService/cmake/Modules/defaultIncludes.cmake b/libs/CommService/cmake/Modules/defaultIncludes.cmake deleted file mode 100644 index 2c38764..0000000 --- a/libs/CommService/cmake/Modules/defaultIncludes.cmake +++ /dev/null @@ -1,15 +0,0 @@ -include(c++-standards) -include(compiler-options) -include(sanitizers) -include(codecheck) -include(CppCheck) -include(code-coverage) -include(tools) -include(GNUInstallDirs) -include(CTest) -include(doxygen) -include(ProcessGIT) -include(CheckParent) -include(add_my_test) -include(TestBigEndian) -include(compdb) diff --git a/libs/CommService/cmake/Modules/defaultOptions.cmake b/libs/CommService/cmake/Modules/defaultOptions.cmake deleted file mode 100644 index 2e1ffd2..0000000 --- a/libs/CommService/cmake/Modules/defaultOptions.cmake +++ /dev/null @@ -1,9 +0,0 @@ -include(defaultIncludes) -find_package(Git) - -enable_testing() -cxx_20() -build_docs(PROCESS_DOXYFILE DOXYFILE_PATH "docs/Doxyfile.in" ) - -add_code_coverage_all_targets(EXCLUDE ${PROJECT_SOURCE_DIR}/libs/* ${PROJECT_SOURCE_DIR}/test/*) -TEST_BIG_ENDIAN(IS_BIG_ENDIAN) diff --git a/libs/CommService/cmake/Modules/doxygen.cmake b/libs/CommService/cmake/Modules/doxygen.cmake deleted file mode 100644 index f231472..0000000 --- a/libs/CommService/cmake/Modules/doxygen.cmake +++ /dev/null @@ -1,134 +0,0 @@ -# -# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -find_package(Doxygen) - -option(BUILD_DOCUMENTATION "Build API documentation using Doxygen. (make doc)" - ${DOXYGEN_FOUND}) - -# Builds doxygen documentation with a default 'Doxyfile.in' or with a specified -# one, and can make the results installable (under the `doc` install target) -# -# This can only be used once per project, as each target generated is as -# `doc-${PROJECT_NAME}` unless TARGET_NAME is specified. -# ~~~ -# Optional Arguments: -# -# ADD_TO_DOC -# If specified, adds this generated target to be a dependency of the more general -# `doc` target. -# -# INSTALLABLE -# Adds the generated documentation to the generic `install` target, under the -# `documentation` installation group. -# -# PROCESS_DOXYFILE -# If set, then will process the found Doxyfile through the CMAKE `configure_file` -# function for macro replacements before using it. (@ONLY) -# -# TARGET_NAME -# The name to give the doc target. (Default: doc-${PROJECT_NAME}) -# -# OUTPUT_DIR -# The directory to place the generated output. (Default: ${CMAKE_CURRENT_BINARY_DIR}/doc) -# -# INSTALL_PATH -# The path to install the documenttation under. (if not specified, defaults to -# 'share/${PROJECT_NAME}) -# -# DOXYFILE_PATH -# The given doxygen file to use/process. (Defaults to'${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile') -# ~~~ -function(build_docs) - set(OPTIONS ADD_TO_DOC INSTALLABLE PROCESS_DOXYFILE) - set(SINGLE_VALUE_KEYWORDS - TARGET_NAME - INSTALL_PATH - DOXYFILE_PATH - OUTPUT_DIR) - set(MULTI_VALUE_KEYWORDS) - cmake_parse_arguments(build_docs - "${OPTIONS}" - "${SINGLE_VALUE_KEYWORDS}" - "${MULTI_VALUE_KEYWORDS}" - ${ARGN}) - - if(BUILD_DOCUMENTATION) - if(NOT DOXYGEN_FOUND) - message(FATAL_ERROR "Doxygen is needed to build the documentation.") - endif() - - if(NOT build_docs_DOXYFILE_PATH) - set(DOXYFILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile") - elseif(EXISTS "${build_docs_DOXYFILE_PATH}") - set(DOXYFILE_PATH "${build_docs_DOXYFILE_PATH}") - else() - set(DOXYFILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${build_docs_DOXYFILE_PATH}") - endif() - - if(NOT EXISTS "${DOXYFILE_PATH}") - message( - SEND_ERROR - "Could not find Doxyfile to use for procesing documentation at: ${DOXYFILE_PATH}" - ) - return() - endif() - - if(build_docs_PROCESS_DOXYFILE) - set(DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile") - configure_file("${DOXYFILE_PATH}" "${DOXYFILE}" @ONLY) - else() - set(DOXYFILE "${DOXYFILE_PATH}") - endif() - - if(build_docs_OUTPUT_DIR) - set(OUT_DIR "${build_docs_OUTPUT_DIR}") - else() - set(OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc") - endif() - - file(MAKE_DIRECTORY "${OUT_DIR}") - - if(build_docs_TARGET_NAME) - set(TARGET_NAME ${build_docs_TARGET_NAME}) - else() - set(TARGET_NAME doc-${PROJECT_NAME}) - endif() - - IF(NOT TARGET ${TARGET_NAME}) - add_custom_target(${TARGET_NAME} - COMMAND ${DOXYGEN_EXECUTABLE} "${DOXYFILE}" - WORKING_DIRECTORY "${OUT_DIR}" - VERBATIM) - ENDIF() - - if(build_docs_ADD_TO_DOC) - if(NOT TARGET doc) - add_custom_target(doc) - endif() - - add_dependencies(doc ${TARGET_NAME}) - endif() - - if(build_docs_INSTALLABLE) - if(NOT build_docs_INSTALL_PATH) - set(build_docs_INSTALL_PATH share/${PROJECT_NAME}) - endif() - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/ - COMPONENT documentation - DESTINATION ${build_docs_INSTALL_PATH}) - endif() - endif() -endfunction() diff --git a/libs/CommService/cmake/Modules/sanitizers.cmake b/libs/CommService/cmake/Modules/sanitizers.cmake deleted file mode 100644 index f26947f..0000000 --- a/libs/CommService/cmake/Modules/sanitizers.cmake +++ /dev/null @@ -1,87 +0,0 @@ -# -# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -set( - USE_SANITIZER - "" - CACHE - STRING - "Compile with a sanitizer. Options are: Address, Memory, MemoryWithOrigins, Undefined, Thread, Leak, 'Address;Undefined'" - ) - -function(append value) - foreach(variable ${ARGN}) - set(${variable} "${${variable}} ${value}" PARENT_SCOPE) - endforeach(variable) -endfunction() - -if(USE_SANITIZER) - append("-fno-omit-frame-pointer" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - - if(UNIX) - - if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG") - append("-O1" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - endif() - - if(USE_SANITIZER MATCHES "([Aa]ddress);([Uu]ndefined)" - OR USE_SANITIZER MATCHES "([Uu]ndefined);([Aa]ddress)") - message(STATUS "Building with Address, Undefined sanitizers") - append("-fsanitize=address,undefined" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - elseif("${USE_SANITIZER}" MATCHES "([Aa]ddress)") - # Optional: -fno-optimize-sibling-calls -fsanitize-address-use-after-scope - message(STATUS "Building with Address sanitizer") - append("-fsanitize=address" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - elseif(USE_SANITIZER MATCHES "([Mm]emory([Ww]ith[Oo]rigins)?)") - # Optional: -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2 - append("-fsanitize=memory" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - if(USE_SANITIZER MATCHES "([Mm]emory[Ww]ith[Oo]rigins)") - message(STATUS "Building with MemoryWithOrigins sanitizer") - append("-fsanitize-memory-track-origins" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - else() - message(STATUS "Building with Memory sanitizer") - endif() - elseif(USE_SANITIZER MATCHES "([Uu]ndefined)") - message(STATUS "Building with Undefined sanitizer") - append("-fsanitize=undefined" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - if(EXISTS "${BLACKLIST_FILE}") - append("-fsanitize-blacklist=${BLACKLIST_FILE}" CMAKE_C_FLAGS - CMAKE_CXX_FLAGS) - endif() - elseif(USE_SANITIZER MATCHES "([Tt]hread)") - message(STATUS "Building with Thread sanitizer") - append("-fsanitize=thread" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - elseif(USE_SANITIZER MATCHES "([Ll]eak)") - message(STATUS "Building with Leak sanitizer") - append("-fsanitize=leak" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - else() - message( - FATAL_ERROR "Unsupported value of USE_SANITIZER: ${USE_SANITIZER}") - endif() - elseif(MSVC) - if(USE_SANITIZER MATCHES "([Aa]ddress)") - message(STATUS "Building with Address sanitizer") - append("-fsanitize=address" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - else() - message( - FATAL_ERROR - "This sanitizer not yet supported in the MSVC environment: ${USE_SANITIZER}" - ) - endif() - else() - message(FATAL_ERROR "USE_SANITIZER is not supported on this platform.") - endif() - -endif() diff --git a/libs/CommService/cmake/Modules/tools.cmake b/libs/CommService/cmake/Modules/tools.cmake deleted file mode 100644 index 6d03f21..0000000 --- a/libs/CommService/cmake/Modules/tools.cmake +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (C) 2018 by George Cave - gcave@stablecoder.ca -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -option(CLANG_TIDY "Turns on clang-tidy processing if it is found." OFF) -option(IWYU "Turns on include-what-you-use processing if it is found." OFF) - -# Adds clang-tidy checks to the compilation, with the given arguments being used -# as the options set. -macro(clang_tidy) - if(CLANG_TIDY AND CLANG_TIDY_EXE) - set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_EXE} ${ARGN}) - endif() -endmacro() - -# Adds include_what_you_use to the compilation, with the given arguments being -# used as the options set. -macro(include_what_you_use) - if(IWYU AND IWYU_EXE) - set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "${IWYU_EXE};${ARGN}") - endif() -endmacro() - -find_program(CLANG_TIDY_EXE NAMES clang-tidy clang-tidy-8 clang-tidy-7 clang-tidy-6) -if(CLANG_TIDY_EXE) - message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}") - if(NOT CLANG_TIDY) - message(STATUS "clang-tidy NOT ENABLED via 'CLANG_TIDY' variable!") - set(CMAKE_CXX_CLANG_TIDY "" CACHE STRING "" FORCE) # delete it - endif() -elseif(CLANG_TIDY) - message(SEND_ERROR "Cannot enable clang-tidy, as executable not found!") - set(CMAKE_CXX_CLANG_TIDY "" CACHE STRING "" FORCE) # delete it -else() - message(STATUS "clang-tidy not found!") - set(CMAKE_CXX_CLANG_TIDY "" CACHE STRING "" FORCE) # delete it -endif() - -find_program(IWYU_EXE NAMES "include-what-you-use") -if(IWYU_EXE) - message(STATUS "include-what-you-use found: ${IWYU_EXE}") - if(NOT IWYU) - message(STATUS "include-what-you-use NOT ENABLED via 'IWYU' variable!") - set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "" CACHE STRING "" FORCE) # delete it - endif() -elseif(IWYU) - message( - SEND_ERROR "Cannot enable include-what-you-use, as executable not found!") - set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "" CACHE STRING "" FORCE) # delete it -else() - message(STATUS "include-what-you-use not found!") - set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "" CACHE STRING "" FORCE) # delete it -endif() diff --git a/libs/CommService/cmake/Modules/xslt.cmake b/libs/CommService/cmake/Modules/xslt.cmake deleted file mode 100644 index 9a60337..0000000 --- a/libs/CommService/cmake/Modules/xslt.cmake +++ /dev/null @@ -1,43 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at https://mozilla.org/MPL/2.0/. -# - -IF(NOT CMAKE_SET_XSLT) - -set(CMAKE_SET_XSLT true) - -find_program(CMAKE_XSLTPROC NAME xsltproc HINTS ${CMAKE_SYSTEM_PROGRAM_PATH}) - -if (CMAKE_XSLTPROC) - message(STATUS "XSLTPROC found") -else() - message(FATAL_ERROR "XSLTPROC not found") -endif() - -function(xslt_generate) - set(OPTIONS ) - set(SINGLE_VALUE_KEYWORDS OUT_FILE XML_FILE XSL_FILE) - set(MULTI_VALUE_KEYWORDS) - cmake_parse_arguments(XSLT - "${OPTIONS}" - "${SINGLE_VALUE_KEYWORDS}" - "${MULTI_VALUE_KEYWORDS}" - ${ARGN}) - - - message(STATUS "generating ${CMAKE_XSLTPROC} --nonet -o ${XSLT_OUT_FILE} ${XSLT_XSL_FILE} ${XSLT_XML_FILE} ") - execute_process( - COMMAND ${CMAKE_XSLTPROC} --nonet -o ${XSLT_OUT_FILE} ${XSLT_XSL_FILE} ${XSLT_XML_FILE} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE OUT - ERROR_VARIABLE ERR - ) - - message(STATUS ${OUT}) - message(STATUS ${ERR}) - -endfunction() - -ENDIF() diff --git a/libs/CommService/cmake/Toolchains/Toolchain-mingw64.cmake b/libs/CommService/cmake/Toolchains/Toolchain-mingw64.cmake deleted file mode 100644 index 434c229..0000000 --- a/libs/CommService/cmake/Toolchains/Toolchain-mingw64.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# the name of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) - -# which compilers to use for C and C++ -SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix) -SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix) - -# here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) - -# adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search -# programs in the host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -find_program(WINE_FOUND wine) - -if(WINE_FOUND) - message(STATUS "WINE found") - SET(CMAKE_CROSSCOMPILING_EMULATOR wine) -endif() - -if (CMAKE_CROSSCOMPILING) - message(STATUS "Crosscompiling for ${CMAKE_SYSTEM_NAME}") -endif() diff --git a/libs/CommService/include/CommService/CommService.hpp b/libs/CommService/include/CommService/CommService.hpp deleted file mode 100644 index e1a946f..0000000 --- a/libs/CommService/include/CommService/CommService.hpp +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef COMMSERVICE -#define COMMSERVICE - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -namespace CommService { - - class LocalUDPClients{ - public: - unsigned short port; - std::uint16_t id; - }; - - - - - class CommService { - - private: - /// device id - std::uint16_t deviceID_; - - /// participant MajorType - deviceMajorType majorType_; - - /// minor Type - std::string minorType_; - - /// the IP Address to send messages to - std::string dstIp; - - /// the local source IP Address - std::string srcIp; - - /// the udp port on which to broadcast and receive messages - unsigned short broadcastPort = 0; - - /// the port we are listing on for messages, should normally be broadcastPort, but... - unsigned short localPort = 0; - - /// the network socket to work on - int inetSocket = -1; - - /// vector of local client ports we forward messages to - std::vector clients; - - /// mutex for exclusive access to the clients vector - std::mutex mutexClients; - - /// variable for holding the receive thread identifier - std::thread receiveThread; - - /// variable indicating if the receiveThread should be stopped - std::atomic stopReceiveThread; - std::atomic receiving; - - - /// show if the service is connected or not - std::atomic connected; - - std::mutex mutex; - - std::shared_ptr> ReceivingMessageQueue; - - /// attribute identifying this service as a gateway and all packets should be forwarded - bool gateway = false; - - void setGateway(bool); - - public: - CommService(std::string dst,std::string src, std::uint16_t id, deviceMajorType majorType, std::string minorType, unsigned short dstPort ): - dstIp(dst),srcIp(src),majorType_(majorType),minorType_(minorType),broadcastPort(dstPort),stopReceiveThread(false),deviceID_(id){ - - ReceivingMessageQueue = std::make_shared>(); - } - - ~CommService(); - - void connect(); - - void disconnect(); - - void publish(Message m); - - void receiveThreadFunc(); - - void asyncReceive(); - - void processMsg(std::vector *m); - - void start(); - - void stop(); - - - std::shared_ptr> getReceivedMessageQueue(); - - - - - - }; -}; - -#endif \ No newline at end of file diff --git a/libs/CommService/include/CommService/Convert.hpp b/libs/CommService/include/CommService/Convert.hpp deleted file mode 100644 index 24293c4..0000000 --- a/libs/CommService/include/CommService/Convert.hpp +++ /dev/null @@ -1,241 +0,0 @@ -#ifndef NETWORKBUFFCONVERT -#define NETWORKBUFFCONVERT - -#include -#include -#include -#include - -namespace CommService { - - - class Convert{ - - public: - /* - * @brief template function to byte swap int/uint datatypes - used for endianess conversion - * - * @param v - pointer to a variable of some int/uint datatype - in place byte swapped - */ - template - static void swapBytes(T *v) { - for (unsigned int i = 0; i < sizeof(T)/2; ++i) - { - std::swap(((char *)v)[i], ((char *)v)[sizeof(T)-1-i]); - } - } - - /** - * @brief function to convert a std::vector to an simple datatype - * - * this is the partner function to fromSimpleToByteArray. - * it extracts the simple datatype like int, double, etc. from the vector and - * returns it - * - * @param v - the vector to convert to a simple datatype - * @return simple datatype - * @throw std::invalid_argument: "the bytevector is too small to fit the datatype" - */ - template - static T fromByteArrayToSimple(std::vector &bytes) - { - T convVariable; - if(bytes.size() < sizeof(T)) - { - throw(std::invalid_argument(std::string(__FILE__) + ":" + std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + ": the bytevector is too small to fit the datatype")); - } - std::memcpy(reinterpret_cast(&convVariable),bytes.data(),sizeof(T)); - #ifndef IS_BIG_ENDIAN - swapBytes(&convVariable); - #endif - return std::move(convVariable); - } - - - - /** - * @brief template for converting of simple datatypes to a byte_array, including endianness conversion to big endian - * - * @param variable - the variable to convert to a byte vector, needs to be int/uint datatype - * - * @return the std::vector - */ - template - static std::vector fromSimpleToByteArray(T &variable) - { - std::vector bytes; - bytes.clear(); - bytes.resize(sizeof(T)); - - #ifndef IS_BIG_ENDIAN - T convVariable = variable; - swapBytes(&convVariable); - std::memcpy(bytes.data(),reinterpret_cast(&convVariable),sizeof(T)); - #else - std::memcpy(bytes.data(),reinterpret_cast(&variable),sizeof(T)); - #endif - - return bytes; - } - - - /** - * @brief function to convert a container of a simple datatype to a std::vector - * - * this is the partner function to fromByteArrayToSimpleContainer. - * the number of container elements is prepended to the std::vector and the simple datatype - * elements follow. - * - * @param data - the container of a simple datatype - * - * @return the std::vector; - */ - template - static std::vector fromSimpleContainerToByteArray(T &data) - { - std::vector bytes; - std::vector convert; - - uint32_t size=data.size(); - bytes=fromSimpleToByteArray(size); - - for(auto it = data.begin(); it!=data.end(); ++it) - { - convert=fromSimpleToByteArray(*it); - bytes.insert(std::end(bytes), std::begin(convert), std::end(convert)); - } - - return bytes; - } - - - /** - * @brief function to convert a std::vector to a container of simple datatype elements - * - * this is the partner function to fromSimpleContainerToByteArray. It takes the - * first 4 byte of the vector as an uint32_t element count and parses the all the elements - * from the vector. - * - * @param v - the vector to convert to a container of simple datatype elements - * - * @return the container - */ - template - static T fromByteArrayToSimpleContainer(std::vector &v) - { - T data; - uint32_t size = fromByteArrayToSimple(v); - v.erase(v.begin(), v.begin()+sizeof(size)); - for(uint32_t i=0; i(v); - v.erase(v.begin(), v.begin()+sizeof(convert)); - data.push_back(convert); - } - - return std::move(data); - } - - - /** - * @brief function to convert a std::string to an std::vector - * - * for converting the string, first the length of the string is converted as - * an uint32_t into the std::vector to be able to correctly parse the string - * in a larger vector. - * - * @param variable - the std::string to convert - * - * @return the std::vector - */ - static std::vector fromStringToByteArray(const std::string &variable) - { - std::vector bytes; - - uint32_t size=variable.length(); - - bytes=fromSimpleToByteArray(size); - bytes.insert(std::end(bytes),std::begin(variable), std::end(variable)); - - return bytes; - } - - /** - * @brief function to convert a std::vector to an std::string - * - * this is the partner function to fromStringToByteArray. It takes the - * first 4 byte of the vector as an uint32_t string length identifier and - * uses the following length chars as the string - * - * @param v - the vector to convert to a string - * @return the string read from the vector - * @throw std::invalid_argument: "vector too short for chars" - */ - static std::string fromByteArrayToString(std::vector &v) - { - uint32_t length=fromByteArrayToSimple(v); - - if (v.size()-sizeof(uint32_t) < length) - { - throw(std::invalid_argument(std::string(__FILE__) + ":" + std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + ": vector too short for " + std::to_string(length) + " chars")); - } - - std::string str(v.begin()+sizeof(uint32_t), v.begin()+sizeof(uint32_t)+length) ; - - return str; - } - - - /** - * @brief function to convert a container of strings to a std::vector - * - * @param data - the container of std::string - * - * @return the std::vector - */ - template - static std::vector fromStringContainerToByteArray(T &data) - { - std::vector bytes; - std::vector convert; - - uint32_t size=data.size(); - bytes=fromSimpleToByteArray(size); - - for(auto it = data.begin(); it!=data.end(); ++it) - { - convert=fromStringToByteArray(*it); - bytes.insert(std::end(bytes), std::begin(convert), std::end(convert)); - } - - return bytes; - } - - - /** - * @brief function to convert a std::vector to a container of strings - * - * @param data - the container of std::string - * - * @return the std::vector - */ - template - static T fromByteArrayToStringContainer(std::vector &v) - { - T data; - uint32_t size = fromByteArrayToSimple(v); - v.erase(v.begin(), v.begin()+sizeof(size)); - - for(uint32_t i=0; i -#include -#include - -namespace CommService { - - enum messageTopic : std::uint16_t { - /// udp client joins - LOCAL_JOIN, - /// local udp clients leave - LOCAL_LEAVE, - /// remote participant joins the sim - JOIN, - /// remote participant leave the sim - LEAVE, - /// sends id to participant - ID_MESSAGE - - }; - - - - enum deviceMajorType : std::uint16_t { - ID_SERVICE, - GATEWAY, - CIVIL_SHIP, - WAR_SHIP, - RADAR, - SONAR, - WEAPON - }; - - - - class Message : public transmittable{ - public: - - // the device id of the device/endpoint sending this Message - std::uint16_t sourceID; - - /// the major type of the device/endpoint transmitting this message - deviceMajorType srcMajorType; - - /// the minor type of the device/endpoint transmitting this message - std::string srcMinorType; - - /// which topic does this message have ? helps identifying the transmitted datatype - messageTopic topic; - - Message(); - /** - * @brief Constructor for generationg a Message object from a received std::vector - * - * @param v - the std::vector representing a message object - */ - Message(std::vector); - - /** - * @brief Copy constructor of the Message class - * - * creates a copy of the object, including copies of all data - * - * @param obj - the object from which to copy everything - */ - Message(const Message &obj); - - - void setData(const transmittable &d){data=d.toByteVector();} - - /** - * @brief converts the whole message information into a byte vector - * - * all information of the message class is converted into a byte vector for transmission - * through any kind of network. - * - * @param payload - returns the byte vector by call by reference - */ - std::vector toByteVector() const override; - - /** - * @brief return the raw byte vector of the data object, required for data reception - * - * @return the std::vector - */ - std::vector getRawData() const {return data;} - - private: - std::vector data; - - }; -}; - -#endif \ No newline at end of file diff --git a/libs/CommService/include/CommService/PayLoads/Join.hpp b/libs/CommService/include/CommService/PayLoads/Join.hpp deleted file mode 100644 index fb92641..0000000 --- a/libs/CommService/include/CommService/PayLoads/Join.hpp +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef __PAYLOADS_JOIN__ -#define __PAYLOADS_JOIN__ - - -/** -* @file -* @brief main header file for the Join payload -* @author Henry Winkel -* @date 15.09.2022 -* @copyright -*/ -#include -#include -#include - -namespace CommService -{ - namespace PayLoads - { - /** - * @brief class representing the payload of a HotPlugJoin message - * - * the HotPlugJoin messages is transmitted by every PubSub Service after connection - * has been established to the underlying network/transport layer. - * It provides information about the type of service, the id and the underlying - * network/transport layer addresses. - * - */ - class Join : public transmittable - { - public: - Join()=default; - /** - * @brief constructor to recreate the HotPlugJoin payload from a a std::vector - */ - explicit Join(std::vector v); - - /// the address of the underlying network layer used to join the network - unsigned char networkLayerAddress[16]; - - /// the address of the underlying transport layer used to join the network - std::uint32_t transportLayerAddress; - - - - - /** - * @brief converts the information of the class (the attributes) to a byte vector - * - * @param byteVector - returns a std::vector of bytes representing the class - */ - std::vector toByteVector() const override; - }; - }; //namespace Payloads -}; //namespace BC - -#endif diff --git a/libs/CommService/include/CommService/PayLoads/Leave.hpp b/libs/CommService/include/CommService/PayLoads/Leave.hpp deleted file mode 100644 index 42132a6..0000000 --- a/libs/CommService/include/CommService/PayLoads/Leave.hpp +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef __PAYLOADS_LEAVE__ -#define __PAYLOADS_LEAVE__ - -/** -* @file -* @brief main header file for the Leave payload -* @author Henry Winkel -* @date 15.09.2022 -* @copyright -*/ -#include -#include -#include - -namespace CommService -{ - namespace PayLoads - { - /** - * @brief class representing the payload of a HotPlugLeave message - * - * the HotPlugLeave messages is transmitted by every PubSub Service before disconnecting - * from the network. - * It provides information about the type of service, the id and the underlying - * network/transport layer addresses. - * - */ - class Leave : public transmittable - { - public: - Leave()=default; - /** - * @brief constructor to recreate the HotPlugJoin payload from a a std::vector - */ - explicit Leave(std::vector v); - - /// the address of the underlying network layer used to join the network - unsigned char networkLayerAddress[16]; - - /// the address of the underlying transport layer used to join the network - uint32_t transportLayerAddress; - - - - - /** - * @brief converts the information of the class (the attributes) to a byte vector - * - * @param byteVector - returns a std::vector of bytes representing the class - */ - std::vector toByteVector() const override; - }; - }; //namespace Payloads -}; //namespace BC - -#endif diff --git a/libs/CommService/include/CommService/PayLoads/Ping.hpp b/libs/CommService/include/CommService/PayLoads/Ping.hpp deleted file mode 100644 index 1a26dad..0000000 --- a/libs/CommService/include/CommService/PayLoads/Ping.hpp +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef __PAYLOADS_PING__ -#define __PAYLOADS_PING__ -/** -* @file -* @brief main header file for the BPing payload -* @author Henry Winkel -* @date 15.09.2022 -* @copyright -*/ -#include -#include -#include -#include - -namespace CommService -{ - - namespace PayLoads - { - /** - * @brief class representing the payload of a Ping message - * - * the Ping messages is transmitted can be published to all or individual nodes. - * these nodes will answer with a Pong message - * - */ - class Ping : public transmittable - { - public: - Ping(); - /** - * @brief constructor to recreate the HotPlugJoin payload from a a std::vector - */ - explicit Ping(std::vector v); - - /// message id uniqly identifying one ping message - uint64_t messageID; - - /// the sequence number of the ping - uint64_t sequenceNr; - - /// the local clock ticks - uint64_t pingTime; - - /** - * @brief converts the information of the class (the attributes) to a byte vector - * - * @param byteVector - returns a std::vector of bytes representing the class - */ - std::vector toByteVector() const override; - }; - }; //namespace Payloads -}; //namespace BC - -#endif diff --git a/libs/CommService/include/CommService/PayLoads/Pong.hpp b/libs/CommService/include/CommService/PayLoads/Pong.hpp deleted file mode 100644 index 38a9c83..0000000 --- a/libs/CommService/include/CommService/PayLoads/Pong.hpp +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef __LIBBC_BC_PAYLOADS_PONG_HPP__ -#define __LIBBC_BC_PAYLOADS_PONG_HPP__ - -/** -* @file -* @brief main header file for the Pong payload -* @author Henry Winkel -* @date 15.09.2022 -* @copyright -*/ -#include -#include -#include - -namespace CommService -{ - namespace PayLoads - { - /** - * @brief class representing the payload of a Pong message - * - * the Pong messages is the reply to a ping message. - * - */ - class Pong : public transmittable - { - public: - Pong()=default; - /** - * @brief constructor to recreate the HotPlugJoin payload from a a std::vector - */ - explicit Pong(std::vector v); - - /// message id uniqly identifying one ping message - uint64_t pingMessageID; - - /// ping transmission time - int pingTransmissionTime; - - /// the sequence number of the ping - uint64_t sequenceNr; - - /** - * @brief converts the information of the class (the attributes) to a byte vector - * - * @param byteVector - returns a std::vector of bytes representing the class - */ - std::vector toByteVector() const override; - }; - }; //namespace Payloads -}; //namespace BC - -#endif diff --git a/libs/CommService/include/CommService/ThreadsafeQueue.hpp b/libs/CommService/include/CommService/ThreadsafeQueue.hpp deleted file mode 100644 index 5b20a44..0000000 --- a/libs/CommService/include/CommService/ThreadsafeQueue.hpp +++ /dev/null @@ -1,47 +0,0 @@ -#include -#include -#include - -template -class ThreadsafeQueue { - std::queue queue_; - mutable std::mutex mutex_; - - // Moved out of public interface to prevent races between this - // and pop(). - bool empty() const { - return queue_.empty(); - } - - public: - ThreadsafeQueue() = default; - ThreadsafeQueue(const ThreadsafeQueue &) = delete ; - ThreadsafeQueue& operator=(const ThreadsafeQueue &) = delete ; - - ThreadsafeQueue(ThreadsafeQueue&& other) { - std::lock_guard lock(mutex_); - queue_ = std::move(other.queue_); - } - - virtual ~ThreadsafeQueue() { } - - unsigned long size() const { - std::lock_guard lock(mutex_); - return queue_.size(); - } - - std::optional pop() { - std::lock_guard lock(mutex_); - if (queue_.empty()) { - return {}; - } - T tmp = queue_.front(); - queue_.pop(); - return tmp; - } - - void push(const T &item) { - std::lock_guard lock(mutex_); - queue_.push(item); - } -}; \ No newline at end of file diff --git a/libs/CommService/include/CommService/transmittable.hpp b/libs/CommService/include/CommService/transmittable.hpp deleted file mode 100644 index 5f3f29b..0000000 --- a/libs/CommService/include/CommService/transmittable.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __TRANSMITTABLE__ -#define __TRANSMITTABLE__ - - -#include -#include - -namespace CommService -{ - /** - * @brief abstract class providing the interface for classes being transmittable through a network - * - * the developer has to make sure that the correct endianess is used in the toByteVector function - * and in the Factory for each Class - */ - class transmittable - { - public: - - /** - * @brief converts the information of the class (the attributes) to a byte vector - * - * @param byteVector - returns a std::vector of bytes representing the class - */ - virtual std::vector toByteVector() const = 0; - }; - -}; - - -#endif diff --git a/libs/CommService/libs/CLI11/.ci/azure-build.yml b/libs/CommService/libs/CLI11/.ci/azure-build.yml deleted file mode 100644 index 22f3306..0000000 --- a/libs/CommService/libs/CLI11/.ci/azure-build.yml +++ /dev/null @@ -1,13 +0,0 @@ -steps: - - task: CMake@1 - inputs: - cmakeArgs: - .. -DCLI11_WARNINGS_AS_ERRORS=ON -DCLI11_SINGLE_FILE=$(cli11.single) - -DCMAKE_CXX_STANDARD=$(cli11.std) - -DCLI11_SINGLE_FILE_TESTS=$(cli11.single) - -DCMAKE_BUILD_TYPE=$(cli11.build_type) $(cli11.options) - displayName: "Configure" - - - script: cmake --build . - displayName: "Build" - workingDirectory: build diff --git a/libs/CommService/libs/CLI11/.ci/build_doxygen.sh b/libs/CommService/libs/CLI11/.ci/build_doxygen.sh deleted file mode 100644 index bd877d5..0000000 --- a/libs/CommService/libs/CLI11/.ci/build_doxygen.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/env sh -# (Source me) - -set -evx - -#DOXYGEN_URL="http://doxygen.nl/files/doxygen-1.8.17.src.tar.gz" -DOXYGEN_URL="https://github.com/doxygen/doxygen/archive/Release_1_8_15.tar.gz" -cd "${DEPS_DIR}" - -if [[ ! -f "${DEPS_DIR}/doxygen/build/bin/doxygen" ]] ; then - echo "Downloading Doxygen" - mkdir -p doxygen - travis_retry wget --no-check-certificate --quiet -O - "${DOXYGEN_URL}" | tar --strip-components=1 -xz -C doxygen - cd doxygen - mkdir -p build - cd build - cmake .. - make -j2 -fi - -export PATH="${DEPS_DIR}/doxygen/build/bin:${PATH}" - -cd "${TRAVIS_BUILD_DIR}" - -set +evx diff --git a/libs/CommService/libs/CLI11/.ci/build_lcov.sh b/libs/CommService/libs/CLI11/.ci/build_lcov.sh deleted file mode 100644 index 7232e99..0000000 --- a/libs/CommService/libs/CLI11/.ci/build_lcov.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/env sh -# (Source me) -set -evx - -LCOV_URL="http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.13.orig.tar.gz" -cd "${DEPS_DIR}" - -if [[ ! -f "${DEPS_DIR}/lcov/bin/lcov" ]] ; then - echo "Downloading lcov" - mkdir -p lcov - travis_retry wget --no-check-certificate --quiet -O - "${LCOV_URL}" | tar --strip-components=1 -xz -C lcov -fi - -export PATH="${DEPS_DIR}/lcov/bin:${PATH}" -cd "${TRAVIS_BUILD_DIR}" - -set +evx diff --git a/libs/CommService/libs/CLI11/.ci/make_and_test.sh b/libs/CommService/libs/CLI11/.ci/make_and_test.sh deleted file mode 100755 index 07df22e..0000000 --- a/libs/CommService/libs/CLI11/.ci/make_and_test.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -echo -en "travis_fold:start:script.build\\r" -echo "Building..." -STD="$1" -shift -set -evx - - -mkdir -p build -cd build -cmake .. -DCLI11_WARNINGS_AS_ERRORS=ON -DCLI11_SINGLE_FILE=ON -DCMAKE_CXX_STANDARD="$STD" -DCLI11_SINGLE_FILE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache $@ -cmake --build . -- -j2 - -set +evx -echo -en "travis_fold:end:script.build\\r" -echo -en "travis_fold:start:script.test\\r" -echo "Testing..." -set -evx - -ctest --output-on-failure - -set +evx -echo -en "travis_fold:end:script.test\\r" diff --git a/libs/CommService/libs/CLI11/.ci/run_codecov.sh b/libs/CommService/libs/CLI11/.ci/run_codecov.sh deleted file mode 100755 index fbc199c..0000000 --- a/libs/CommService/libs/CLI11/.ci/run_codecov.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -echo -en "travis_fold:start:script.build\\r" -echo "Building..." -set -evx - -cd "${TRAVIS_BUILD_DIR}" -mkdir -p build -cd build -cmake .. -DCLI11_SINGLE_FILE_TESTS=OFF -DCLI11_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Coverage -cmake --build . -- -j2 -cmake --build . --target CLI11_coverage - -set +evx -echo -en "travis_fold:end:script.build\\r" -echo -en "travis_fold:start:script.lcov\\r" -echo "Capturing and uploading LCov..." -set -evx - -lcov --directory . --capture --output-file coverage.info # capture coverage info -lcov --remove coverage.info '*/tests/*' '*/examples/*' '*gtest*' '*gmock*' '/usr/*' --output-file coverage.info # filter out system -lcov --list coverage.info #debug info -# Uploading report to CodeCov -bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" - -set +evx -echo -en "travis_fold:end:script.lcov\\r" diff --git a/libs/CommService/libs/CLI11/.clang-tidy b/libs/CommService/libs/CLI11/.clang-tidy deleted file mode 100644 index b135afe..0000000 --- a/libs/CommService/libs/CLI11/.clang-tidy +++ /dev/null @@ -1,17 +0,0 @@ -# Checks that will be implemented in future PRs: -# performance-unnecessary-value-param, hints to ~110 issues. Be careful with implementing the suggested changes of this one, as auto-fixes may break the code - -FormatStyle: file - -Checks: > - -*, google-*, -google-runtime-references, llvm-include-order, - llvm-namespace-comment, misc-throw-by-value-catch-by-reference, modernize*, - -modernize-use-trailing-return-type, readability-container-size-empty, - -WarningsAsErrors: "*" - -HeaderFilterRegex: ".*hpp" - -CheckOptions: - - key: google-readability-braces-around-statements.ShortStatementLines - value: "3" diff --git a/libs/CommService/libs/CLI11/.github/CONTRIBUTING.md b/libs/CommService/libs/CLI11/.github/CONTRIBUTING.md deleted file mode 100644 index 6e7a1d8..0000000 --- a/libs/CommService/libs/CLI11/.github/CONTRIBUTING.md +++ /dev/null @@ -1,102 +0,0 @@ -# Contributing - -Thanks for considering to write a Pull Request (PR) for CLI11! Here are a few -guidelines to get you started: - -Make sure you are comfortable with the license; all contributions are licensed -under the original license. - -## Adding functionality - -Make sure any new functions you add are are: - -- Documented by `///` documentation for Doxygen -- Mentioned in the instructions in the README, though brief mentions are okay -- Explained in your PR (or previously explained in an Issue mentioned in the PR) -- Completely covered by tests - -In general, make sure the addition is well thought out and does not increase the -complexity of CLI11 needlessly. - -## Things you should know - -- Once you make the PR, tests will run to make sure your code works on all - supported platforms -- The test coverage is also measured, and that should remain 100% -- Formatting should be done with pre-commit, otherwise the format check will not - pass. However, it is trivial to apply this to your PR, so don't worry about - this check. If you do want to run it, see below. -- Everything must pass clang-tidy as well, run with `-DCLI11_CLANG_TIDY=ON` (if - you set `-DCLI11_CLANG_TIDY_OPTIONS="-fix"`, make sure you use a single - threaded build process, or just build one example target). -- Your changes must also conform to most of the - [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) - rules checked by [cpplint](https://github.com/cpplint/cpplint). For unused - cpplint filters and justifications, see [CPPLINT.cfg](/CPPLINT.cfg). - -## Pre-commit - -Format is handled by pre-commit. You should install it (or use -[pipx](https://pypa.github.io/pipx/)): - -```bash -python3 -m pip install pre-commit -``` - -Then, you can run it on the items you've added to your staging area, or all -files: - -```bash -pre-commit run -# OR -pre-commit run --all-files -``` - -And, if you want to always use it, you can install it as a git hook (hence the -name, pre-commit): - -```bash -pre-commit install -``` - -## For developers releasing to Conan.io - -This is now done by the CI system on tagged releases. Previously, the steps to -make a Conan.io release were: - -```bash -conan remove '*' # optional, I like to be clean -conan create . cliutils/stable -conan upload "*" -r cli11 --all -``` - -Here I've assumed that the remote is `cli11`. - -## For maintainers: remember to add contributions - -In a commit to a PR, just add -"`@all-contributors please add for `" or similar (see -). Use `code` for code, `bug` if an issue was -submitted, `platform` for packaging stuff, and `doc` for documentation updates. - -To run locally, do: - -```bash -yarn add --dev all-contributors-cli -yarn all-contributors add username code,bug -``` - -## For maintainers: Making a release - -Remember to replace the emoji in the readme, being careful not to replace the -ones in all-contributors if any overlap. - -Steps: - -- Update changelog if needed -- Update the version in `.appveyor.yml` and `include/CLI/Version.hpp`. -- Find and replace in README (new minor/major release only): - - Replace " 🆕" and "🆕 " with "" (ignores the description line) - - Check for `\/\/$` (vi syntax) to catch leftover `// 🆕` - - Replace "🚧" with "🆕" (manually ignore the description line) -- Make a release in the GitHub UI, use a name such as "Version X.Y(.Z): Title" diff --git a/libs/CommService/libs/CLI11/.github/dependabot.yml b/libs/CommService/libs/CLI11/.github/dependabot.yml deleted file mode 100644 index 7327336..0000000 --- a/libs/CommService/libs/CLI11/.github/dependabot.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: 2 -updates: - # Maintain dependencies for GitHub Actions - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - ignore: - # Official actions have moving tags like v1 - # that are used, so they don't need updates here - - dependency-name: "actions/checkout" - - dependency-name: "actions/setup-python" - - dependency-name: "actions/cache" - - dependency-name: "actions/upload-artifact" - - dependency-name: "actions/download-artifact" - - dependency-name: "actions/labeler" diff --git a/libs/CommService/libs/CLI11/.github/workflows/build.yml b/libs/CommService/libs/CLI11/.github/workflows/build.yml deleted file mode 100644 index 89d522c..0000000 --- a/libs/CommService/libs/CLI11/.github/workflows/build.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Build -on: - push: - branches: - - main - - v* - tags: - - "*" - pull_request: - -jobs: - single-header: - name: Single header - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - - uses: actions/setup-python@v2 - - - name: Prepare CMake config - run: cmake -S . -B build -DCLI11_SINGLE_FILE=ON - - - name: Make package - run: cmake --build build --target package_source - - - name: Copy source packages - run: | - mkdir -p CLI11-Source - cp build/CLI11-*-Source.* CLI11-Source - cp build/CLI11-*-Source.* . - - - name: Make header - run: cmake --build build --target CLI11-generate-single-file - - - name: Copy file to main folder - run: cp build/include/CLI11.hpp CLI11.hpp - - - uses: actions/upload-artifact@v2 - with: - name: CLI11.hpp - path: CLI11.hpp - - - uses: actions/upload-artifact@v2 - with: - name: CLI11-Source - path: CLI11-Source - - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: | - CLI11.hpp - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/libs/CommService/libs/CLI11/.github/workflows/tests.yml b/libs/CommService/libs/CLI11/.github/workflows/tests.yml deleted file mode 100644 index 189e8df..0000000 --- a/libs/CommService/libs/CLI11/.github/workflows/tests.yml +++ /dev/null @@ -1,184 +0,0 @@ -name: Tests -on: - push: - branches: - - main - - v* - pull_request: - -jobs: - cuda-build: - name: CUDA build only - runs-on: ubuntu-latest - container: nvidia/cuda:10.2-devel-ubuntu18.04 - steps: - - uses: actions/checkout@v1 - with: - submodules: true - - name: Add wget - run: apt-get update && apt-get install -y wget - - name: Get cmake - uses: jwlawson/actions-setup-cmake@v1.12 - - name: Configure - run: cmake -S . -B build -DCLI11_CUDA_TESTS=ON - - name: Build - run: cmake --build build -j2 - - boost-build: - name: Boost build - runs-on: ubuntu-latest - container: zouzias/boost:1.76.0 - steps: - - uses: actions/checkout@v1 - with: - submodules: true - - name: Add deps - run: apt-get update && apt-get install make - - name: Get CMake - uses: jwlawson/actions-setup-cmake@v1.12 - - name: Configure - run: cmake -S . -B build -DCLI11_BOOST=ON - - name: Build - run: cmake --build build -j2 - - name: Run tests - run: ctest --output-on-failure - working-directory: build - - meson-build: - name: Meson build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Prepare commands - run: | - pipx install meson - pipx install ninja - - - name: Configure - run: meson setup build-meson . -Dtests=true - - - name: Build - run: meson compile -C build-meson - - cmake-config: - name: CMake config check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Check CMake 3.4 - with: - cmake-version: "3.4" - uses: ./.github/actions/quick_cmake - - - name: Check CMake 3.5 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.5" - if: success() || failure() - - - name: Check CMake 3.6 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.6" - if: success() || failure() - - - name: Check CMake 3.7 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.7" - if: success() || failure() - - - name: Check CMake 3.8 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.8" - if: success() || failure() - - - name: Check CMake 3.9 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.9" - if: success() || failure() - - - name: Check CMake 3.10 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.10" - if: success() || failure() - - - name: Check CMake 3.11 (full) - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.11" - args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON - if: success() || failure() - - - name: Check CMake 3.12 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.12" - if: success() || failure() - - - name: Check CMake 3.13 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.13" - if: success() || failure() - - - name: Check CMake 3.14 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.14" - if: success() || failure() - - - name: Check CMake 3.15 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.15" - if: success() || failure() - - - name: Check CMake 3.16 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.16" - if: success() || failure() - - - name: Check CMake 3.17 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.17" - if: success() || failure() - - - name: Check CMake 3.18 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.18" - if: success() || failure() - - - name: Check CMake 3.19 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.19" - if: success() || failure() - - - name: Check CMake 3.20 - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.20" - if: success() || failure() - - - name: Check CMake 3.21 (full) - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.21" - args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON - if: success() || failure() - - - name: Check CMake 3.22 (full) - uses: ./.github/actions/quick_cmake - with: - cmake-version: "3.22" - args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON - if: success() || failure() diff --git a/libs/CommService/libs/CLI11/.pre-commit-config.yaml b/libs/CommService/libs/CLI11/.pre-commit-config.yaml deleted file mode 100644 index e7165d3..0000000 --- a/libs/CommService/libs/CLI11/.pre-commit-config.yaml +++ /dev/null @@ -1,86 +0,0 @@ -ci: - autoupdate_commit_msg: "chore(deps): pre-commit.ci autoupdate" - autofix_commit_msg: "style: pre-commit.ci fixes" - -repos: - - repo: https://github.com/psf/black - rev: 22.3.0 - hooks: - - id: black - - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: check-added-large-files - - id: check-case-conflict - - id: check-merge-conflict - - id: check-symlinks - - id: check-yaml - - id: end-of-file-fixer - - id: mixed-line-ending - - id: trailing-whitespace - - - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.5 - hooks: - - id: clang-format - types_or: [c++, c, cuda] - - - repo: https://github.com/cheshirekow/cmake-format-precommit - rev: v0.6.13 - hooks: - - id: cmake-format - additional_dependencies: [pyyaml] - - - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v2.7.1" - hooks: - - id: prettier - types_or: [yaml, markdown, html, css, scss, javascript, json] - args: [--prose-wrap=always] - - - repo: https://github.com/markdownlint/markdownlint - rev: v0.11.0 - hooks: - - id: markdownlint - args: ["--style=scripts/mdlint_style.rb"] - - - repo: local - hooks: - - id: remarklint - name: remarklint - language: node - entry: remark - types: [markdown] - args: ["--frail", "--quiet"] - additional_dependencies: - [ - remark, - remark-lint, - remark-cli, - remark-preset-lint-recommended, - remark-lint-list-item-indent, - remark-lint-no-undefined-references, - ] - - - repo: local - hooks: - - id: disallow-caps - name: Disallow improper capitalization - language: pygrep - entry: PyBind|Numpy|Cmake|CCache|PyTest|Github - exclude: .pre-commit-config.yaml - - - repo: local - hooks: - - id: avoid-msvc-macro - name: Avoid MSVC <=2017 min/max macro (use extra parens) - language: pygrep - entry: \b(min|max)\( - exclude: .pre-commit-config.yaml - - - repo: https://github.com/codespell-project/codespell - rev: v2.1.0 - hooks: - - id: codespell - args: ["-L", "atleast,ans,doub,inout"] diff --git a/libs/CommService/libs/CLI11/CLI11.hpp.in b/libs/CommService/libs/CLI11/CLI11.hpp.in deleted file mode 100644 index 64e1ae2..0000000 --- a/libs/CommService/libs/CLI11/CLI11.hpp.in +++ /dev/null @@ -1,69 +0,0 @@ -// CLI11: Version {version} -// Originally designed by Henry Schreiner -// https://github.com/CLIUtils/CLI11 -// -// This is a standalone header file generated by MakeSingleHeader.py in CLI11/scripts -// from: {git} -// -// CLI11 {version} Copyright (c) 2017-2022 University of Cincinnati, developed by Henry -// Schreiner under NSF AWARD 1414736. All rights reserved. -// -// Redistribution and use in source and binary forms of CLI11, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// 3. Neither the name of the copyright holder nor the names of its contributors -// may be used to endorse or promote products derived from this software without -// specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#pragma once - -// Standard combined includes: -{public_includes} - -{version_hpp} - -{macros_hpp} - -{validators_hpp_filesystem} - -namespace {namespace} {{ - -{string_tools_hpp} - -{error_hpp} - -{type_tools_hpp} - -{split_hpp} - -{config_fwd_hpp} - -{validators_hpp} - -{formatter_fwd_hpp} - -{option_hpp} - -{app_hpp} - -{config_hpp} - -{formatter_hpp} - -}} // namespace {namespace} diff --git a/libs/CommService/libs/CLI11/CMakeLists.txt b/libs/CommService/libs/CLI11/CMakeLists.txt deleted file mode 100644 index 1f4313f..0000000 --- a/libs/CommService/libs/CLI11/CMakeLists.txt +++ /dev/null @@ -1,331 +0,0 @@ -cmake_minimum_required(VERSION 3.4) -# Note: this is a header only library. If you have an older CMake than 3.4, -# just add the CLI11/include directory and that's all you need to do. - -# Make sure users don't get warnings on a tested (3.4 to 3.22) version -# of CMake. For most of the policies, the new version is better (hence the change). -# We don't use the 3.4...3.21 syntax because of a bug in an older MSVC's -# built-in and modified CMake 3.11 -if(${CMAKE_VERSION} VERSION_LESS 3.22) - cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) -else() - cmake_policy(VERSION 3.22) -endif() - -set(VERSION_REGEX "#define CLI11_VERSION[ \t]+\"(.+)\"") - -# Read in the line containing the version -file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/CLI/Version.hpp" VERSION_STRING - REGEX ${VERSION_REGEX}) - -# Pick out just the version -string(REGEX REPLACE ${VERSION_REGEX} "\\1" VERSION_STRING "${VERSION_STRING}") - -# Add the project -project( - CLI11 - LANGUAGES CXX - VERSION ${VERSION_STRING}) - -# Print the version number of CMake if this is the main project -if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) - message(STATUS "CMake ${CMAKE_VERSION}") - - find_package(Doxygen) - - if(CMAKE_VERSION VERSION_LESS 3.10) - message(STATUS "CMake 3.10+ adds Doxygen support. Update CMake to build documentation") - elseif(NOT Doxygen_FOUND) - message(STATUS "Doxygen not found, building docs has been disabled") - endif() - - include(CTest) -else() - if(NOT DEFINED BUILD_TESTING) - set(BUILD_TESTING OFF) - endif() -endif() - -include(CMakeDependentOption) -include(GNUInstallDirs) - -if(NOT CMAKE_VERSION VERSION_LESS 3.11) - include(FetchContent) -endif() - -list(APPEND force-libcxx "CMAKE_CXX_COMPILER_ID STREQUAL \"Clang\"") -list(APPEND force-libcxx "CMAKE_SYSTEM_NAME STREQUAL \"Linux\"") -list(APPEND force-libcxx "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME") - -list(APPEND build-docs "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME") -list(APPEND build-docs "NOT CMAKE_VERSION VERSION_LESS 3.11") -list(APPEND build-docs "Doxygen_FOUND") - -# Necessary to support paths with spaces, see #457 -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/docs") - set(docs_EXIST TRUE) -else() - set(docs_EXIST FALSE) -endif() -list(APPEND build-docs "docs_EXIST") - -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/examples") - set(examples_EXIST TRUE) -else() - set(examples_EXIST FALSE) -endif() - -option(CLI11_WARNINGS_AS_ERRORS "Turn all warnings into errors (for CI)") -option(CLI11_SINGLE_FILE "Generate a single header file") -cmake_dependent_option(CLI11_SANITIZERS "Download the sanitizers CMake config" OFF - "NOT CMAKE_VERSION VERSION_LESS 3.11" OFF) - -cmake_dependent_option(CLI11_BUILD_DOCS "Build CLI11 documentation" ON "${build-docs}" OFF) - -cmake_dependent_option(CLI11_BUILD_TESTS "Build CLI11 tests" ON - "BUILD_TESTING;CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF) - -cmake_dependent_option(CLI11_BUILD_EXAMPLES "Build CLI11 examples" ON - "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;${examples_EXIST}" OFF) - -cmake_dependent_option(CLI11_BUILD_EXAMPLES_JSON "Build CLI11 json example" OFF - "CLI11_BUILD_EXAMPLES;NOT CMAKE_VERSION VERSION_LESS 3.11" OFF) - -cmake_dependent_option(CLI11_SINGLE_FILE_TESTS "Duplicate all the tests for a single file build" - OFF "BUILD_TESTING;CLI11_SINGLE_FILE" OFF) - -cmake_dependent_option(CLI11_INSTALL "Install the CLI11 folder to include during install process" - ON "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF) - -cmake_dependent_option( - CLI11_FORCE_LIBCXX "Force clang to use libc++ instead of libstdc++ (Linux only)" OFF - "${force-libcxx}" OFF) - -cmake_dependent_option( - CLI11_CUDA_TESTS "Build the tests with NVCC to check for warnings there - requires CMake 3.9+" - OFF "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF) - -cmake_dependent_option( - CLI11_CLANG_TIDY "Look for and use Clang-Tidy" OFF - "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;NOT CMAKE_VERSION VERSION_LESS 3.6" OFF) -set(CLI11_CLANG_TIDY_OPTIONS - "" - CACHE STRING "Clang tidy options, such as -fix, semicolon separated") - -if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) -endif() - -if(NOT DEFINED CMAKE_CXX_EXTENSIONS) - set(CMAKE_CXX_EXTENSIONS OFF) -endif() - -if(NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -endif() - -# Allow IDE's to group targets into folders -if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) -endif() - -# Special target that adds warnings. Is not exported. -add_library(CLI11_warnings INTERFACE) - -set(unix-warnings -Wall -Wextra -pedantic -Wshadow -Wsign-conversion -Wswitch-enum) - -# Buggy in GCC 4.8 -if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) - list(APPEND unix-warnings -Weffc++) -endif() - -target_compile_options( - CLI11_warnings - INTERFACE $<$:-stdlib=libc++> - $<$:/W4 - $<$:/WX>> - $<$>:${unix-warnings} - $<$:-Werror>>) - -if(NOT CMAKE_VERSION VERSION_LESS 3.13) - target_link_options(CLI11_warnings INTERFACE $<$:-stdlib=libc++>) -endif() - -# Allow IDE's to group targets into folders -add_library(CLI11 INTERFACE) -add_library(CLI11::CLI11 ALIAS CLI11) # for add_subdirectory calls - -# Duplicated because CMake adds the current source dir if you don't. -target_include_directories(CLI11 INTERFACE $ - $) - -if(CMAKE_VERSION VERSION_LESS 3.8) - # This might not be a complete list - target_compile_features( - CLI11 - INTERFACE cxx_lambdas - cxx_nullptr - cxx_override - cxx_range_for - cxx_right_angle_brackets - cxx_strong_enums - cxx_constexpr - cxx_auto_type) -else() - target_compile_features(CLI11 INTERFACE cxx_std_11) -endif() - -# To see in IDE, headers must be listed for target -set(header-patterns "${PROJECT_SOURCE_DIR}/include/CLI/*") -if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND NOT CMAKE_VERSION VERSION_LESS 3.12) - list(INSERT header-patterns 0 CONFIGURE_DEPENDS) -endif() - -file(GLOB CLI11_headers ${header-patterns}) - -# Allow tests to be run on CUDA -if(CLI11_CUDA_TESTS) - enable_language(CUDA) - - # Print out warning and error numbers - set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcudafe --display_error_number") -endif() - -# Prepare Clang-Tidy -if(CLI11_CLANG_TIDY) - find_program( - CLANG_TIDY_EXE - NAMES "clang-tidy" - DOC "Path to clang-tidy executable" REQUIRED) - - set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" ${CLI11_CLANG_TIDY_OPTIONS}) -endif() - -# This folder should be installed -if(CLI11_INSTALL) - install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - - # Make an export target - install(TARGETS CLI11 EXPORT CLI11Targets) - - # Use find_package on the installed package - # Since we have no custom code, we can directly write this - # to Config.cmake (otherwise we'd have a custom config and would - # import Targets.cmake - - # Add the version in a CMake readable way - configure_file("cmake/CLI11ConfigVersion.cmake.in" "CLI11ConfigVersion.cmake" @ONLY) - - # Make version available in the install - install(FILES "${PROJECT_BINARY_DIR}/CLI11ConfigVersion.cmake" - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/CLI11") - - # Install the export target as a file - install( - EXPORT CLI11Targets - FILE CLI11Config.cmake - NAMESPACE CLI11:: - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/CLI11") - - # Use find_package on the installed package - export( - TARGETS CLI11 - NAMESPACE CLI11:: - FILE CLI11Targets.cmake) - - include(cmake/CLI11GeneratePkgConfig.cmake) - - # Register in the user cmake package registry - export(PACKAGE CLI11) -endif() - -if(CLI11_SINGLE_FILE) - # Single file test - if(CMAKE_VERSION VERSION_LESS 3.12) - find_package(PythonInterp REQUIRED) - add_executable(Python::Interpreter IMPORTED) - set_target_properties(Python::Interpreter PROPERTIES IMPORTED_LOCATION "${PYTHON_EXECUTABLE}" - VERSION "${PYTHON_VERSION_STRING}") - else() - find_package( - Python - COMPONENTS Interpreter - REQUIRED) - endif() - - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include") - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp" - COMMAND - Python::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/scripts/MakeSingleHeader.py" - ${CLI11_headers} --main "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.hpp.in" --output - "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp" --version "${CLI11_VERSION}" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/CLI/CLI.hpp" ${CLI11_headers}) - add_custom_target(CLI11-generate-single-file ALL - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp") - set_property(TARGET CLI11-generate-single-file PROPERTY FOLDER "Scripts") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp" DESTINATION include) - add_library(CLI11_SINGLE INTERFACE) - target_link_libraries(CLI11_SINGLE INTERFACE CLI11) - add_dependencies(CLI11_SINGLE CLI11-generate-single-file) - target_compile_definitions(CLI11_SINGLE INTERFACE -DCLI11_SINGLE_FILE) - target_include_directories( - CLI11_SINGLE INTERFACE $ - $) -endif() - -if(CLI11_BUILD_TESTS) - include(CTest) - add_subdirectory(tests) -endif() - -if(CLI11_BUILD_EXAMPLES) - add_subdirectory(examples) -endif() - -if(CLI11_BUILD_DOCS) - add_subdirectory(docs) -endif() - -# From a build system, this might not be included. -if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/book") - add_subdirectory(book) -endif() - -# Packaging support -set(CPACK_PACKAGE_VENDOR "github.com/CLIUtils/CLI11") -set(CPACK_PACKAGE_CONTACT "https://${CPACK_PACKAGE_VENDOR}") -set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) # Automatic in CMake 3.12+ -set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) # Automatic in CMake 3.12+ -set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) # Automatic in CMake 3.12+ -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Command line parser with simple and intuitive interface") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") -set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.CPack.Description.txt") -set(CPACK_SOURCE_GENERATOR "TGZ;ZIP") - -# CPack collects *everything* except what's listed here. -set(CPACK_SOURCE_IGNORE_FILES - /.git - /dist - /.*build.* - /\\\\.DS_Store - /.*\\\\.egg-info - /var - /azure-pipelines.yml - /.ci - /docs - /examples - /test_package - /book - /.travis.yml - .swp - /.all-contributorsrc - /.appveyor.yml - /.pre-commit.*yaml) - -set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all") -set(CPACK_DEBIAN_COMPRESSION_TYPE "xz") -set(CPACK_DEBIAN_PACKAGE_NAME "libcli11-dev") - -include(CPack) diff --git a/libs/CommService/libs/CLI11/azure-pipelines.yml b/libs/CommService/libs/CLI11/azure-pipelines.yml deleted file mode 100644 index 17944e8..0000000 --- a/libs/CommService/libs/CLI11/azure-pipelines.yml +++ /dev/null @@ -1,143 +0,0 @@ -# C/C++ with GCC -# Build your C/C++ project with GCC using make. -# Add steps that publish test results, save build artifacts, deploy, and more: -# https://docs.microsoft.com/azure/devops/pipelines/apps/c-cpp/gcc - -trigger: - - main - - "v*" - -pr: - - main - - "v*" - -variables: - cli11.single: ON - cli11.std: 14 - cli11.build_type: Debug - cli11.options: -DCLI11_EXAMPLES_JSON=ON - CMAKE_BUILD_PARALLEL_LEVEL: 4 - -jobs: - - job: ClangTidy - variables: - CXX_FLAGS: > - -Werror -Wcast-align -Wfloat-equal -Wimplicit-atomic-properties - -Wmissing-declarations -Woverlength-strings -Wshadow - -Wstrict-selector-match -Wundeclared-selector -Wunreachable-code - -std=c++11 - cli11.options: -DCLI11_CLANG_TIDY=ON -DCLI11_CLANG_TIDY_OPTIONS="-fix" - cli11.std: 11 - cli11.single: OFF - CMAKE_BUILD_PARALLEL_LEVEL: 1 - pool: - vmImage: "ubuntu-latest" - container: silkeh/clang:8 - steps: - - template: .ci/azure-cmake.yml - - template: .ci/azure-build.yml - - script: git diff --exit-code --color - displayName: Check tidy - - - job: CppLint - pool: - vmImage: "ubuntu-latest" - container: sharaku/cpplint:latest - steps: - - bash: cpplint --counting=detailed --recursive examples include/CLI tests - displayName: Checking against google style guide - - # TODO: Fix macOS error and windows warning in c++17 mode - - job: Native - strategy: - matrix: - Linux14: - vmImage: "ubuntu-latest" - macOS17: - vmImage: "macOS-latest" - cli11.std: 17 - macOS11: - vmImage: "macOS-latest" - cli11.std: 11 - Windows17: - vmImage: "vs2017-win2016" - cli11.std: 17 - Windows11: - vmImage: "vs2017-win2016" - cli11.std: 11 - Windowslatest: - vmImage: "windows-2019" - cli11.std: 20 - cli11.options: -DCMAKE_CXX_FLAGS="/std:c++latest /EHsc" - Linux17nortti: - vmImage: "ubuntu-latest" - cli11.std: 17 - cli11.options: -DCMAKE_CXX_FLAGS="-fno-rtti" - pool: - vmImage: $(vmImage) - steps: - - template: .ci/azure-build.yml - - template: .ci/azure-test.yml - - - job: Meson - pool: - vmImage: "ubuntu-latest" - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: "3.7" - - script: python3 -m pip install meson ninja - displayName: install meson - - script: mkdir tests/mesonTest/subprojects - displayName: generate test directories - - script: ln -s "$(pwd)" tests/mesonTest/subprojects/CLI11 - displayName: generate CLI11 symlink - - script: meson build - displayName: Run meson to generate build - workingDirectory: tests/mesonTest - - script: ninja -C tests/mesonTest/build - displayName: Build with Ninja - - script: ./tests/mesonTest/build/main --help - displayName: Run help - - - job: Docker - variables: - cli11.single: OFF - pool: - vmImage: "ubuntu-latest" - strategy: - matrix: - gcc9: - containerImage: gcc:9 - cli11.std: 17 - cli11.options: -DCMAKE_CXX_FLAGS="-Wstrict-overflow=5" - gcc11: - containerImage: gcc:11 - cli11.std: 20 - gcc8: - containerImage: gcc:8 - cli11.std: 17 - gcc4.8: - containerImage: gcc:4.8 - cli11.std: 11 - cli11.options: - clang3.4: - containerImage: silkeh/clang:3.4 - cli11.std: 11 - clang8: - containerImage: silkeh/clang:8 - cli11.std: 14 - cli11.options: -DCLI11_FORCE_LIBCXX=ON - clang8_17: - containerImage: silkeh/clang:8 - cli11.std: 17 - cli11.options: -DCLI11_FORCE_LIBCXX=ON - clang10_20: - containerImage: silkeh/clang:10 - cli11.std: 20 - cli11.options: -DCLI11_FORCE_LIBCXX=ON -DCMAKE_CXX_FLAGS=-std=c++20 - container: $[ variables['containerImage'] ] - steps: - - template: .ci/azure-cmake.yml - - template: .ci/azure-build.yml - - template: .ci/azure-test.yml diff --git a/libs/CommService/libs/CLI11/conanfile.py b/libs/CommService/libs/CLI11/conanfile.py deleted file mode 100644 index 377cd01..0000000 --- a/libs/CommService/libs/CLI11/conanfile.py +++ /dev/null @@ -1,48 +0,0 @@ -from conans import ConanFile, CMake -from conans.tools import load, cross_building -import re - - -def get_version(): - try: - content = load("include/CLI/Version.hpp") - version = re.search(r'#define CLI11_VERSION "(.*)"', content).group(1) - return version - except Exception: - return None - - -class CLI11Conan(ConanFile): - name = "CLI11" - version = get_version() - description = "Command Line Interface toolkit for C++11" - topics = ("cli", "c++11", "parser", "cli11") - url = "https://github.com/CLIUtils/CLI11" - homepage = "https://github.com/CLIUtils/CLI11" - author = "Henry Schreiner " - license = "BSD-3-Clause" - - settings = "os", "compiler", "arch", "build_type" - exports_sources = ( - "LICENSE", - "README.md", - "include/*", - "extern/*", - "cmake/*", - "CMakeLists.txt", - "CLI11.CPack.Description.txt", - "tests/*", - ) - - def build(self): # this is not building a library, just tests - cmake = CMake(self) - cmake.definitions["CLI11_EXAMPLES"] = "OFF" - cmake.definitions["CLI11_SINGLE_FILE"] = "OFF" - cmake.configure() - cmake.build() - if not cross_building(self.settings): - cmake.test() - cmake.install() - - def package_id(self): - self.info.header_only() diff --git a/libs/CommService/libs/CLI11/examples/CMakeLists.txt b/libs/CommService/libs/CLI11/examples/CMakeLists.txt deleted file mode 100644 index 26747f0..0000000 --- a/libs/CommService/libs/CLI11/examples/CMakeLists.txt +++ /dev/null @@ -1,254 +0,0 @@ -function(add_cli_exe T) - add_executable(${T} ${ARGN} ${CLI11_headers}) - target_link_libraries(${T} PUBLIC CLI11) - set_property(TARGET ${T} PROPERTY FOLDER "Examples") - if(CLI11_FORCE_LIBCXX) - set_property( - TARGET ${T} - APPEND_STRING - PROPERTY LINK_FLAGS -stdlib=libc++) - endif() - if(CLI11_CLANG_TIDY) - set_property(TARGET ${T} PROPERTY CXX_CLANG_TIDY "${DO_CLANG_TIDY}") - endif() -endfunction() - -if(CLI11_BUILD_EXAMPLES_JSON) - message(STATUS "Using nlohmann/json") - FetchContent_Declare( - json - URL https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip - URL_HASH "SHA256=87b5884741427220d3a33df1363ae0e8b898099fbc59f1c451113f6732891014") - - FetchContent_GetProperties(json) - if(NOT json_POPULATED) - FetchContent_Populate(json) - endif() - - add_cli_exe(json json.cpp) - target_include_directories(json PUBLIC SYSTEM "${json_SOURCE_DIR}/single_include") - - add_test(NAME json_config_out COMMAND json --item 2) - set_property(TEST json_config_out PROPERTY PASS_REGULAR_EXPRESSION [[{]] [["item": "2"]] - [["simple": false]] [[}]]) - - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/input.json" [=[{"item":3,"simple":false}]=]) - add_test(NAME json_config_in COMMAND json --config "${CMAKE_CURRENT_BINARY_DIR}/input.json") - set_property(TEST json_config_in PROPERTY PASS_REGULAR_EXPRESSION [[{]] [["item": "3"]] - [["simple": false]] [[}]]) -endif() - -add_cli_exe(simple simple.cpp) -add_test(NAME simple_basic COMMAND simple) -add_test(NAME simple_all COMMAND simple -f filename.txt -c 12 --flag --flag -d 1.2) -set_property( - TEST simple_all - PROPERTY PASS_REGULAR_EXPRESSION "Working on file: filename.txt, direct count: 1, opt count: 1" - "Working on count: 12, direct count: 1, opt count: 1" "Received flag: 2 (2) times" - "Some value: 1.2") - -add_test(NAME simple_version COMMAND simple --version) -set_property(TEST simple_version PROPERTY PASS_REGULAR_EXPRESSION "${CLI11_VERSION}") - -add_cli_exe(subcommands subcommands.cpp) -add_test(NAME subcommands_none COMMAND subcommands) -set_property(TEST subcommands_none PROPERTY PASS_REGULAR_EXPRESSION "A subcommand is required") -add_test( - NAME subcommands_all - COMMAND subcommands --random start --file - name stop --count) -set_property( - TEST subcommands_all - PROPERTY PASS_REGULAR_EXPRESSION "Working on --file from start: name" - "Working on --count from stop: 1, direct count: 1" "Count of --random flag: 1" - "Subcommand: start" "Subcommand: stop") - -add_cli_exe(subcom_partitioned subcom_partitioned.cpp) -add_test(NAME subcom_partitioned_none COMMAND subcom_partitioned) -set_property( - TEST subcom_partitioned_none - PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:" "--file is required" - "Run with --help for more information.") - -add_test(NAME subcom_partitioned_all COMMAND subcom_partitioned --file this --count --count -d 1.2) -set_property( - TEST subcom_partitioned_all - PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:" - "Working on file: this, direct count: 1, opt count: 1" - "Working on count: 2, direct count: 2, opt count: 2" "Some value: 1.2") -# test shows that the help prints out for unnamed subcommands -add_test(NAME subcom_partitioned_help COMMAND subcom_partitioned --help) -set_property(TEST subcom_partitioned_help PROPERTY PASS_REGULAR_EXPRESSION - "-f,--file TEXT REQUIRED" "-d,--double FLOAT") - -#################################################### -add_cli_exe(config_app config_app.cpp) -add_test(NAME config_app1 COMMAND config_app -p) -set_property(TEST config_app1 PROPERTY PASS_REGULAR_EXPRESSION "file=") - -add_test(NAME config_app2 COMMAND config_app -p -f /) -set_property(TEST config_app2 PROPERTY PASS_REGULAR_EXPRESSION "file=\"/\"") - -add_test(NAME config_app3 COMMAND config_app -f "" -p) -set_property(TEST config_app3 PROPERTY PASS_REGULAR_EXPRESSION "file=\"\"") - -add_test(NAME config_app4 COMMAND config_app -f "/" -p) -set_property(TEST config_app4 PROPERTY PASS_REGULAR_EXPRESSION "file=\"/\"") - -#################################################### - -add_cli_exe(option_groups option_groups.cpp) -add_test(NAME option_groups_missing COMMAND option_groups) -set_property(TEST option_groups_missing PROPERTY PASS_REGULAR_EXPRESSION "Exactly 1 option from" - "is required") -add_test(NAME option_groups_extra COMMAND option_groups --csv --binary) -set_property(TEST option_groups_extra PROPERTY PASS_REGULAR_EXPRESSION "and 2 were given") -add_test(NAME option_groups_extra2 COMMAND option_groups --csv --address "192.168.1.1" -o - "test.out") -set_property(TEST option_groups_extra2 PROPERTY PASS_REGULAR_EXPRESSION "at most 1") - -add_cli_exe(positional_arity positional_arity.cpp) -add_test(NAME positional_arity1 COMMAND positional_arity one) -set_property(TEST positional_arity1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one") -add_test(NAME positional_arity2 COMMAND positional_arity one two) -set_property(TEST positional_arity2 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one" "File 2 = two") -add_test(NAME positional_arity3 COMMAND positional_arity 1 2 one) -set_property(TEST positional_arity3 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one") -add_test(NAME positional_arity_fail COMMAND positional_arity 1 one two) -set_property(TEST positional_arity_fail PROPERTY PASS_REGULAR_EXPRESSION "Could not convert") - -add_cli_exe(positional_validation positional_validation.cpp) -add_test(NAME positional_validation1 COMMAND positional_validation one) -set_property(TEST positional_validation1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one") -add_test(NAME positional_validation2 COMMAND positional_validation one 1 2 two) -set_property(TEST positional_validation2 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one" - "File 2 = two") -add_test(NAME positional_validation3 COMMAND positional_validation 1 2 one) -set_property(TEST positional_validation3 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one") -add_test(NAME positional_validation4 COMMAND positional_validation 1 one two 2) -set_property(TEST positional_validation4 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one" - "File 2 = two") - -add_cli_exe(shapes shapes.cpp) -add_test(NAME shapes_all COMMAND shapes circle 4.4 circle 10.7 rectangle 4 4 circle 2.3 triangle - 4.5 ++ rectangle 2.1 ++ circle 234.675) -set_property( - TEST shapes_all PROPERTY PASS_REGULAR_EXPRESSION "circle2" "circle4" - "rectangle2 with edges [2.1,2.1]" "triangel1 with sides [4.5]") - -add_cli_exe(ranges ranges.cpp) -add_test(NAME ranges_range COMMAND ranges --range 1 2 3) -set_property(TEST ranges_range PROPERTY PASS_REGULAR_EXPRESSION "[2:1:3]") -add_test(NAME ranges_minmax COMMAND ranges --min 2 --max 3) -set_property(TEST ranges_minmax PROPERTY PASS_REGULAR_EXPRESSION "[2:1:3]") -add_test(NAME ranges_error COMMAND ranges --min 2 --max 3 --step 1 --range 1 2 3) -set_property(TEST ranges_error PROPERTY PASS_REGULAR_EXPRESSION "Exactly 1 option from") - -add_cli_exe(validators validators.cpp) -add_test(NAME validators_help COMMAND validators --help) -set_property( - TEST validators_help - PROPERTY PASS_REGULAR_EXPRESSION " -f,--file TEXT:FILE[\\r\\n\\t ]+File name" - " -v,--value INT:INT in [3 - 6][\\r\\n\\t ]+Value in range") -add_test(NAME validators_file COMMAND validators --file nonex.xxx) -set_property( - TEST validators_file PROPERTY PASS_REGULAR_EXPRESSION "--file: File does not exist: nonex.xxx" - "Run with --help for more information.") -add_test(NAME validators_plain COMMAND validators --value 9) -set_property( - TEST validators_plain PROPERTY PASS_REGULAR_EXPRESSION "--value: Value 9 not in range 3 to 6" - "Run with --help for more information.") - -add_cli_exe(groups groups.cpp) -add_test(NAME groups_none COMMAND groups) -set_property( - TEST groups_none PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:" "--file is required" - "Run with --help for more information.") -add_test(NAME groups_all COMMAND groups --file this --count --count -d 1.2) -set_property( - TEST groups_all - PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:" - "Working on file: this, direct count: 1, opt count: 1" - "Working on count: 2, direct count: 2, opt count: 2" "Some value: 1.2") - -add_cli_exe(inter_argument_order inter_argument_order.cpp) -add_test(NAME inter_argument_order COMMAND inter_argument_order --foo 1 2 3 --x --bar 4 5 6 --z - --foo 7 8) -set_property( - TEST inter_argument_order - PROPERTY - PASS_REGULAR_EXPRESSION - [=[foo : 1 -foo : 2 -foo : 3 -bar : 4 -bar : 5 -bar : 6 -foo : 7 -foo : 8]=]) - -add_cli_exe(prefix_command prefix_command.cpp) -add_test(NAME prefix_command COMMAND prefix_command -v 3 2 1 -- other one two 3) -set_property(TEST prefix_command PROPERTY PASS_REGULAR_EXPRESSION "Prefix: 3 : 2 : 1" - "Remaining commands: other one two 3") - -add_cli_exe(callback_passthrough callback_passthrough.cpp) -add_test(NAME callback_passthrough1 COMMAND callback_passthrough --argname t2 --t2 test) -set_property(TEST callback_passthrough1 PROPERTY PASS_REGULAR_EXPRESSION "the value is now test") -add_test(NAME callback_passthrough2 COMMAND callback_passthrough --arg EEEK --argname arg) -set_property(TEST callback_passthrough2 PROPERTY PASS_REGULAR_EXPRESSION "the value is now EEEK") - -add_cli_exe(enum enum.cpp) -add_test(NAME enum_pass COMMAND enum -l 1) -add_test(NAME enum_fail COMMAND enum -l 4) -set_property(TEST enum_fail PROPERTY PASS_REGULAR_EXPRESSION "--level: Check 4 value in {" - "FAILED") - -add_cli_exe(enum_ostream enum_ostream.cpp) -add_test(NAME enum_ostream_pass COMMAND enum_ostream --level medium) -set_property(TEST enum_ostream_pass PROPERTY PASS_REGULAR_EXPRESSION "Enum received: Medium") - -add_cli_exe(digit_args digit_args.cpp) -add_test(NAME digit_args COMMAND digit_args -h) -set_property(TEST digit_args PROPERTY PASS_REGULAR_EXPRESSION "-3{3}") - -add_cli_exe(modhelp modhelp.cpp) -add_test(NAME modhelp COMMAND modhelp -a test -h) -set_property(TEST modhelp PROPERTY PASS_REGULAR_EXPRESSION "Option -a string in help: test") - -add_subdirectory(subcom_in_files) -add_test(NAME subcom_in_files COMMAND subcommand_main subcommand_a -f this.txt --with-foo) -set_property(TEST subcom_in_files PROPERTY PASS_REGULAR_EXPRESSION "Working on file: this\.txt" - "Using foo!") - -add_cli_exe(formatter formatter.cpp) - -add_cli_exe(nested nested.cpp) - -add_cli_exe(subcom_help subcom_help.cpp) -add_test(NAME subcom_help_normal COMMAND subcom_help sub --help) -add_test(NAME subcom_help_reversed COMMAND subcom_help --help sub) - -add_cli_exe(retired retired.cpp) -add_test(NAME retired_retired_test COMMAND retired --retired_option) -add_test(NAME retired_retired_test2 COMMAND retired --retired_option 567) -add_test(NAME retired_retired_test3 COMMAND retired --retired_option2 567 689 789) -add_test(NAME retired_deprecated COMMAND retired --deprecate 19 20) - -set_property(TEST retired_retired_test PROPERTY PASS_REGULAR_EXPRESSION "WARNING.*retired") - -set_property(TEST retired_retired_test2 PROPERTY PASS_REGULAR_EXPRESSION "WARNING.*retired") - -set_property(TEST retired_retired_test3 PROPERTY PASS_REGULAR_EXPRESSION "WARNING.*retired") - -set_property(TEST retired_deprecated PROPERTY PASS_REGULAR_EXPRESSION "deprecated.*not_deprecated") - -#-------------------------------------------- -add_cli_exe(custom_parse custom_parse.cpp) -add_test(NAME cp_test COMMAND custom_parse --dv 1.7) -set_property(TEST cp_test PROPERTY PASS_REGULAR_EXPRESSION "called correct") - -#------------------------------------------------ -# This executable is for manual testing and is expected to change regularly - -add_cli_exe(tester testEXE.cpp) diff --git a/libs/CommService/libs/CLI11/examples/custom_parse.cpp b/libs/CommService/libs/CLI11/examples/custom_parse.cpp deleted file mode 100644 index d24b994..0000000 --- a/libs/CommService/libs/CLI11/examples/custom_parse.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -// from Issue #566 on github https://github.com/CLIUtils/CLI11/issues/566 - -#include -#include -#include - -// example file to demonstrate a custom lexical cast function - -template struct Values { - T a; - T b; - T c; -}; - -// in C++20 this is constructible from a double due to the new aggregate initialization in C++20. -using DoubleValues = Values; - -// the lexical cast operator should be in the same namespace as the type for ADL to work properly -bool lexical_cast(const std::string &input, Values &v) { - std::cout << "called correct lexical_cast function ! val: " << input << std::endl; - return true; -} - -DoubleValues doubles; -void argparse(CLI::Option_group *group) { group->add_option("--dv", doubles)->default_str("0"); } - -int main(int argc, char **argv) { - CLI::App app; - - argparse(app.add_option_group("param")); - CLI11_PARSE(app, argc, argv); - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/formatter.cpp b/libs/CommService/libs/CLI11/examples/formatter.cpp deleted file mode 100644 index 8d3a974..0000000 --- a/libs/CommService/libs/CLI11/examples/formatter.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include - -class MyFormatter : public CLI::Formatter { - public: - MyFormatter() : Formatter() {} - std::string make_option_opts(const CLI::Option *) const override { return " OPTION"; } -}; - -int main(int argc, char **argv) { - CLI::App app; - app.set_help_all_flag("--help-all", "Show all help"); - - auto fmt = std::make_shared(); - fmt->column_width(15); - app.formatter(fmt); - - app.add_flag("--flag", "This is a flag"); - - auto sub1 = app.add_subcommand("one", "Description One"); - sub1->add_flag("--oneflag", "Some flag"); - auto sub2 = app.add_subcommand("two", "Description Two"); - sub2->add_flag("--twoflag", "Some other flag"); - - CLI11_PARSE(app, argc, argv); - - std::cout << "This app was meant to show off the formatter, run with -h" << std::endl; - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/groups.cpp b/libs/CommService/libs/CLI11/examples/groups.cpp deleted file mode 100644 index e366dfe..0000000 --- a/libs/CommService/libs/CLI11/examples/groups.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include -#include - -int main(int argc, char **argv) { - CLI::AutoTimer("This is a timer"); - - CLI::App app("K3Pi goofit fitter"); - - std::string file; - CLI::Option *opt = app.add_option("-f,--file,file", file, "File name")->required()->group("Important"); - - int count{0}; - CLI::Option *copt = app.add_flag("-c,--count", count, "Counter")->required()->group("Important"); - - double value{0.0}; // = 3.14; - app.add_option("-d,--double", value, "Some Value")->group("Other"); - - try { - app.parse(argc, argv); - } catch(const CLI::ParseError &e) { - return app.exit(e); - } - - std::cout << "Working on file: " << file << ", direct count: " << app.count("--file") - << ", opt count: " << opt->count() << std::endl; - std::cout << "Working on count: " << count << ", direct count: " << app.count("--count") - << ", opt count: " << copt->count() << std::endl; - std::cout << "Some value: " << value << std::endl; - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/inter_argument_order.cpp b/libs/CommService/libs/CLI11/examples/inter_argument_order.cpp deleted file mode 100644 index f90e755..0000000 --- a/libs/CommService/libs/CLI11/examples/inter_argument_order.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include -#include -#include - -int main(int argc, char **argv) { - CLI::App app{"An app to practice mixing unlimited arguments, but still recover the original order."}; - - std::vector foos; - auto foo = app.add_option("--foo,-f", foos, "Some unlimited argument"); - - std::vector bars; - auto bar = app.add_option("--bar", bars, "Some unlimited argument"); - - app.add_flag("--z,--x", "Random other flags"); - - // Standard parsing lines (copy and paste in, or use CLI11_PARSE) - try { - app.parse(argc, argv); - } catch(const CLI::ParseError &e) { - return app.exit(e); - } - - // I prefer using the back and popping - std::reverse(std::begin(foos), std::end(foos)); - std::reverse(std::begin(bars), std::end(bars)); - - std::vector> keyval; - for(auto option : app.parse_order()) { - if(option == foo) { - keyval.emplace_back("foo", foos.back()); - foos.pop_back(); - } - if(option == bar) { - keyval.emplace_back("bar", bars.back()); - bars.pop_back(); - } - } - - // Prove the vector is correct - for(auto &pair : keyval) { - std::cout << pair.first << " : " << pair.second << std::endl; - } -} diff --git a/libs/CommService/libs/CLI11/examples/modhelp.cpp b/libs/CommService/libs/CLI11/examples/modhelp.cpp deleted file mode 100644 index ed66026..0000000 --- a/libs/CommService/libs/CLI11/examples/modhelp.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include - -int main(int argc, char **argv) { - CLI::App test{R"raw(Modify the help print so that argument values are accessible. -Note that this will not shortcut `->required` and other similar options.)raw"}; - - // Remove help flag because it shortcuts all processing - test.set_help_flag(); - - // Add custom flag that activates help - auto help = test.add_flag("-h,--help", "Request help"); - - std::string some_option; - test.add_option("-a", some_option, "Some description"); - - try { - test.parse(argc, argv); - if(*help) - throw CLI::CallForHelp(); - } catch(const CLI::Error &e) { - std::cout << "Option -a string in help: " << some_option << std::endl; - return test.exit(e); - } - - std::cout << "Option -a string: " << some_option << std::endl; - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/option_groups.cpp b/libs/CommService/libs/CLI11/examples/option_groups.cpp deleted file mode 100644 index 47723fb..0000000 --- a/libs/CommService/libs/CLI11/examples/option_groups.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include - -int main(int argc, char **argv) { - - CLI::App app("data output specification"); - app.set_help_all_flag("--help-all", "Expand all help"); - - auto format = app.add_option_group("output_format", "formatting type for output"); - auto target = app.add_option_group("output target", "target location for the output"); - bool csv{false}; - bool human{false}; - bool binary{false}; - format->add_flag("--csv", csv, "specify the output in csv format"); - format->add_flag("--human", human, "specify the output in human readable text format"); - format->add_flag("--binary", binary, "specify the output in binary format"); - // require one of the options to be selected - format->require_option(1); - std::string fileLoc; - std::string networkAddress; - target->add_option("-o,--file", fileLoc, "specify the file location of the output"); - target->add_option("--address", networkAddress, "specify a network address to send the file"); - - // require at most one of the target options - target->require_option(0, 1); - CLI11_PARSE(app, argc, argv); - - std::string format_type = (csv) ? std::string("CSV") : ((human) ? "human readable" : "binary"); - std::cout << "Selected " << format_type << " format" << std::endl; - if(!fileLoc.empty()) { - std::cout << " sent to file " << fileLoc << std::endl; - } else if(!networkAddress.empty()) { - std::cout << " sent over network to " << networkAddress << std::endl; - } else { - std::cout << " sent to std::cout" << std::endl; - } - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/positional_arity.cpp b/libs/CommService/libs/CLI11/examples/positional_arity.cpp deleted file mode 100644 index 16259c1..0000000 --- a/libs/CommService/libs/CLI11/examples/positional_arity.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include - -int main(int argc, char **argv) { - - CLI::App app("test for positional arity"); - - auto numbers = app.add_option_group("numbers", "specify key numbers"); - auto files = app.add_option_group("files", "specify files"); - int num1{-1}, num2{-1}; - numbers->add_option("num1", num1, "first number"); - numbers->add_option("num2", num2, "second number"); - std::string file1, file2; - files->add_option("file1", file1, "first file")->required(); - files->add_option("file2", file2, "second file"); - // set a pre parse callback that turns the numbers group on or off depending on the number of arguments - app.preparse_callback([numbers](std::size_t arity) { - if(arity <= 2) { - numbers->disabled(); - } else { - numbers->disabled(false); - } - }); - - CLI11_PARSE(app, argc, argv); - - if(num1 != -1) - std::cout << "Num1 = " << num1 << '\n'; - - if(num2 != -1) - std::cout << "Num2 = " << num2 << '\n'; - - std::cout << "File 1 = " << file1 << '\n'; - if(!file2.empty()) { - std::cout << "File 2 = " << file2 << '\n'; - } - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/prefix_command.cpp b/libs/CommService/libs/CLI11/examples/prefix_command.cpp deleted file mode 100644 index 0e2f041..0000000 --- a/libs/CommService/libs/CLI11/examples/prefix_command.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include -#include - -int main(int argc, char **argv) { - - CLI::App app("Prefix command app"); - app.prefix_command(); - - std::vector vals; - app.add_option("--vals,-v", vals)->expected(-1); - - CLI11_PARSE(app, argc, argv); - - std::vector more_comms = app.remaining(); - - std::cout << "Prefix"; - for(int v : vals) - std::cout << ": " << v << " "; - - std::cout << std::endl << "Remaining commands: "; - - for(auto com : more_comms) - std::cout << com << " "; - std::cout << std::endl; - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/ranges.cpp b/libs/CommService/libs/CLI11/examples/ranges.cpp deleted file mode 100644 index 4860b15..0000000 --- a/libs/CommService/libs/CLI11/examples/ranges.cpp +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include - -int main(int argc, char **argv) { - - CLI::App app{"App to demonstrate exclusionary option groups."}; - - std::vector range; - app.add_option("--range,-R", range, "A range")->expected(-2); - - auto ogroup = app.add_option_group("min_max_step", "set the min max and step"); - int min{0}, max{0}, step{1}; - ogroup->add_option("--min,-m", min, "The minimum")->required(); - ogroup->add_option("--max,-M", max, "The maximum")->required(); - ogroup->add_option("--step,-s", step, "The step")->capture_default_str(); - - app.require_option(1); - - CLI11_PARSE(app, argc, argv); - - if(!range.empty()) { - if(range.size() == 2) { - min = range[0]; - max = range[1]; - } - if(range.size() >= 3) { - step = range[0]; - min = range[1]; - max = range[2]; - } - } - std::cout << "range is [" << min << ':' << step << ':' << max << "]\n"; - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/retired.cpp b/libs/CommService/libs/CLI11/examples/retired.cpp deleted file mode 100644 index 920f19f..0000000 --- a/libs/CommService/libs/CLI11/examples/retired.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include -#include - -// This example shows the usage of the retired and deprecated option helper methods -int main(int argc, char **argv) { - - CLI::App app("example for retired/deprecated options"); - std::vector x; - auto opt1 = app.add_option("--retired_option2", x); - - std::pair y; - auto opt2 = app.add_option("--deprecate", y); - - app.add_option("--not_deprecated", x); - - // specify that a non-existing option is retired - CLI::retire_option(app, "--retired_option"); - - // specify that an existing option is retired and non-functional: this will replace the option with another that - // behaves the same but does nothing - CLI::retire_option(app, opt1); - - // deprecate an existing option and specify the recommended replacement - CLI::deprecate_option(opt2, "--not_deprecated"); - - CLI11_PARSE(app, argc, argv); - - if(!x.empty()) { - std::cout << "Retired option example: got --not_deprecated values:"; - for(auto &xval : x) { - std::cout << xval << " "; - } - std::cout << '\n'; - } else if(app.count_all() == 1) { - std::cout << "Retired option example: no arguments received\n"; - } - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/shapes.cpp b/libs/CommService/libs/CLI11/examples/shapes.cpp deleted file mode 100644 index 16a7c17..0000000 --- a/libs/CommService/libs/CLI11/examples/shapes.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include - -int main(int argc, char **argv) { - - CLI::App app("load shapes"); - - app.set_help_all_flag("--help-all"); - auto circle = app.add_subcommand("circle", "draw a circle")->immediate_callback(); - double radius{0.0}; - int circle_counter{0}; - circle->callback([&radius, &circle_counter] { - ++circle_counter; - std::cout << "circle" << circle_counter << " with radius " << radius << std::endl; - }); - - circle->add_option("radius", radius, "the radius of the circle")->required(); - - auto rect = app.add_subcommand("rectangle", "draw a rectangle")->immediate_callback(); - double edge1{0.0}; - double edge2{0.0}; - int rect_counter{0}; - rect->callback([&edge1, &edge2, &rect_counter] { - ++rect_counter; - if(edge2 == 0) { - edge2 = edge1; - } - std::cout << "rectangle" << rect_counter << " with edges [" << edge1 << ',' << edge2 << "]" << std::endl; - edge2 = 0; - }); - - rect->add_option("edge1", edge1, "the first edge length of the rectangle")->required(); - rect->add_option("edge2", edge2, "the second edge length of the rectangle"); - - auto tri = app.add_subcommand("triangle", "draw a rectangle")->immediate_callback(); - std::vector sides; - int tri_counter = 0; - tri->callback([&sides, &tri_counter] { - ++tri_counter; - - std::cout << "triangle" << tri_counter << " with sides [" << CLI::detail::join(sides) << "]" << std::endl; - }); - - tri->add_option("sides", sides, "the side lengths of the triangle"); - - CLI11_PARSE(app, argc, argv); - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_a.cpp b/libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_a.cpp deleted file mode 100644 index 02e8841..0000000 --- a/libs/CommService/libs/CLI11/examples/subcom_in_files/subcommand_a.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include "subcommand_a.hpp" -#include -#include - -/// Set up a subcommand and capture a shared_ptr to a struct that holds all its options. -/// The variables of the struct are bound to the CLI options. -/// We use a shared ptr so that the addresses of the variables remain for binding, -/// You could return the shared pointer if you wanted to access the values in main. -void setup_subcommand_a(CLI::App &app) { - // Create the option and subcommand objects. - auto opt = std::make_shared(); - auto sub = app.add_subcommand("subcommand_a", "performs subcommand a"); - - // Add options to sub, binding them to opt. - sub->add_option("-f,--file", opt->file, "File name")->required(); - sub->add_flag("--with-foo", opt->with_foo, "Counter"); - - // Set the run function as callback to be called when this subcommand is issued. - sub->callback([opt]() { run_subcommand_a(*opt); }); -} - -/// The function that runs our code. -/// This could also simply be in the callback lambda itself, -/// but having a separate function is cleaner. -void run_subcommand_a(SubcommandAOptions const &opt) { - // Do stuff... - std::cout << "Working on file: " << opt.file << std::endl; - if(opt.with_foo) { - std::cout << "Using foo!" << std::endl; - } -} diff --git a/libs/CommService/libs/CLI11/examples/subcom_partitioned.cpp b/libs/CommService/libs/CLI11/examples/subcom_partitioned.cpp deleted file mode 100644 index 109349d..0000000 --- a/libs/CommService/libs/CLI11/examples/subcom_partitioned.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include -#include -#include - -int main(int argc, char **argv) { - CLI::AutoTimer("This is a timer"); - - CLI::App app("K3Pi goofit fitter"); - - CLI::App_p impOpt = std::make_shared("Important"); - std::string file; - CLI::Option *opt = impOpt->add_option("-f,--file,file", file, "File name")->required(); - - int count{0}; - CLI::Option *copt = impOpt->add_flag("-c,--count", count, "Counter")->required(); - - CLI::App_p otherOpt = std::make_shared("Other"); - double value{0.0}; // = 3.14; - otherOpt->add_option("-d,--double", value, "Some Value"); - - // add the subapps to the main one - app.add_subcommand(impOpt); - app.add_subcommand(otherOpt); - - try { - app.parse(argc, argv); - } catch(const CLI::ParseError &e) { - return app.exit(e); - } - - std::cout << "Working on file: " << file << ", direct count: " << impOpt->count("--file") - << ", opt count: " << opt->count() << std::endl; - std::cout << "Working on count: " << count << ", direct count: " << impOpt->count("--count") - << ", opt count: " << copt->count() << std::endl; - std::cout << "Some value: " << value << std::endl; - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/subcommands.cpp b/libs/CommService/libs/CLI11/examples/subcommands.cpp deleted file mode 100644 index 5eabdc6..0000000 --- a/libs/CommService/libs/CLI11/examples/subcommands.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#include -#include -#include - -int main(int argc, char **argv) { - - CLI::App app("K3Pi goofit fitter"); - app.set_help_all_flag("--help-all", "Expand all help"); - app.add_flag("--random", "Some random flag"); - CLI::App *start = app.add_subcommand("start", "A great subcommand"); - CLI::App *stop = app.add_subcommand("stop", "Do you really want to stop?"); - app.require_subcommand(); // 1 or more - - std::string file; - start->add_option("-f,--file", file, "File name"); - - CLI::Option *s = stop->add_flag("-c,--count", "Counter"); - - CLI11_PARSE(app, argc, argv); - - std::cout << "Working on --file from start: " << file << std::endl; - std::cout << "Working on --count from stop: " << s->count() << ", direct count: " << stop->count("--count") - << std::endl; - std::cout << "Count of --random flag: " << app.count("--random") << std::endl; - for(auto subcom : app.get_subcommands()) - std::cout << "Subcommand: " << subcom->get_name() << std::endl; - - return 0; -} diff --git a/libs/CommService/libs/CLI11/examples/testEXE.cpp b/libs/CommService/libs/CLI11/examples/testEXE.cpp deleted file mode 100644 index b69e154..0000000 --- a/libs/CommService/libs/CLI11/examples/testEXE.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -// Code modified from https://github.com/CLIUtils/CLI11/issues/559 - -#include -#include -#include - -int main(int argc, const char *argv[]) { - - int logLevel{0}; - CLI::App app{"Test App"}; - - app.add_option("-v", logLevel, "level"); - - auto subcom = app.add_subcommand("sub", "")->fallthrough(); - subcom->preparse_callback([&app](size_t) { app.get_subcommand("sub")->add_option_group("group"); }); - - CLI11_PARSE(app, argc, argv); - - std::cout << "level: " << logLevel << std::endl; -} diff --git a/libs/CommService/libs/CLI11/include/CLI/App.hpp b/libs/CommService/libs/CLI11/include/CLI/App.hpp deleted file mode 100644 index 1ae2020..0000000 --- a/libs/CommService/libs/CLI11/include/CLI/App.hpp +++ /dev/null @@ -1,3246 +0,0 @@ -// Copyright (c) 2017-2022, University of Cincinnati, developed by Henry Schreiner -// under NSF AWARD 1414736 and by the respective contributors. -// All rights reserved. -// -// SPDX-License-Identifier: BSD-3-Clause - -#pragma once - -// [CLI11:public_includes:set] -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// [CLI11:public_includes:end] - -// CLI Library includes -#include "ConfigFwd.hpp" -#include "Error.hpp" -#include "FormatterFwd.hpp" -#include "Macros.hpp" -#include "Option.hpp" -#include "Split.hpp" -#include "StringTools.hpp" -#include "TypeTools.hpp" - -namespace CLI { -// [CLI11:app_hpp:verbatim] - -#ifndef CLI11_PARSE -#define CLI11_PARSE(app, argc, argv) \ - try { \ - (app).parse((argc), (argv)); \ - } catch(const CLI::ParseError &e) { \ - return (app).exit(e); \ - } -#endif - -namespace detail { -enum class Classifier { NONE, POSITIONAL_MARK, SHORT, LONG, WINDOWS_STYLE, SUBCOMMAND, SUBCOMMAND_TERMINATOR }; -struct AppFriend; -} // namespace detail - -namespace FailureMessage { -std::string simple(const App *app, const Error &e); -std::string help(const App *app, const Error &e); -} // namespace FailureMessage - -/// enumeration of modes of how to deal with extras in config files - -enum class config_extras_mode : char { error = 0, ignore, ignore_all, capture }; - -class App; - -using App_p = std::shared_ptr; - -namespace detail { -/// helper functions for adding in appropriate flag modifiers for add_flag - -template ::value || (sizeof(T) <= 1U), detail::enabler> = detail::dummy> -Option *default_flag_modifiers(Option *opt) { - return opt->always_capture_default(); -} - -/// summing modifiers -template ::value && (sizeof(T) > 1U), detail::enabler> = detail::dummy> -Option *default_flag_modifiers(Option *opt) { - return opt->multi_option_policy(MultiOptionPolicy::Sum)->default_str("0")->force_callback(); -} - -} // namespace detail - -class Option_group; -/// Creates a command line program, with very few defaults. -/** To use, create a new `Program()` instance with `argc`, `argv`, and a help description. The templated - * add_option methods make it easy to prepare options. Remember to call `.start` before starting your - * program, so that the options can be evaluated and the help option doesn't accidentally run your program. */ -class App { - friend Option; - friend detail::AppFriend; - - protected: - // This library follows the Google style guide for member names ending in underscores - - /// @name Basics - ///@{ - - /// Subcommand name or program name (from parser if name is empty) - std::string name_{}; - - /// Description of the current program/subcommand - std::string description_{}; - - /// If true, allow extra arguments (ie, don't throw an error). INHERITABLE - bool allow_extras_{false}; - - /// If ignore, allow extra arguments in the ini file (ie, don't throw an error). INHERITABLE - /// if error error on an extra argument, and if capture feed it to the app - config_extras_mode allow_config_extras_{config_extras_mode::ignore}; - - /// If true, return immediately on an unrecognized option (implies allow_extras) INHERITABLE - bool prefix_command_{false}; - - /// If set to true the name was automatically generated from the command line vs a user set name - bool has_automatic_name_{false}; - - /// If set to true the subcommand is required to be processed and used, ignored for main app - bool required_{false}; - - /// If set to true the subcommand is disabled and cannot be used, ignored for main app - bool disabled_{false}; - - /// Flag indicating that the pre_parse_callback has been triggered - bool pre_parse_called_{false}; - - /// Flag indicating that the callback for the subcommand should be executed immediately on parse completion which is - /// before help or ini files are processed. INHERITABLE - bool immediate_callback_{false}; - - /// This is a function that runs prior to the start of parsing - std::function pre_parse_callback_{}; - - /// This is a function that runs when parsing has finished. - std::function parse_complete_callback_{}; - - /// This is a function that runs when all processing has completed - std::function final_callback_{}; - - ///@} - /// @name Options - ///@{ - - /// The default values for options, customizable and changeable INHERITABLE - OptionDefaults option_defaults_{}; - - /// The list of options, stored locally - std::vector options_{}; - - ///@} - /// @name Help - ///@{ - - /// Footer to put after all options in the help output INHERITABLE - std::string footer_{}; - - /// This is a function that generates a footer to put after all other options in help output - std::function footer_callback_{}; - - /// A pointer to the help flag if there is one INHERITABLE - Option *help_ptr_{nullptr}; - - /// A pointer to the help all flag if there is one INHERITABLE - Option *help_all_ptr_{nullptr}; - - /// A pointer to a version flag if there is one - Option *version_ptr_{nullptr}; - - /// This is the formatter for help printing. Default provided. INHERITABLE (same pointer) - std::shared_ptr formatter_{new Formatter()}; - - /// The error message printing function INHERITABLE - std::function failure_message_{FailureMessage::simple}; - - ///@} - /// @name Parsing - ///@{ - - using missing_t = std::vector>; - - /// Pair of classifier, string for missing options. (extra detail is removed on returning from parse) - /// - /// This is faster and cleaner than storing just a list of strings and reparsing. This may contain the -- separator. - missing_t missing_{}; - - /// This is a list of pointers to options with the original parse order - std::vector