From d34cc345bb3a748ecc590b1aa7fdf8e7d75e6852 Mon Sep 17 00:00:00 2001
From: Zach Laine <whatwasthataddress@gmail.com>
Date: Sun, 24 Mar 2024 21:27:10 -0500
Subject: [PATCH] Add/update b2 build for docs and tests.

---
 doc/Jamfile.v2  | 46 ++++++++++++++++++++++++++++++----------------
 doc/Jamroot.jam | 45 ---------------------------------------------
 test/Jamfile.v2 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 61 deletions(-)
 delete mode 100644 doc/Jamroot.jam
 create mode 100644 test/Jamfile.v2

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index aabb023d..77bc2e7b 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -6,20 +6,21 @@ import path ;
 import doxygen ;
 import quickbook ;
 
-using auto-index ;
 using doxygen ;
 using quickbook ;
 using boostbook ;
 
+path-constant here : . ;
+
 rule run_doxygen ( files * : name : expand ? )
 {
 
     expand ?= <doxygen:param>EXPAND_ONLY_PREDEF=YES ;
 
-doxygen parser_reference
-  :
-    $(files)
-  :
+    doxygen parser_reference
+      :
+        $(files)
+      :
         <doxygen:param>EXTRACT_ALL=YES
         # note that there is no detail::unspecified -- this is a hack to get all
         # the SFINAE code out of the API docs.
@@ -34,15 +35,23 @@ doxygen parser_reference
         <doxygen:param>SEARCH_INCLUDES=NO
         <doxygen:param>EXAMPLE_PATH=.
         <reftitle>$(name)
-  ;
+      ;
 
 }
 
-run_doxygen [ glob ../include/boost/parser/*.hpp : ../include/boost/parser/concepts.hpp ] : "Reference" ;
+run_doxygen [ glob $(here)/../../../boost/parser/*.hpp : $(here)/../../../boost/parser/concepts.hpp ] : "Headers" ;
+
+install images_standalone : [ glob *.png ] : <location>html/parser/img ;
+explicit images_standalone ;
+
+install images_boostdoc : [ glob *.png ] : <location>../../../doc/html/parser/img ;
+explicit images_boostdoc ;
 
 xml parser
     :
         parser.qbk
+    :
+        <dependency>parser_reference
     ;
 
 boostbook standalone
@@ -52,8 +61,6 @@ boostbook standalone
         <dependency>css
         <dependency>images
 
-        <dependency>parser_reference
-
         # HTML options first:
         # Use graphics not text for navigation:
         <xsl:param>navig.graphics=1
@@ -91,18 +98,25 @@ boostbook standalone
         # better use SVG's instead:
         # <xsl:param>admon.graphics.extension=".svg"
 
-        <auto-index>on
-        <auto-index-verbose>on
-        <auto-index-internal>on
-        <auto-index-script>parser.idx
-        <quickbook-define>enable_index
-        <auto-index-prefix>..
-        <xsl:param>index.on.type=1
+        # <auto-index>on
+        # <auto-index-verbose>on
+        # <auto-index-internal>on
+        # <auto-index-script>parser.idx
+        # <quickbook-define>enable_index
+        # <auto-index-prefix>..
+        # <xsl:param>index.on.type=1
+
+        <dependency>images_standalone
     ;
 
 install css : [ glob $(BOOST_ROOT)/doc/src/*.css ]
     : <location>html ;
 install images : [ glob $(BOOST_ROOT)/doc/src/images/*.png ]
     : <location>html/images ;
+
+alias boostdoc : parser : : : <dependency>images_boostdoc ;
+explicit boostdoc ;
+alias boostrelease ;
+explicit boostrelease ;
 explicit css ;
 explicit images ;
diff --git a/doc/Jamroot.jam b/doc/Jamroot.jam
deleted file mode 100644
index 055b03e5..00000000
--- a/doc/Jamroot.jam
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#   Copyright (c) 2006 João Abecasis
-#
-#   Distributed under the Boost Software License, Version 1.0. (See
-#   accompanying file LICENSE_1_0.txt or copy at
-#   http://www.boost.org/LICENSE_1_0.txt)
-#
-
-##
-##  IMPORTANT NOTE: This file MUST NOT be copied over a boost installation
-##
-
-path-constant top : . ;
-
-import modules ;
-import path ;
-
-local boost-root = [ modules.peek : BOOST_ROOT ] ;
-
-if ! $(boost-root)
-{
-    local boost-search-dirs = [ modules.peek : BOOST_BUILD_PATH ] ;
-
-    for local dir in $(boost-search-dirs)
-    {
-        if [ path.glob $(dir)/../../../ : boost/version.hpp ]
-        {
-            boost-root += $(dir)/../../../ ;
-        }
-    }
-
-    if $(boost-root)
-    {
-        boost-root = [ path.make $(boost-root[1]) ] ;
-    }
-    else
-    {
-        ECHO "Warning: couldn't find BOOST_ROOT in" $(boost-root) ;
-    }
-}
-
-path-constant BOOST_ROOT : $(boost-root) ;
-modules.poke : QUICKBOOK_ROOT : $(top) ;
-
-use-project /boost : $(BOOST_ROOT) ;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
new file mode 100644
index 00000000..c91d5304
--- /dev/null
+++ b/test/Jamfile.v2
@@ -0,0 +1,48 @@
+# Copyright 2024 T. Zachary Laine
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import config : requires ;
+import testing ;
+
+# TODO project ;
+
+compile compile_all_t.cpp ;
+compile compile_attribute.cpp ;
+compile compile_combining_groups.cpp ;
+compile compile_or_attribute.cpp ;
+compile compile_seq_attribute.cpp ;
+compile compile_tests_main.cpp ;
+
+run aggr_tuple_assignment.cpp ;
+run case_fold_generated.cpp ;
+run class_type.cpp ;
+run github_issues.cpp ;
+run hl.cpp ;
+run merge_separate.cpp ;
+run no_case.cpp ;
+run parse_coords_new.cpp ;
+run parse_empty.cpp ;
+run parser_action.cpp ;
+run parser_action_with_params.cpp ;
+run parser_api.cpp ;
+run parser_attributes.cpp ;
+run parser.cpp ;
+run parser_if_switch.cpp ;
+run parser_lazy_params.cpp ;
+run parser_or_permutations_1.cpp ;
+run parser_or_permutations_2.cpp ;
+run parser_perm.cpp ;
+run parser_quoted_string.cpp ;
+run parser_rule.cpp ;
+run parser_rule_with_params.cpp ;
+run parser_seq_permutations_1.cpp ;
+run parser_seq_permutations_2.cpp ;
+run parser_symbol_table.cpp ;
+run replace.cpp ;
+run search.cpp ;
+run split.cpp ;
+run tracing.cpp ;
+run transform_replace.cpp ;
+run tuple_aggregate.cpp ;