From d7048ecfa7b4be45856327c38034dddbe469bee5 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sun, 5 Nov 2023 19:32:33 +0000 Subject: [PATCH 1/4] Improve ccmath support detection. See discussion in https://github.com/boostorg/math/pull/1045. --- include/boost/math/ccmath/detail/config.hpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/boost/math/ccmath/detail/config.hpp b/include/boost/math/ccmath/detail/config.hpp index 5dfbc2d91..61405e781 100644 --- a/include/boost/math/ccmath/detail/config.hpp +++ b/include/boost/math/ccmath/detail/config.hpp @@ -15,10 +15,28 @@ #include #ifndef BOOST_MATH_STANDALONE + #include #ifdef BOOST_NO_CXX17_IF_CONSTEXPR # define BOOST_MATH_NO_CCMATH #endif + +#else // BOOST_MATH_STANDALONE + +#if defined(_MSC_VER) + +#if defined(_MSVC_LANG) && (_MSVC_LANG < 201703) +# define BOOST_MATH_NO_CCMATH +#endif + +#else // _MSC_VER + +#if (__cplusplus < 201703) +# define BOOST_MATH_NO_CCMATH +#endif + +#endif + #endif #ifndef _MSC_VER From 90c509398babfc2afc38a3eeef8aa3cc71d2c4b6 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 6 Nov 2023 09:40:26 +0000 Subject: [PATCH 2/4] Improve error detection further. --- include/boost/math/ccmath/abs.hpp | 7 ++++--- include/boost/math/ccmath/ceil.hpp | 9 ++++++--- include/boost/math/ccmath/fabs.hpp | 6 ++++++ include/boost/math/ccmath/fdim.hpp | 10 ++++++---- include/boost/math/ccmath/floor.hpp | 10 ++++++---- include/boost/math/ccmath/fma.hpp | 5 +++-- include/boost/math/ccmath/fmax.hpp | 10 ++++++---- include/boost/math/ccmath/fmin.hpp | 10 ++++++---- include/boost/math/ccmath/fmod.hpp | 10 ++++++---- include/boost/math/ccmath/fpclassify.hpp | 10 ++++++---- include/boost/math/ccmath/frexp.hpp | 9 ++++++--- include/boost/math/ccmath/hypot.hpp | 10 ++++++---- include/boost/math/ccmath/ilogb.hpp | 9 ++++++--- include/boost/math/ccmath/isfinite.hpp | 17 ++++++----------- include/boost/math/ccmath/isgreater.hpp | 9 ++++++--- include/boost/math/ccmath/isgreaterequal.hpp | 9 ++++++--- include/boost/math/ccmath/isless.hpp | 9 ++++++--- include/boost/math/ccmath/islessequal.hpp | 9 ++++++--- include/boost/math/ccmath/isnormal.hpp | 9 +++++---- include/boost/math/ccmath/isunordered.hpp | 8 ++++++-- include/boost/math/ccmath/ldexp.hpp | 7 ++++++- include/boost/math/ccmath/logb.hpp | 10 ++++++---- include/boost/math/ccmath/modf.hpp | 10 ++++++---- include/boost/math/ccmath/next.hpp | 12 +++++++----- include/boost/math/ccmath/remainder.hpp | 10 ++++++---- include/boost/math/ccmath/round.hpp | 9 +++++---- include/boost/math/ccmath/scalbln.hpp | 9 ++++++--- include/boost/math/ccmath/scalbn.hpp | 10 ++++++---- include/boost/math/ccmath/signbit.hpp | 11 ++++++----- include/boost/math/ccmath/sqrt.hpp | 9 ++++++--- include/boost/math/ccmath/trunc.hpp | 9 ++++++--- 31 files changed, 180 insertions(+), 111 deletions(-) diff --git a/include/boost/math/ccmath/abs.hpp b/include/boost/math/ccmath/abs.hpp index c47ac1bac..db59502ab 100644 --- a/include/boost/math/ccmath/abs.hpp +++ b/include/boost/math/ccmath/abs.hpp @@ -8,15 +8,16 @@ #ifndef BOOST_MATH_CCMATH_ABS #define BOOST_MATH_CCMATH_ABS -#include #include -#include -#include #ifdef BOOST_MATH_NO_CCMATH #error "The header can only be used in C++17 and later." #endif +#include +#include +#include + namespace boost::math::ccmath { namespace detail { diff --git a/include/boost/math/ccmath/ceil.hpp b/include/boost/math/ccmath/ceil.hpp index 34ab2bb6b..bc264a0be 100644 --- a/include/boost/math/ccmath/ceil.hpp +++ b/include/boost/math/ccmath/ceil.hpp @@ -6,9 +6,12 @@ #ifndef BOOST_MATH_CCMATH_CEIL_HPP #define BOOST_MATH_CCMATH_CEIL_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/fabs.hpp b/include/boost/math/ccmath/fabs.hpp index 6d0b565b6..02191db3d 100644 --- a/include/boost/math/ccmath/fabs.hpp +++ b/include/boost/math/ccmath/fabs.hpp @@ -8,6 +8,12 @@ #ifndef BOOST_MATH_CCMATH_FABS #define BOOST_MATH_CCMATH_FABS +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include namespace boost::math::ccmath { diff --git a/include/boost/math/ccmath/fdim.hpp b/include/boost/math/ccmath/fdim.hpp index 024eb9c93..cdcbc223c 100644 --- a/include/boost/math/ccmath/fdim.hpp +++ b/include/boost/math/ccmath/fdim.hpp @@ -6,10 +6,12 @@ #ifndef BOOST_MATH_CCMATH_FDIM_HPP #define BOOST_MATH_CCMATH_FDIM_HPP -#include -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include diff --git a/include/boost/math/ccmath/floor.hpp b/include/boost/math/ccmath/floor.hpp index d866a35c3..fa071e24b 100644 --- a/include/boost/math/ccmath/floor.hpp +++ b/include/boost/math/ccmath/floor.hpp @@ -6,10 +6,12 @@ #ifndef BOOST_MATH_CCMATH_FLOOR_HPP #define BOOST_MATH_CCMATH_FLOOR_HPP -#include -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/fma.hpp b/include/boost/math/ccmath/fma.hpp index f11985521..c4d16c8ae 100644 --- a/include/boost/math/ccmath/fma.hpp +++ b/include/boost/math/ccmath/fma.hpp @@ -7,13 +7,14 @@ #define BOOST_MATH_CCMATH_FMA_HPP #include -#include -#include #ifdef BOOST_MATH_NO_CCMATH #error "The header can only be used in C++17 and later." #endif +#include +#include + namespace boost::math::ccmath { namespace detail { diff --git a/include/boost/math/ccmath/fmax.hpp b/include/boost/math/ccmath/fmax.hpp index 0eb1ecbaa..237355275 100644 --- a/include/boost/math/ccmath/fmax.hpp +++ b/include/boost/math/ccmath/fmax.hpp @@ -6,10 +6,12 @@ #ifndef BOOST_MATH_CCMATH_FMAX_HPP #define BOOST_MATH_CCMATH_FMAX_HPP -#include -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include diff --git a/include/boost/math/ccmath/fmin.hpp b/include/boost/math/ccmath/fmin.hpp index 3de0b7e43..4d0dc229e 100644 --- a/include/boost/math/ccmath/fmin.hpp +++ b/include/boost/math/ccmath/fmin.hpp @@ -6,10 +6,12 @@ #ifndef BOOST_MATH_CCMATH_FMIN_HPP #define BOOST_MATH_CCMATH_FMIN_HPP -#include -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include diff --git a/include/boost/math/ccmath/fmod.hpp b/include/boost/math/ccmath/fmod.hpp index 5f1e08cea..ba61cc95a 100644 --- a/include/boost/math/ccmath/fmod.hpp +++ b/include/boost/math/ccmath/fmod.hpp @@ -6,12 +6,14 @@ #ifndef BOOST_MATH_CCMATH_FMOD_HPP #define BOOST_MATH_CCMATH_FMOD_HPP -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include -#include -#include #include -#include #include #include #include diff --git a/include/boost/math/ccmath/fpclassify.hpp b/include/boost/math/ccmath/fpclassify.hpp index 4faba8031..3201f41c3 100644 --- a/include/boost/math/ccmath/fpclassify.hpp +++ b/include/boost/math/ccmath/fpclassify.hpp @@ -6,10 +6,12 @@ #ifndef BOOST_MATH_CCMATH_FPCLASSIFY #define BOOST_MATH_CCMATH_FPCLASSIFY -#include -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/frexp.hpp b/include/boost/math/ccmath/frexp.hpp index 88b520c1e..6c200cb64 100644 --- a/include/boost/math/ccmath/frexp.hpp +++ b/include/boost/math/ccmath/frexp.hpp @@ -7,9 +7,12 @@ #ifndef BOOST_MATH_CCMATH_FREXP_HPP #define BOOST_MATH_CCMATH_FREXP_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/hypot.hpp b/include/boost/math/ccmath/hypot.hpp index 613b2681a..4e0e245b4 100644 --- a/include/boost/math/ccmath/hypot.hpp +++ b/include/boost/math/ccmath/hypot.hpp @@ -7,12 +7,14 @@ #ifndef BOOST_MATH_CCMATH_HYPOT_HPP #define BOOST_MATH_CCMATH_HYPOT_HPP -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include -#include -#include #include -#include #include #include #include diff --git a/include/boost/math/ccmath/ilogb.hpp b/include/boost/math/ccmath/ilogb.hpp index a3b55d3b1..6ec6fca9a 100644 --- a/include/boost/math/ccmath/ilogb.hpp +++ b/include/boost/math/ccmath/ilogb.hpp @@ -6,9 +6,12 @@ #ifndef BOOST_MATH_CCMATH_ILOGB_HPP #define BOOST_MATH_CCMATH_ILOGB_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/isfinite.hpp b/include/boost/math/ccmath/isfinite.hpp index 6b407bfa5..328742cca 100644 --- a/include/boost/math/ccmath/isfinite.hpp +++ b/include/boost/math/ccmath/isfinite.hpp @@ -6,20 +6,15 @@ #ifndef BOOST_MATH_CCMATH_ISFINITE #define BOOST_MATH_CCMATH_ISFINITE -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include -#include -#ifndef BOOST_MATH_STANDALONE -#include -#ifdef BOOST_NO_CXX17_IF_CONSTEXPR -#error "The header can only be used in C++17 and later." -#endif -#endif - namespace boost::math::ccmath { template diff --git a/include/boost/math/ccmath/isgreater.hpp b/include/boost/math/ccmath/isgreater.hpp index c934f44e6..7b29f9bff 100644 --- a/include/boost/math/ccmath/isgreater.hpp +++ b/include/boost/math/ccmath/isgreater.hpp @@ -6,9 +6,12 @@ #ifndef BOOST_MATH_CCMATH_ISGREATER_HPP #define BOOST_MATH_CCMATH_ISGREATER_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include namespace boost::math::ccmath { diff --git a/include/boost/math/ccmath/isgreaterequal.hpp b/include/boost/math/ccmath/isgreaterequal.hpp index 38003e39e..d6586a95d 100644 --- a/include/boost/math/ccmath/isgreaterequal.hpp +++ b/include/boost/math/ccmath/isgreaterequal.hpp @@ -6,9 +6,12 @@ #ifndef BOOST_MATH_CCMATH_ISGREATEREQUAL_HPP #define BOOST_MATH_CCMATH_ISGREATEREQUAL_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include namespace boost::math::ccmath { diff --git a/include/boost/math/ccmath/isless.hpp b/include/boost/math/ccmath/isless.hpp index 52580f466..bf923e6f8 100644 --- a/include/boost/math/ccmath/isless.hpp +++ b/include/boost/math/ccmath/isless.hpp @@ -6,9 +6,12 @@ #ifndef BOOST_MATH_CCMATH_ISLESS_HPP #define BOOST_MATH_CCMATH_ISLESS_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include namespace boost::math::ccmath { diff --git a/include/boost/math/ccmath/islessequal.hpp b/include/boost/math/ccmath/islessequal.hpp index 854a5f90f..075d4cad6 100644 --- a/include/boost/math/ccmath/islessequal.hpp +++ b/include/boost/math/ccmath/islessequal.hpp @@ -6,9 +6,12 @@ #ifndef BOOST_MATH_CCMATH_ISLESSEQUAL_HPP #define BOOST_MATH_CCMATH_ISLESSEQUAL_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include namespace boost::math::ccmath { diff --git a/include/boost/math/ccmath/isnormal.hpp b/include/boost/math/ccmath/isnormal.hpp index 96277caf7..cf5a4d153 100644 --- a/include/boost/math/ccmath/isnormal.hpp +++ b/include/boost/math/ccmath/isnormal.hpp @@ -7,14 +7,15 @@ #define BOOST_MATH_ISNORMAL_HPP #include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include -#ifdef BOOST_MATH_NO_CCMATH -#error "The header can only be used in C++17 and later." -#endif - namespace boost::math::ccmath { template diff --git a/include/boost/math/ccmath/isunordered.hpp b/include/boost/math/ccmath/isunordered.hpp index 648ed8878..9d55db0d3 100644 --- a/include/boost/math/ccmath/isunordered.hpp +++ b/include/boost/math/ccmath/isunordered.hpp @@ -6,8 +6,12 @@ #ifndef BOOST_MATH_CCMATH_ISUNORDERED_HPP #define BOOST_MATH_CCMATH_ISUNORDERED_HPP -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include namespace boost::math::ccmath { diff --git a/include/boost/math/ccmath/ldexp.hpp b/include/boost/math/ccmath/ldexp.hpp index 4e5c9a8d2..3e2cd3610 100644 --- a/include/boost/math/ccmath/ldexp.hpp +++ b/include/boost/math/ccmath/ldexp.hpp @@ -7,8 +7,13 @@ #ifndef BOOST_MATH_CCMATH_LDEXP_HPP #define BOOST_MATH_CCMATH_LDEXP_HPP -#include #include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + +#include #include #include #include diff --git a/include/boost/math/ccmath/logb.hpp b/include/boost/math/ccmath/logb.hpp index ce0b92414..9a0c4a1c0 100644 --- a/include/boost/math/ccmath/logb.hpp +++ b/include/boost/math/ccmath/logb.hpp @@ -6,10 +6,12 @@ #ifndef BOOST_MATH_CCMATH_LOGB_HPP #define BOOST_MATH_CCMATH_LOGB_HPP -#include -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/modf.hpp b/include/boost/math/ccmath/modf.hpp index 479f6432e..87b6a4b50 100644 --- a/include/boost/math/ccmath/modf.hpp +++ b/include/boost/math/ccmath/modf.hpp @@ -6,10 +6,12 @@ #ifndef BOOST_MATH_CCMATH_MODF_HPP #define BOOST_MATH_CCMATH_MODF_HPP -#include -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/next.hpp b/include/boost/math/ccmath/next.hpp index 602c3bc9f..f03fe5cfa 100644 --- a/include/boost/math/ccmath/next.hpp +++ b/include/boost/math/ccmath/next.hpp @@ -7,17 +7,19 @@ #ifndef BOOST_MATH_CCMATH_NEXT_HPP #define BOOST_MATH_CCMATH_NEXT_HPP -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + +#include #include #include -#include -#include -#include #include #include #include #include -#include #include #include #include diff --git a/include/boost/math/ccmath/remainder.hpp b/include/boost/math/ccmath/remainder.hpp index 9f86ee79b..b57420b87 100644 --- a/include/boost/math/ccmath/remainder.hpp +++ b/include/boost/math/ccmath/remainder.hpp @@ -6,12 +6,14 @@ #ifndef BOOST_MATH_CCMATH_REMAINDER_HPP #define BOOST_MATH_CCMATH_REMAINDER_HPP -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include -#include -#include #include -#include #include #include #include diff --git a/include/boost/math/ccmath/round.hpp b/include/boost/math/ccmath/round.hpp index 0014c537a..334919e52 100644 --- a/include/boost/math/ccmath/round.hpp +++ b/include/boost/math/ccmath/round.hpp @@ -8,15 +8,16 @@ #include #include -#include -#include -#include -#include #ifdef BOOST_MATH_NO_CCMATH #error "The header can only be used in C++17 and later." #endif +#include +#include +#include +#include + namespace boost::math::ccmath { namespace detail { diff --git a/include/boost/math/ccmath/scalbln.hpp b/include/boost/math/ccmath/scalbln.hpp index 995d3f65f..2321f14c8 100644 --- a/include/boost/math/ccmath/scalbln.hpp +++ b/include/boost/math/ccmath/scalbln.hpp @@ -6,10 +6,13 @@ #ifndef BOOST_MATH_CCMATH_SCALBLN_HPP #define BOOST_MATH_CCMATH_SCALBLN_HPP -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include -#include -#include #include #include #include diff --git a/include/boost/math/ccmath/scalbn.hpp b/include/boost/math/ccmath/scalbn.hpp index 62b3b82c6..202682252 100644 --- a/include/boost/math/ccmath/scalbn.hpp +++ b/include/boost/math/ccmath/scalbn.hpp @@ -7,11 +7,13 @@ #ifndef BOOST_MATH_CCMATH_SCALBN_HPP #define BOOST_MATH_CCMATH_SCALBN_HPP -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include -#include -#include -#include #include #include #include diff --git a/include/boost/math/ccmath/signbit.hpp b/include/boost/math/ccmath/signbit.hpp index 28ad61993..bb12a5b61 100644 --- a/include/boost/math/ccmath/signbit.hpp +++ b/include/boost/math/ccmath/signbit.hpp @@ -6,17 +6,18 @@ #ifndef BOOST_MATH_CCMATH_SIGNBIT_HPP #define BOOST_MATH_CCMATH_SIGNBIT_HPP -#include -#include #include -#include -#include -#include #ifdef BOOST_MATH_NO_CCMATH #error "The header can only be used in C++17 and later." #endif +#include +#include +#include +#include +#include + #ifdef __has_include # if __has_include() # include diff --git a/include/boost/math/ccmath/sqrt.hpp b/include/boost/math/ccmath/sqrt.hpp index 281924cad..363961070 100644 --- a/include/boost/math/ccmath/sqrt.hpp +++ b/include/boost/math/ccmath/sqrt.hpp @@ -8,9 +8,12 @@ #ifndef BOOST_MATH_CCMATH_SQRT #define BOOST_MATH_CCMATH_SQRT -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include diff --git a/include/boost/math/ccmath/trunc.hpp b/include/boost/math/ccmath/trunc.hpp index 8322d9b48..7d30fd8b4 100644 --- a/include/boost/math/ccmath/trunc.hpp +++ b/include/boost/math/ccmath/trunc.hpp @@ -6,9 +6,12 @@ #ifndef BOOST_MATH_CCMATH_TRUNC_HPP #define BOOST_MATH_CCMATH_TRUNC_HPP -#include -#include -#include +#include + +#ifdef BOOST_MATH_NO_CCMATH +#error "The header can only be used in C++17 and later." +#endif + #include #include #include From c33ea106551e4f3143e3692bc3a8c8760919dc97 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 6 Nov 2023 18:27:35 +0000 Subject: [PATCH 3/4] Update depinst.py usage to scan more directories. --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6914aa527..4653cfb9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math + run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh @@ -116,7 +116,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math + run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh @@ -157,7 +157,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math + run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh @@ -201,7 +201,7 @@ jobs: run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math + run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools working-directory: ../boost-root - name: Bootstrap run: bootstrap @@ -249,7 +249,7 @@ jobs: run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math + run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools working-directory: ../boost-root - name: Bootstrap run: bootstrap @@ -292,7 +292,7 @@ jobs: run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math + run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools working-directory: ../boost-root - name: Bootstrap run: bootstrap @@ -336,7 +336,7 @@ jobs: - name: Copy files run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && cp -r * ../boost-root/libs/math' - name: Install deps - run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && python tools/boostdep/depinst/depinst.py math' + run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools' - name: Bootstrap run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && ./bootstrap.sh' - name: Generate headers @@ -466,7 +466,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math + run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh From 407a2eb8ed52fec99df95f522a5a9a01830d285f Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 6 Nov 2023 18:40:06 +0000 Subject: [PATCH 4/4] Correct depint.py includes. --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4653cfb9e..547d06622 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools + run: python tools/boostdep/depinst/depinst.py math -I example -I tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh @@ -116,7 +116,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools + run: python tools/boostdep/depinst/depinst.py math -I example -I tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh @@ -157,7 +157,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools + run: python tools/boostdep/depinst/depinst.py math -I example -I tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh @@ -201,7 +201,7 @@ jobs: run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools + run: python tools/boostdep/depinst/depinst.py math -I example -I tools working-directory: ../boost-root - name: Bootstrap run: bootstrap @@ -249,7 +249,7 @@ jobs: run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools + run: python tools/boostdep/depinst/depinst.py math -I example -I tools working-directory: ../boost-root - name: Bootstrap run: bootstrap @@ -292,7 +292,7 @@ jobs: run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools + run: python tools/boostdep/depinst/depinst.py math -I example -I tools working-directory: ../boost-root - name: Bootstrap run: bootstrap @@ -336,7 +336,7 @@ jobs: - name: Copy files run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && cp -r * ../boost-root/libs/math' - name: Install deps - run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools' + run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && python tools/boostdep/depinst/depinst.py math -I example -I tools' - name: Bootstrap run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && ./bootstrap.sh' - name: Generate headers @@ -466,7 +466,7 @@ jobs: run: cp -r $GITHUB_WORKSPACE/* libs/math working-directory: ../boost-root - name: Install deps - run: python tools/boostdep/depinst/depinst.py math -I libs/math/example -I libs/math/tools + run: python tools/boostdep/depinst/depinst.py math -I example -I tools working-directory: ../boost-root - name: Bootstrap run: ./bootstrap.sh