From 9282349144eaf8198c799574acc3b077dcc65e1d Mon Sep 17 00:00:00 2001
From: Zach Laine <whatwasthataddress@gmail.com>
Date: Sun, 24 Mar 2024 22:49:57 -0500
Subject: [PATCH] Revert "Add/update b2 build for docs and tests."

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

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 77bc2e7b..aabb023d 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -6,21 +6,20 @@ 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.
@@ -35,23 +34,15 @@ rule run_doxygen ( files * : name : expand ? )
         <doxygen:param>SEARCH_INCLUDES=NO
         <doxygen:param>EXAMPLE_PATH=.
         <reftitle>$(name)
-      ;
+  ;
 
 }
 
-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 ;
+run_doxygen [ glob ../include/boost/parser/*.hpp : ../include/boost/parser/concepts.hpp ] : "Reference" ;
 
 xml parser
     :
         parser.qbk
-    :
-        <dependency>parser_reference
     ;
 
 boostbook standalone
@@ -61,6 +52,8 @@ boostbook standalone
         <dependency>css
         <dependency>images
 
+        <dependency>parser_reference
+
         # HTML options first:
         # Use graphics not text for navigation:
         <xsl:param>navig.graphics=1
@@ -98,25 +91,18 @@ 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
-
-        <dependency>images_standalone
+        <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
     ;
 
 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
new file mode 100644
index 00000000..055b03e5
--- /dev/null
+++ b/doc/Jamroot.jam
@@ -0,0 +1,45 @@
+#
+#   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
deleted file mode 100644
index c91d5304..00000000
--- a/test/Jamfile.v2
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 ;