From 8cbab49ad36f2f3b7f69e8181ad3ad9e13247e5d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/11] Make the library modular usable. --- Jamfile | 10 ---------- build.jam | 26 ++++++++++++++++++++++++++ test/Jamfile | 2 +- 3 files changed, 27 insertions(+), 11 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 306f0f6..0000000 --- a/Jamfile +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2019 Vinnie Falco (vinnie dot falco at gmail dot com) -# -# 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) -# -# Official repository: https://github.com/boostorg/static_string -# - -build-project test ; diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..e9f9cda --- /dev/null +++ b/build.jam @@ -0,0 +1,26 @@ +# Copyright René Ferdinand Rivera Morell 2023 +# 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 project ; + +project /boost/static_string + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/utility//boost_utility + include + ; + +explicit + [ alias boost_static_string ] + [ alias all : boost_static_string test ] + ; + +call-if : boost-library static_string + ; diff --git a/test/Jamfile b/test/Jamfile index 17231a6..d9fa177 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -8,7 +8,7 @@ # import testing ; -import ../../config/checks/config : requires ; +import config : requires ; local defines = [ requires From 246f729a7ebdf2b6ef5af5d0aecd7f7deed081d8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/11] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index e9f9cda..9551451 100644 --- a/build.jam +++ b/build.jam @@ -7,13 +7,13 @@ import project ; project /boost/static_string : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/core//boost_core - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/utility//boost_utility + /boost/assert//boost_assert + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/utility//boost_utility include ; From 55cbd97be4da39ba1aace4431e496e42cd3b06e3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 26 Apr 2024 22:16:24 -0500 Subject: [PATCH 03/11] Replace relative docca refs with project based. --- doc/Jamfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/Jamfile b/doc/Jamfile index 25c9a6f..ac02fc8 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -12,7 +12,8 @@ project static_string/doc ; import boostbook ; import type ; import os ; -import ../../../tools/docca/docca.jam ; +import-search /boost/docca ; +import docca ; docca.reference reference.qbk : From 28f6d8587427d4184f3672848b8af530257f4dfe Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:33:08 -0500 Subject: [PATCH 04/11] Add missing import-search for cconfig/predef checks. --- test/Jamfile | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile b/test/Jamfile index d9fa177..030839f 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -8,6 +8,7 @@ # import testing ; +import-search /boost/config/checks ; import config : requires ; local defines = From 761c63ae26a1f2075c1b178b12dfbfa1dd1a79a9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 05/11] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index 9551451..bfeb905 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import project ; project /boost/static_string From 2d20440e250625aa2859c134ca8826479b9af288 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 06/11] Bump B2 require to 5.2 --- build.jam | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.jam b/build.jam index bfeb905..7e7ef25 100644 --- a/build.jam +++ b/build.jam @@ -3,9 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; - -import project ; +require-b2 5.2 ; project /boost/static_string : common-requirements From de81e55756d921045b0f01564ed9ca33cfc0f5df Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 07/11] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 7e7ef25..b1af38f 100644 --- a/build.jam +++ b/build.jam @@ -1,4 +1,4 @@ -# Copyright René Ferdinand Rivera Morell 2023 +# Copyright René Ferdinand Rivera Morell 2023-2024 # 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) From e956770f49e3487a49507091dd589c0e00e2d458 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 08/11] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build.jam b/build.jam index b1af38f..9ab25d5 100644 --- a/build.jam +++ b/build.jam @@ -5,22 +5,25 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/utility//boost_utility ; + project /boost/static_string : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/core//boost_core - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/utility//boost_utility include ; explicit - [ alias boost_static_string ] + [ alias boost_static_string : : : : $(boost_dependencies) ] [ alias all : boost_static_string test ] ; call-if : boost-library static_string ; + From 77ad6ee5e3f892bfce320acfb5e61317678b70bd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 8 Aug 2024 23:35:43 -0500 Subject: [PATCH 09/11] Update build deps. --- test/Jamfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Jamfile b/test/Jamfile index 030839f..4819625 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -21,6 +21,7 @@ local defines = ] ; -project : requirements $(defines) ; +project : requirements $(defines) + /boost/static_string//boost_static_string ; run static_string.cpp ; From 4d578aa32e0f3588c4fb72a61d253b26d6b4ed6c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 10 Aug 2024 20:28:46 -0500 Subject: [PATCH 10/11] Attempt to fix GHA. --- .github/workflows/ci.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22551ae..d7f16f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: then apt-get -o Acquire::Retries=$NET_RETRY_COUNT update apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common tzdata wget curl apt-transport-https make apt-file unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev - + # install pip: python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))') if [[ ${python_version} =~ ^3\.[0-5]$ ]]; then @@ -229,12 +229,12 @@ jobs: fi wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py python3 get-pip.py - + # install git: # apt-get install -y git apt-add-repository ppa:git-core/ppa apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git - + # install cmake: # apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y cmake sudo pip3 install cmake @@ -332,15 +332,9 @@ jobs: fi cd .. git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root" - cd boost-root - # mkdir -p libs/$LIBRARY - # cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - # git submodule update --init tools/boostdep - git submodule update --init --recursive - mkdir -p libs/$SELF - cp -r $GITHUB_WORKSPACE/* libs/$SELF - + cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY + git submodule update --init tools/boostdep DEPINST_ARGS+=("$LIBRARY") python tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}" if [ -z "${{matrix.cmake_tests}}" ] From b04f8508b3a7aed29072810f13b176e0d08b2f94 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 17 Aug 2024 00:12:32 -0500 Subject: [PATCH 11/11] Put back whitespace. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7f16f1..5989dc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: then apt-get -o Acquire::Retries=$NET_RETRY_COUNT update apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common tzdata wget curl apt-transport-https make apt-file unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev - + # install pip: python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))') if [[ ${python_version} =~ ^3\.[0-5]$ ]]; then @@ -229,12 +229,12 @@ jobs: fi wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py python3 get-pip.py - + # install git: # apt-get install -y git apt-add-repository ppa:git-core/ppa apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git - + # install cmake: # apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y cmake sudo pip3 install cmake