Remove standalone

Author: grisumbras

.drone.star

@@ -29,31 +29,23 @@ def main(ctx):
   linux_cxx("gcc 7", "g++-7", packages="g++-7", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-7', 'B2_CXXSTD': '14,17', 'DRONE_JOB_UUID': 'bd307a3ec3'}, globalenv=globalenv),
   linux_cxx("gcc 8", "g++-8", packages="g++-8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-8', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': 'fa35e19212'}, globalenv=globalenv),
   linux_cxx("gcc 9", "g++-9", packages="g++-9", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-9', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': 'f1abd67035'}, globalenv=globalenv),
-  linux_cxx("gcc 9 standalone", "g++-9", packages="g++-9", buildtype="standalone", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'standalone', 'CXX': 'g++-9', 'DRONE_JOB_UUID': '1574bddb75'}, globalenv=globalenv),
   linux_cxx("gcc 10", "g++-10", packages="g++-10", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu2004:1", environment={'B2_TOOLSET': 'gcc-10', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': '0716d9708d'}, globalenv=globalenv),
-  linux_cxx("gcc 10 standalone", "g++-10", packages="g++-10", buildtype="standalone", buildscript="drone", image="cppalliance/droneubuntu2004:1", environment={'COMMENT': 'standalone', 'CXX': 'g++-10', 'DRONE_JOB_UUID': '9e6a55b6b4'}, globalenv=globalenv),
   linux_cxx("gcc 10 cmake-superproject", "g++-10", packages="g++-10", image=linuxglobalimage, buildtype="cmake-superproject", buildscript="drone", environment={"COMMENT": "cmake-superproject", "CXX": "g++-10"}, globalenv=globalenv),
   linux_cxx("gcc 11", "g++-11", packages="g++-11", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu2004:1", environment={'B2_TOOLSET': 'gcc-11', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': '0716d9708d'}, globalenv=globalenv),
-  linux_cxx("gcc 11 standalone", "g++-10", packages="g++-11", buildtype="standalone", buildscript="drone", image="cppalliance/droneubuntu2004:1", environment={'COMMENT': 'standalone', 'CXX': 'g++-11', 'DRONE_JOB_UUID': '9e6a55b6b4'}, globalenv=globalenv),
   linux_cxx("Clang 3.8", "clang++-3.8", packages="clang-3.8", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu1404:1", environment={'B2_TOOLSET': 'clang-3.8', 'B2_CXXSTD': '11', 'DRONE_JOB_UUID': 'b3f0c7f6bb'}, globalenv=globalenv),
   linux_cxx("Clang 4.0", "clang++-4.0", packages="clang-4.0 libstdc++-6-dev", llvm_os="xenial", llvm_ver="4.0", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu1604:1", environment={'B2_TOOLSET': 'clang-4.0', 'B2_CXXSTD': '11,14', 'DRONE_JOB_UUID': '91032ad7bb'}, globalenv=globalenv),
   linux_cxx("Clang 5.0", "clang++-5.0", packages="clang-5.0 libstdc++-7-dev", llvm_os="bionic", llvm_ver="5.0", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'clang-5.0', 'B2_CXXSTD': '11,14', 'DRONE_JOB_UUID': '472b07b9fc'}, globalenv=globalenv),
   linux_cxx("Clang 6.0", "clang++-6.0", packages="clang-6.0 libc6-dbg libstdc++-8-dev", llvm_os="bionic", llvm_ver="6.0", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'clang-6.0', 'B2_CXXSTD': '14,17', 'DRONE_JOB_UUID': '12c6fc06c9'}, globalenv=globalenv),
   linux_cxx("Clang 7", "clang++-7", packages="clang-7 libstdc++-8-dev", llvm_os="bionic", llvm_ver="7", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'clang-7', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': 'd435a6cdd7'}, globalenv=globalenv),
   linux_cxx("Clang 8", "clang++-8", packages="clang-8 libstdc++-8-dev", llvm_os="bionic", llvm_ver="8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'clang-8', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': '4d134bc072'}, globalenv=globalenv),
   linux_cxx("Clang 9", "clang++-9", packages="clang-9 libstdc++-9-dev", llvm_os="bionic", llvm_ver="9", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'clang-9', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': 'f6e1126ced'}, globalenv=globalenv),
-  linux_cxx("Clang 9 standalone", "clang++-9", packages="clang-9 libstdc++-9-dev", llvm_os="bionic", llvm_ver="9", buildtype="standalone", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'standalone', 'CXX': 'clang++-9', 'DRONE_JOB_UUID': '887309d048'}, globalenv=globalenv),
   linux_cxx("Clang 10", "clang++-10", packages="clang-10 libstdc++-9-dev", llvm_os="bionic", llvm_ver="10", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'clang-10', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': 'bc33ea4e26'}, globalenv=globalenv),
-  linux_cxx("Clang 10 standalone", "clang++-10", packages="clang-10 libstdc++-9-dev", llvm_os="bionic", llvm_ver="10", buildtype="standalone", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'standalone', 'CXX': 'clang++-10', 'DRONE_JOB_UUID': '0a57cb53ba'}, globalenv=globalenv),
   linux_cxx("Clang 11", "clang++-11", packages="clang-11 libstdc++-9-dev", llvm_os="bionic", llvm_ver="11", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'clang-11', 'B2_CXXSTD': '17,2a', 'DRONE_JOB_UUID': '7719a1c782'}, globalenv=globalenv),
-  linux_cxx("Clang 11 standalone", "clang++-11", packages="clang-11 libstdc++-9-dev", llvm_os="bionic", llvm_ver="11", buildtype="standalone", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'standalone', 'CXX': 'clang++-11', 'DRONE_JOB_UUID': '22d200f867'}, globalenv=globalenv),
   linux_cxx("Clang 12", "clang++-12", packages="clang-12 libstdc++-9-dev", llvm_os="focal", llvm_ver="12", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu2004:1", environment={'B2_TOOLSET': 'clang-12', 'B2_CXXSTD': '17,20', 'DRONE_JOB_UUID': '7719a1c783'}, globalenv=globalenv),
   linux_cxx("Coverity", "g++", packages="", buildtype="coverity", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'Coverity Scan', 'B2_TOOLSET': 'clang', 'DRONE_JOB_UUID': '632667547e'}, globalenv=globalenv),
   windows_cxx("msvc-14.0", "", image="cppalliance/dronevs2015", buildtype="boost", buildscript="drone", environment={"B2_TOOLSET": "msvc-14.0", "B2_CXXSTD": "11,14"}, globalenv=globalenv),
   windows_cxx("msvc-14.1", "", image="cppalliance/dronevs2017", buildtype="boost", buildscript="drone", environment={"B2_TOOLSET": "msvc-14.1", "B2_CXXSTD": "11,14,17"}, globalenv=globalenv),
-  windows_cxx("msvc-14.1 standalone", "msvc-14.1", image="cppalliance/dronevs2017", buildtype="standalone-windows", buildscript="drone", environment={"COMMENT": "standalone","CXX": "msvc-14.1"}, globalenv=globalenv),
   windows_cxx("msvc-14.2", "", image="cppalliance/dronevs2019", buildtype="boost", buildscript="drone", environment={"B2_TOOLSET": "msvc-14.2", "B2_CXXSTD": "17,latest"}, globalenv=globalenv),
-  windows_cxx("msvc-14.2 standalone", "msvc-14.2", image="cppalliance/dronevs2019", buildtype="standalone-windows", buildscript="drone", environment={"COMMENT": "standalone","CXX": "msvc-14.2"}, globalenv=globalenv),
   windows_cxx("msvc-14.3", "", image="cppalliance/dronevs2022:1", buildtype="boost", buildscript="drone", environment={"B2_TOOLSET": "msvc-14.3", "B2_CXXSTD": "17,20"}, globalenv=globalenv)
   ]
 

.drone/drone.bat

@@ -35,25 +35,4 @@ echo '==================================> COMPILE'
 set B2_TARGETS=libs/!SELF!/test libs/!SELF!/example
 call !BOOST_ROOT!\libs\!SELF!\ci\build.bat
 
-) else if "%DRONE_JOB_BUILDTYPE%" == "standalone-windows" (
-
-echo '==================================> INSTALL'
-
-REM Installing cmake with choco in the Dockerfile, so not required here:
-REM choco install cmake
-
-echo '==================================> COMPILE'
-
-set CXXFLAGS="/std:c++17"
-mkdir __build_17
-cd __build_17
-cmake -DBOOST_JSON_STANDALONE=1 ..
-cmake --build .
-ctest -V -C Debug .
-set CXXFLAGS="/std:c++latest"
-mkdir ..\__build_2a
-cd ..\__build_2a
-cmake -DBOOST_JSON_STANDALONE=1 ..
-cmake --build .
-ctest -V -C Debug .
 )

