Give Catch3 its own build names and headers

Catch2 compatibility means the API tests are written in: the macros, such
as TEST_CASE and REQUIRE, and the Catch:: namespace. It does not mean
Catch2's build names or header paths. find_package(Catch2) found Catch3,
and a project using both frameworks met two packages, two sets of targets,
two Catch.cmake modules and two catch2/ header trees with the same names.

Build names:
- CMake: project and package Catch3, targets Catch3::Catch3 and
  Catch3::Catch3WithMain, libraries Catch3 and Catch3Main, options
  CATCH3_*, lib/cmake/Catch3 with Catch3Config, and pkg-config catch3 and
  catch3-with-main. The version is Catch3's, 0.3.0, compatible within a
  minor version.
- The CMake scripts are Catch3.cmake (catch3_discover_tests),
  Catch3AddTests.cmake and Catch3ShardTests.cmake
  (catch3_add_sharded_tests); the helpers they define at ctest time have a
  catch3_ prefix. ParseAndAddCatchTests.cmake, deprecated upstream, is gone.
- Bazel //:catch3 and //:catch3_main, Meson catch3 and catch3-with-main
  (with override_dependency), Xmake catch3 and catch3_main, Premake Catch3
  and Catch3WithMain. Visual Studio projects get GUIDs of their own.
- The Progmasoft::Catch3 target and package are gone: property testing
  and snapshots are part of Catch3::Catch3. Their sources now build with
  the library's warning flags, so property failures are built field by
  field (no missing initializers) and the default property name is a
  thread-local pointer to the name its scope owns (no global destructor).

Headers: the engine moved from src/catch2 to src/Progmasoft/Catch3 with
Progmasoft names, so <catch2/catch_test_macros.hpp> is
<Progmasoft/Catch3/TestMacros.hpp>, <catch2/matchers/catch_matchers_string.hpp>
is <Progmasoft/Catch3/Matchers/String.hpp>, and interface headers are named
after their interface, such as Interfaces/IConfig.hpp. Include guards
became #pragma once. The installed headers go to include/Progmasoft.
src/Progmasoft/Context.cpp is StrategyContext.cpp, so no two sources share
a file name.

tools/scripts/upstreamFiles.txt lists the files that come from Catch2.
The license check expects BSL-1.0 on them and Progmasoft's header on the
rest of src/Progmasoft; the convenience-header check, the amalgamation
script and the surrogate tests take the engine's headers from it. The
amalgamated files are regenerated. The header-guard workflow checks for
#pragma once instead of checkguard.

Documents, the README and the release notes describe the new names.

1 files changed, 22 insertions, 31 deletions

diff --git a/xmake.lua b/xmake.lua
index aec3b1d4..34f57342 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -2,7 +2,7 @@
 -- SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-1.1
 
 set_project("Catch3")
-set_version("3.16.1")
+set_version("0.3.0")
 set_languages("cxx14")
 set_warnings("all")
 
@@ -10,50 +10,41 @@ local repository_root = os.projectdir()
 local generated_include = path.join(repository_root, ".xmake", "generated")
 add_moduledirs(path.join(repository_root, "buildsupport"))
 
--- Catch2's engine with the Catch3 runner, which replaced Catch2's session,
--- command line and reporters. The library is C++20; Catch2's headers still
--- need only C++14 in the code that includes them.
-target("catch2")
+-- The Catch2-compatible engine, the Catch3 runner, which replaced Catch2's
+-- session, command line and reporters, property testing and snapshots. The
+-- library is C++20; the engine's headers still need only C++14 in the code
+-- that includes them.
+target("catch3")
     set_kind("static")
     set_languages("cxx20")
     on_load(function(target)
         -- File I/O is restricted to Xmake's script domain, so generate here
         -- rather than while the declarative project file is being evaluated.
-        local configure_catch2 = import("catch2_config")
-        configure_catch2.main(generated_include, repository_root)
+        local configure_catch3 = import("catch3_config")
+        configure_catch3.main(generated_include, repository_root)
         target:add("includedirs", generated_include, {public = true})
     end)
-    add_files("src/catch2/**.cpp")
-    remove_files("src/catch2/internal/catch_main.cpp")
+    add_files("src/Progmasoft/Catch3/**.cpp")
+    remove_files("src/Progmasoft/Catch3/Internal/Main.cpp")
     add_files(
         "src/Progmasoft/Runner/*.cpp",
         "src/Progmasoft/Results.cpp",
-        "src/Progmasoft/XmlWriter.cpp"
+        "src/Progmasoft/XmlWriter.cpp",
+        "src/Progmasoft/ChoiceShrinker.cpp",
+        "src/Progmasoft/StrategyContext.cpp",
+        "src/Progmasoft/PropertyEngine.cpp",
+        "src/Progmasoft/Snapshot.cpp"
     )
     add_includedirs("src", {public = true})
-    add_headerfiles("src/catch2/**.hpp", {prefixdir = ""})
+    add_headerfiles("src/(Progmasoft/**.hpp)")
 
-target("catch2_main")
+target("catch3_main")
     set_kind("static")
     set_languages("cxx14")
-    add_files("src/catch2/internal/catch_main.cpp")
-    add_deps("catch2")
+    add_files("src/Progmasoft/Catch3/Internal/Main.cpp")
+    add_deps("catch3")
     add_includedirs("src", generated_include, {public = true})
 
--- Compile Progmasoft's implementation separately from the compatibility engine.
-target("ProgmasoftCatch3")
-    set_kind("static")
-    set_languages("cxx20")
-    add_headerfiles("src/Progmasoft/**.hpp", {prefixdir = ""})
-    add_files(
-        "src/Progmasoft/ChoiceShrinker.cpp",
-        "src/Progmasoft/Context.cpp",
-        "src/Progmasoft/PropertyEngine.cpp",
-        "src/Progmasoft/Snapshot.cpp"
-    )
-    add_includedirs("src", {public = true})
-    add_deps("catch2", {public = true})
-
 target("ProgmasoftPropertyTests")
     set_kind("binary")
     set_languages("cxx20")
@@ -71,10 +62,10 @@ target("ProgmasoftPropertyTests")
         "tests/Progmasoft/Snapshot.tests.cpp",
         "tests/Progmasoft/Stateful.tests.cpp",
         "tests/Progmasoft/Strategy.tests.cpp",
-        "src/catch2/internal/catch_main.cpp"
+        "src/Progmasoft/Catch3/Internal/Main.cpp"
     )
     add_includedirs("src", generated_include)
     -- MSVC's linker does not discover an otherwise unreferenced main() in a
     -- static archive. Compile the compatibility entry point into this test
-    -- executable while retaining catch2_main for downstream consumers.
-    add_deps("ProgmasoftCatch3")
+    -- executable while retaining catch3_main for downstream consumers.
+    add_deps("catch3")