adopt antora and mrdocs

Author: jll63

CMakeLists.txt

@@ -3,7 +3,7 @@
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required(VERSION 3.5...3.20)
+cmake_minimum_required(VERSION 3.8...3.20)
 
 project(boost_openmethod VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
@@ -12,9 +12,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     set(BOOST_OPENMETHOD_IS_ROOT ON)
 endif()
 
-if(BOOST_OPENMETHOD_IS_ROOT)
-    include(CTest)
-endif()
 if(NOT BOOST_SUPERPROJECT_VERSION)
     option(BOOST_OPENMETHOD_INSTALL "Install boost::openmethod files" ON)
     option(BOOST_OPENMETHOD_BUILD_TESTS "Build boost::openmethod tests" ${BUILD_TESTING})
@@ -23,14 +20,26 @@ else()
     set(BOOST_OPENMETHOD_BUILD_TESTS ${BUILD_TESTING})
 endif()
 
+option(BOOST_OPENMETHOD_MRDOCS_BUILD "Build the target for MrDocs: see mrdocs.yml" OFF)
+
 if(BOOST_OPENMETHOD_IS_ROOT)
     #
     # Building inside Boost tree, but as a separate project e.g. on Travis or
     # other CI, or when producing Visual Studio Solution and Projects.
 
-    set(BOOST_INCLUDE_LIBRARIES openmethod)
+    include(CTest)
+
+    set(
+        BOOST_INCLUDE_LIBRARIES dynamic_bitset
+        mp11
+        preprocessor
+        assert
+        config
+        core)
     set(BOOST_EXCLUDE_LIBRARIES openmethod)
-    list(APPEND BOOST_INCLUDE_LIBRARIES test)
+    if (NOT BOOST_OPENMETHOD_MRDOCS_BUILD)
+        list(APPEND BOOST_INCLUDE_LIBRARIES test)
+    endif()
     if(BOOST_OPENMETHOD_BUILD_EXAMPLES)
         # list(APPEND BOOST_INCLUDE_LIBRARIES optional)
     endif()
@@ -58,11 +67,13 @@ target_link_libraries(
     Boost::preprocessor
 )
 
-if(BOOST_OPENMETHOD_BUILD_TESTS)
-  enable_testing()
-  add_subdirectory(test)
-endif()
+if (NOT BOOST_OPENMETHOD_MRDOCS_BUILD)
+    if(BOOST_OPENMETHOD_BUILD_TESTS)
+        enable_testing()
+        add_subdirectory(test)
+    endif()
 
-if(BOOST_OPENMETHOD_BUILD_EXAMPLES)
-  add_subdirectory(example)
+    if(BOOST_OPENMETHOD_BUILD_EXAMPLES)
+        add_subdirectory(example)
+    endif()
 endif()

doc/antora.yml

@@ -24,12 +24,6 @@ ext:
     files:
       - file: ./doc/tagfiles/boost-openmethod-doxygen.tag.xml
         base_url: 'xref:reference:'
-      - file: ./doc/tagfiles/boost-system-doxygen.tag.xml
-        base_url: https://www.boost.org/doc/libs/master/libs/system/doc/html/
-      - file: ./doc/tagfiles/boost-core-doxygen.tag.xml
-        base_url: https://www.boost.org/doc/libs/master/libs/core/doc/html/
-      - file: ./doc/tagfiles/boost-filesystem-doxygen.tag.xml
-        base_url: https://www.boost.org/doc/libs/master/libs/filesystem/doc/
     using-namespaces:
       - boost::openmethod
       - boost::openmethod::policies

doc/mrdocs.yml

@@ -6,56 +6,55 @@ input:
 # Patterns to filter out the source-files in the directories
 file-patterns:
   - '*.hpp'
-exclude:
-  - '../include/boost/url/impl'
-  - '../include/boost/url/grammar/impl'
-  - '../include/boost/url/rfc/impl'
+# exclude:
+#   - '../boost/libs/test'
+#   - '../include/boost/test/impl'
 
 # Filters
 include-symbols:
-  - 'boost::urls::**'
-see-below:
-  - 'boost::urls::format_arg'
-  - 'boost::urls::named_arg'
-  - 'boost::urls::see_below'
-  - 'boost::urls::*_t'
-  - 'boost::urls::grammar::see_below'
-  - 'boost::urls::string_token::see_below'
-  - 'boost::urls::decode_view::iterator'
-  - 'boost::urls::params_base::iterator'
-  - 'boost::urls::params_encoded_base::iterator'
-  - 'boost::urls::segments_base::iterator'
-  - 'boost::urls::segments_encoded_base::iterator'
-implementation-defined:
-  - 'boost::urls::detail'
-  - 'boost::urls::**::detail'
-  - 'boost::urls::*_unsafe'
-  - 'boost::urls::make_error_code'
-  - 'boost::urls::make_void'
-  - 'boost::urls::implementation_defined'
-  - 'boost::urls::grammar::implementation_defined'
-  - 'boost::urls::string_token::implementation_defined'
-  - 'boost::urls::grammar::*_t'
-  - 'boost::urls::grammar::make_error_*'
-  - 'boost::urls::grammar::operator_*'
-  - 'boost::urls::string_token::*_t'
-exclude-symbols:
-  - 'boost::urls::void_t'
+  - 'boost::openmethod::**'
+# see-below:
+#   - 'boost::urls::format_arg'
+#   - 'boost::urls::named_arg'
+#   - 'boost::urls::see_below'
+#   - 'boost::urls::*_t'
+#   - 'boost::urls::grammar::see_below'
+#   - 'boost::urls::string_token::see_below'
+#   - 'boost::urls::decode_view::iterator'
+#   - 'boost::urls::params_base::iterator'
+#   - 'boost::urls::params_encoded_base::iterator'
+#   - 'boost::urls::segments_base::iterator'
+#   - 'boost::urls::segments_encoded_base::iterator'
+# implementation-defined:
+#   - 'boost::urls::detail'
+#   - 'boost::urls::**::detail'
+#   - 'boost::urls::*_unsafe'
+#   - 'boost::urls::make_error_code'
+#   - 'boost::urls::make_void'
+#   - 'boost::urls::implementation_defined'
+#   - 'boost::urls::grammar::implementation_defined'
+#   - 'boost::urls::string_token::implementation_defined'
+#   - 'boost::urls::grammar::*_t'
+#   - 'boost::urls::grammar::make_error_*'
+#   - 'boost::urls::grammar::operator_*'
+#   - 'boost::urls::string_token::*_t'
+# exclude-symbols:
+#   - 'boost::urls::void_t'
 
 # Metadata Extraction
 private-bases: false
 
 # Generator
 generate: adoc
-base-url: https://www.github.com/boostorg/url/blob/develop/ # boost/url/url_view.hpp
+base-url: https://www.github.com/boostorg/openmethod/blob/develop/ # boost/url/url_view.hpp
 
 # Style
 verbose: true
 multipage: true
 
 # The target for MrDocs simply includes all symbols defined in all
 # headers with the appropriate compilation options.
-# Nothing else should be included in the MrDocs configuration or 
+# Nothing else should be included in the MrDocs configuration or
 # would be useful to MrDocs.
 #
 # This single source file not only includes all symbols (the source
@@ -75,4 +74,4 @@ multipage: true
 # The other options are set just to ensure other targets are
 # ignored even if these options are set as ON in the cache.
 #
-cmake: '-D BOOST_URL_MRDOCS_BUILD=ON -D CMAKE_CXX_STANDARD=20 -D BOOST_URL_BUILD_FUZZERS=OFF -D BOOST_URL_BUILD_EXAMPLES=OFF -D BOOST_URL_BUILD_TESTS=OFF -D BUILD_TESTING=OFF'
+cmake: '-D BOOST_OPENMETHOD_MRDOCS_BUILD=ON -D CMAKE_CXX_STANDARD=20 -D BOOST_OPENMETHOD_BUILD_EXAMPLES=OFF -D BOOST_OPENMETHOD_BUILD_TESTS=OFF -D BUILD_TESTING=OFF'

include/boost/openmethod/core.hpp

@@ -37,9 +37,13 @@ namespace boost::openmethod {
 template<class Registry, class Class>
 constexpr bool is_polymorphic = Registry::rtti::template is_polymorphic<Class>;
 
+/** A virtual_ptr.
+*/
+
+
 template<
     class Class, class Registry = BOOST_OPENMETHOD_DEFAULT_REGISTRY,
-    typename = void>
+    typename Void = void>
 class virtual_ptr;
 
 // =============================================================================