.drone/drone.sh

@@ -107,28 +107,6 @@ echo '==================================> SCRIPT'
 cd $BOOST_ROOT/libs/$SELF
 ci/travis/valgrind.sh
 
-elif [ "$DRONE_JOB_BUILDTYPE" == "standalone" ]; then
-
-echo '==================================> INSTALL'
-
-# Installing cmake with apt-get, so not required here:
-# pip install --user cmake
-
-echo '==================================> SCRIPT'
-
-export CXXFLAGS="-Wall -Wextra -std=c++17"
-mkdir __build_17
-cd __build_17
-cmake -DBOOST_JSON_STANDALONE=1 ..
-cmake --build .
-ctest -V .
-export CXXFLAGS="-Wall -Wextra -std=c++2a"
-mkdir ../__build_2a
-cd ../__build_2a
-cmake -DBOOST_JSON_STANDALONE=1 ..
-cmake --build .
-ctest -V .
-
 elif [ "$DRONE_JOB_BUILDTYPE" == "coverity" ]; then
 
 echo '==================================> INSTALL'

.github/workflows/ci.yml

@@ -114,28 +114,13 @@ jobs:
             toolset: "gcc"
             toolset_version: "9"
             b2_cxxstd: "17,2a"
-          - name: "COMMENT=standalone CXX=g++-9 Job 16"
-            buildtype: "standalone"
-            packages: "g++-9"
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
-            toolset: "gcc"
-            toolset_version: "9"
-            comment: "standalone"
           - name: "B2_TOOLSET=gcc-10 B2_CXXSTD=17,2a Job 17"
             buildtype: "boost"
             packages: "g++-10"
             os: "ubuntu-20.04"
             toolset: "gcc"
             toolset_version: "10"
             b2_cxxstd: "17,2a"
