Merge pull request #256 from boostorg/build_adjust

Adjust build.jam to make regex header only.
Remove CI runners that are no longer supported.
2025-07-05 08:36:31 +02:00 · 2025-07-04 20:20:22 +01:00 · 2025-07-04 19:07:09 +01:00 · 2025-07-04 17:58:12 +01:00
4 changed files with 10 additions and 103 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -266,7 +266,7 @@ jobs:
        run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=${{ matrix.standard }}
        working-directory: ../boost-root/libs/regex/test
  windows_gcc:
-    runs-on: windows-2019
+    runs-on: windows-latest
    defaults:
      run:
        shell: cmd
@ -312,102 +312,8 @@ jobs:
      - name: Test
        run: ..\..\..\b2 --hash %ARGS%
        working-directory: ../boost-root/libs/regex/test
-  windows_msvc_14_0:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: cmd
-    env:
-      ARGS: toolset=${{ matrix.toolset }} address-model=64 cxxstd=${{ matrix.standard }}
-    strategy:
-      fail-fast: false
-      matrix:
-        toolset: [ msvc-14.0 ]
-        standard: [ 14, 17 ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]'
-          commit-filter-separator: ';'
-          fail-fast: true
-      - name: Checkout main boost
-        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
-      - name: Update tools/boostdep
-        run: git submodule update --init tools/boostdep
-        working-directory: ../boost-root
-      - name: Copy files
-        run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\regex
-        working-directory: ../boost-root
-      - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py -I example -g "--jobs 3" regex
-        working-directory: ../boost-root
-      - name: Bootstrap
-        run: bootstrap
-        working-directory: ../boost-root
-      - name: Generate headers
-        run: b2 headers
-        working-directory: ../boost-root
-      - name: Config info install
-        run: ..\..\..\b2 config_info_travis_install %ARGS%
-        working-directory: ../boost-root/libs/config/test
-      - name: Config info
-        run: config_info_travis
-        working-directory: ../boost-root/libs/config/test
-      - name: Test
-        run: ..\..\..\b2 --hash %ARGS%
-        working-directory: ../boost-root/libs/regex/test
-  windows_msvc_14_2:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: cmd
-    env:
-      ARGS: toolset=${{ matrix.toolset }} address-model=64 cxxstd=${{ matrix.standard }}
-    strategy:
-      fail-fast: false
-      matrix:
-        toolset: [ msvc-14.2 ]
-        standard: [ 14, 17, latest ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]'
-          commit-filter-separator: ';'
-          fail-fast: true
-      - name: Checkout main boost
-        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
-      - name: Update tools/boostdep
-        run: git submodule update --init tools/boostdep
-        working-directory: ../boost-root
-      - name: Copy files
-        run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\regex
-        working-directory: ../boost-root
-      - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py -I example -g "--jobs 3" regex
-        working-directory: ../boost-root
-      - name: Bootstrap
-        run: bootstrap
-        working-directory: ../boost-root
-      - name: Generate headers
-        run: b2 headers
-        working-directory: ../boost-root
-      - name: Config info install
-        run: ..\..\..\b2 config_info_travis_install %ARGS%
-        working-directory: ../boost-root/libs/config/test
-      - name: Config info
-        run: config_info_travis
-        working-directory: ../boost-root/libs/config/test
-      - name: Test
-        run: ..\..\..\b2 --hash %ARGS%
-        working-directory: ../boost-root/libs/regex/test
  windows_msvc_14_3:
-    runs-on: windows-2022
+    runs-on: windows-2025
    defaults:
      run:
        shell: cmd
@ -460,7 +366,7 @@ jobs:
        run: msvc_test.bat
        working-directory: ../boost-root/libs/regex/test/module
  ubuntu-cmake-install:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
    steps:
@ -492,7 +398,7 @@ jobs:
         cmake --build .
         cmake --build . --target check
  ubuntu-cmake-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
    steps:
--- a/build.jam
+++ b/build.jam
@ -20,11 +20,12 @@ project /boost/regex
    ;

 explicit
-    [ alias boost_regex : build//boost_regex ]
-    [ alias all : boost_regex example test ]
+    [ alias boost_regex : : : : <library>$(boost_dependencies) ]
+    [ alias boost_regex_old : build//boost_regex ]
+    [ alias all : boost_regex boost_regex_old example test ]
    ;

 call-if : boost-library regex
-    : install boost_regex
+    : install boost_regex_old
    ;

--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@ -5,7 +5,7 @@

 project
    : requirements
-      <library>/boost/regex//boost_regex
+      <library>/boost/regex//boost_regex_old
      <library>/boost/timer//boost_timer
      <threading>multi
      <link>shared:<define>BOOST_REGEX_DYN_LINK=1
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -5,7 +5,7 @@

 project
    : requirements
-      <library>/boost/regex//boost_regex
+      <library>/boost/regex//boost_regex_old
      <library>/boost/detail//boost_detail
      <threading>multi
      <link>shared:<define>BOOST_REGEX_DYN_LINK=1
Author	SHA1	Message	Date
jzmaddock	ed6ebbd5a5	Merge pull request #256 from boostorg/build_adjust Adjust build.jam to make regex header only.	2025-07-04 20:20:22 +01:00
jzmaddock	d8cc5dbbbe	Remove CI runners that are no longer supported. Adjust library paths.	2025-07-04 19:07:09 +01:00
jzmaddock	60f5c1b958	Adjust build.jam to make regex header only. While still installing the binary for those few that need it.	2025-07-04 17:58:12 +01:00