-          - name: "COMMENT=standalone CXX=g++-10 Job 18"
-            buildtype: "standalone"
-            packages: "g++-10"
-            os: "ubuntu-20.04"
-            toolset: "gcc"
-            toolset_version: "10"
-            comment: "standalone"
           - name: "B2_TOOLSET=clang-3.8 B2_CXXSTD=11 Job 19"
             buildtype: "boost"
             packages: "clang-3.8"
@@ -192,42 +177,20 @@ jobs:
             toolset: "clang"
             toolset_version: "9"
             b2_cxxstd: "17,2a"
-          - name: "COMMENT=standalone CXX=clang++-9 Job 26"
-            buildtype: "standalone"
-            packages: "clang-9 libstdc++-9-dev"
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
-            toolset: "clang"
-            toolset_version: "9"
-            comment: "standalone"
           - name: "B2_TOOLSET=clang-10 B2_CXXSTD=17,2a Job 27"
             buildtype: "boost"
             packages: "clang-10 libstdc++-9-dev"
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "10"
             b2_cxxstd: "17,2a"
-          - name: "COMMENT=standalone CXX=clang++-10 Job 28"
-            buildtype: "standalone"
-            packages: "clang-10 libstdc++-9-dev"
-            os: "ubuntu-18.04"
-            toolset: "clang"
-            toolset_version: "10"
-            comment: "standalone"
           - name: "B2_TOOLSET=clang-11 B2_CXXSTD=17,2a Job 29"
             buildtype: "boost"
             packages: "clang-11 libstdc++-9-dev"
             os: "ubuntu-18.04"
             toolset: "clang"
             toolset_version: "11"
             b2_cxxstd: "17,2a"
-          - name: "COMMENT=standalone CXX=clang++-11 Job 30"
-            buildtype: "standalone"
-            packages: "clang-11 libstdc++-9-dev"
-            os: "ubuntu-18.04"
-            toolset: "clang"
-            toolset_version: "11"
-            comment: "standalone"
           - name: "COMMENT=Coverity Scan B2_TOOLSET=clang Job 31"
             buildtype: "coverity"
             packages: "clang"
@@ -241,24 +204,12 @@ jobs:
             toolset: "msvc"
             toolset_version: "14.1"
             b2_cxxstd: "11,14,17"
-          - name: "msvc-14.1 standalone"
-            buildtype: "standalone-windows"
-            os: "windows-2016"
-            toolset: "msvc"
-            toolset_version: "14.1"
-            comment: "standalone"
           - name: "msvc-14.2"
             buildtype: "boost"
             os: "windows-2019"
             toolset: "msvc"
             toolset_version: "14.2"
             b2_cxxstd: "17,latest"
-          - name: "msvc-14.2 standalone"
-            buildtype: "standalone-windows"
-            os: "windows-2019"
-            toolset: "msvc"
-            toolset_version: "14.2"
-            comment: "standalone"
 
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}

CHANGELOG.md

@@ -1,3 +1,6 @@
+Boost 1.79.0
+* Standalone mode of the library is removed.
+
 Boost 1.78.0
 * Standalone mode of the library is deprecated.
 * Allow external libraries to forward declare `value_to` and `value_from`.

CMakeLists.txt

@@ -27,7 +27,6 @@ if(BOOST_JSON_IS_ROOT)
     include(CTest)
 endif()
 if(NOT BOOST_SUPERPROJECT_VERSION)
-    option(BOOST_JSON_STANDALONE "Build boost::json as a standalone library" OFF)
     option(BOOST_JSON_INSTALL "Install boost::json files" ON)
     option(BOOST_JSON_BUILD_TESTS "Build boost::json tests" ${BUILD_TESTING})
     option(BOOST_JSON_BUILD_FUZZERS "Build boost::json fuzzers" ${BOOST_JSON_IS_ROOT})
@@ -39,7 +38,7 @@ endif()
 
 
 include(GNUInstallDirs)
-if(BOOST_JSON_IS_ROOT AND NOT BOOST_JSON_STANDALONE)
+if(BOOST_JSON_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.
@@ -67,23 +66,18 @@ function(boost_json_setup_properties target)
         )
     endif()
 
-  if(BOOST_JSON_STANDALONE)
-      target_compile_definitions(${target} PUBLIC BOOST_JSON_STANDALONE)
-      target_compile_features(${target} PUBLIC cxx_std_17)
-  else()
-      target_link_libraries(${target}
-          PUBLIC
-              Boost::align
-              Boost::assert
-              Boost::config
-              Boost::container
-              Boost::exception
-              Boost::mp11
-              Boost::system
-              Boost::throw_exception
-              Boost::utility
-      )
-  endif()
+  target_link_libraries(${target}
+      PUBLIC
+          Boost::align
+          Boost::assert
+          Boost::config
+          Boost::container
+          Boost::exception
+          Boost::mp11
+          Boost::system
+          Boost::throw_exception
+          Boost::utility
+  )
 endfunction()
 
 

Jamfile

@@ -9,12 +9,6 @@
 
 import feature ;
 
-# b2 feature to choose Boost or standalone mode
-feature.feature boost.json.mode
-    : boost standalone
-    : propagated
-    ;
-
 build-project bench ;
 build-project test ;
 build-project fuzzing ;

README.md

@@ -52,43 +52,21 @@ Boost.JSON offers these features:
 * Constant-time key lookup for objects
 * Options to allow non-standard JSON
 * Easy and safe modern API with allocator support
-* Compile without Boost, define `BOOST_JSON_STANDALONE` (*deprecated*)
 * Optional header-only, without linking to a library
 
 ## Requirements
 
+* Requires only C++11
+* Link to a built static or dynamic Boost library, or use header-only (see below)
+* Supports -fno-exceptions, detected automatically
+
 The library relies heavily on these well known C++ types in
 its interfaces (henceforth termed _standard types_):
 
 * `string_view`
 * `memory_resource`, `polymorphic_allocator`
 * `error_category`, `error_code`, `error_condition`, `system_error`
 
-The requirements for Boost.JSON depend on whether the library is used
-as part of Boost, or in the standalone flavor (without Boost):
-
-### Using Boost
-
-* Requires only C++11
-* The default configuration
-* Aliases for standard types use their Boost equivalents
-* Link to a built static or dynamic Boost library, or use header-only (see below)
-* Supports -fno-exceptions, detected automatically
-
-### Without Boost
-
-> Warning: standalone use is deprecated and will be removed in a future release
-> of Boost.JSON.
-
-* Requires C++17
-* Aliases for standard types use their `std` equivalents
-* Obtained when defining the macro `BOOST_JSON_STANDALONE`
-* Link to a built static or dynamic standalone library, or use header-only (see below)
-* Supports -fno-exceptions: define `BOOST_NO_EXCEPTIONS` and `boost::throw_exception` manually
-
-When using without Boost, support for `<memory_resource>` is required.
-In particular, if using libstdc++ then version 8.3 or later is needed.
-
 ### Header-Only
 
 To use as header-only; that is, to eliminate the requirement to
@@ -99,24 +77,6 @@ file in your project.
 #include <boost/json/src.hpp>
 ```
 
-### Standalone Shared Library
-
-> Warning: standalone use is deprecated and will be removed in a future release
-> of Boost.JSON.
-
-To build a standalone shared library, it is necessary to define the
-macros `BOOST_JSON_DECL` and `BOOST_JSON_CLASS_DECL` as appropriate
-for your toolchain. Example for MSVC:
-```
-// When building the DLL
-#define BOOST_JSON_DECL       __declspec(dllexport)
-#define BOOST_JSON_CLASS_DECL __declspec(dllexport)
-
-// When building the application which uses the DLL
-#define BOOST_JSON_DECL       __declspec(dllimport)
-#define BOOST_JSON_CLASS_DECL __declspec(dllimport)
-```
-
 ### Embedded
 
 Boost.JSON works great on embedded devices. The library uses local
@@ -130,12 +90,6 @@ building the library or including the function definitions:
 #include <boost/json/src.hpp>
 ```
 
-#### Note
-    This library uses separate inline namespacing for the standalone
-    mode to allow libraries which use different modes to compose
-    without causing link errors. Linking to both modes of Boost.JSON
-    (Boost and standalone) is possible, but not recommended.
-
 ### Supported Compilers
 
 Boost.JSON has been tested with the following compilers:

build/Jamfile

@@ -54,11 +54,6 @@ rule warn-if-requested ( properties * )
     }
 }
 
-local cxx17-requires = [ config.requires
-      cxx17_hdr_string_view
-      cxx17_hdr_memory_resource
-    ] ;
-
 project boost/json
     : requirements
       [ requires
@@ -71,35 +66,27 @@ project boost/json
         # so we have to use a custom check
         cxx11_basic_alignas
       ]
-      <boost.json.mode>standalone":$(cxx17-requires)"
       <link>shared:<define>BOOST_JSON_DYN_LINK=1
       <link>static:<define>BOOST_JSON_STATIC_LINK=1
       <define>BOOST_JSON_SOURCE
     : usage-requirements
       <link>shared:<define>BOOST_JSON_DYN_LINK=1
       <link>static:<define>BOOST_JSON_STATIC_LINK=1
-      <boost.json.mode>standalone:<define>BOOST_JSON_STANDALONE=1
     : source-location ../src
     ;
 
 alias json_sources
    : src.cpp
    : usage-requirements
-     <boost.json.mode>boost:<library>/boost//container/<warnings-as-errors>off
+     <library>/boost//container/<warnings-as-errors>off
    ;
 
 explicit json_sources ;
 
 lib boost_json
    : json_sources
-   : <boost.json.mode>boost
-   :
-   : <library>/boost//container/<warnings-as-errors>off
-   ;
-
-alias boost_json
-   : json_sources
-   : <boost.json.mode>standalone
+   : usage-requirements
+     <library>/boost//container/<warnings-as-errors>off
    ;
 
 boost-install boost_json ;