B2 5.2.0

boostorg · Jun 11, 2024 · bb07627 · bb07627
2 parents efbf6ce + dfd11bb
commit bb07627
Show file tree

Hide file tree

Showing 95 changed files with 31,559 additions and 699 deletions.
diff --git a/.ci/azp-linux-test.yml b/.ci/azp-linux-test.yml
@@ -1,3 +1,8 @@
+parameters:
+- name: b2_opts
+  type: string
+  default: ''
+
 steps:
 - bash: |
     set -e
@@ -26,16 +31,16 @@ steps:
   displayName: Test
 - bash: |
     set -e
-    ./src/engine/b2 b2 warnings-as-errors=on variant=debug,release address-model=32,64 toolset=${TOOLSET}
+    ./src/engine/b2 b2 warnings-as-errors=on variant=debug,release ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
   displayName: "No Warnings"
 - bash: |
     set -e
     ./bootstrap.sh ${TOOLSET}
-    ./b2 --prefix=$HOME/temp/.b2 install toolset=${TOOLSET}
+    ./b2 --prefix=$HOME/temp/.b2 install ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
     rm ./b2
     export PATH=$HOME/temp/.b2/bin:$PATH
     cd $HOME
     touch build.jam
     b2 -v
-    b2 -n --debug-configuration toolset=${TOOLSET}
+    b2 -n --debug-configuration ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
   displayName: Bootstrap
diff --git a/.ci/azp-macos-test.yml b/.ci/azp-macos-test.yml
@@ -1,3 +1,8 @@
+parameters:
+- name: b2_opts
+  type: string
+  default: ''
+
 steps:
 - bash: |
     set -e
@@ -20,16 +25,16 @@ steps:
   displayName: Test
 - bash: |
     set -e
-    ./src/engine/b2 b2 warnings-as-errors=on variant=debug,release address-model=32,64 ${TOOLSET:+toolset=$TOOLSET}
+    ./src/engine/b2 b2 warnings-as-errors=on variant=debug,release ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
   displayName: "No Warnings"
 - bash: |
     set -e
     ./bootstrap.sh ${TOOLSET}
-    ./b2 --prefix=$HOME/temp/.b2 install ${TOOLSET:+toolset=$TOOLSET}
+    ./b2 --prefix=$HOME/temp/.b2 install ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
     rm ./b2
     export PATH=$HOME/temp/.b2/bin:$PATH
     cd $HOME
     touch build.jam
     b2 -v
-    b2 -n --debug-configuration ${TOOLSET:+toolset=$TOOLSET}
+    b2 -n --debug-configuration ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
   displayName: Bootstrap
diff --git a/.ci/azp-windows-test.yml b/.ci/azp-windows-test.yml
@@ -1,17 +1,29 @@
+parameters:
+- name: b2_opts
+  type: string
+  default: ''
+- name: prep_cmd
+  type: string
+  default: ''
+
 steps:
+- powershell: |
+    Set-PSDebug -Trace 1
+    ${{ parameters.prep_cmd }}
+  displayName: Prep
 - powershell: |
     Set-PSDebug -Trace 1
     cd src/engine
     $env:HOME = $env:HOMEDRIVE + $env:HOMEPATH
-    $env:path += ';' + $env:CXX_PATH
+    $env:path = 'C:\Windows\system32;C:\Windows;' + $env:CXX_PATH
+    echo "Path:" $env:path
     cmd /c build.bat $env:TOOLSET
-    ./b2.exe -v
     cd ../..
   displayName: Build
 - powershell: |
     Set-PSDebug -Trace 1
     $env:HOME = $env:HOMEDRIVE + $env:HOMEPATH
-    $env:path += ';' + $env:CXX_PATH
+    $env:path = 'C:\Windows\system32;C:\Windows;' + $env:CXX_PATH
     cd test
     echo "using" $env:TEST_TOOLSET ":" ":" $env:CXX ";" > ${env:HOME}/user-config.jam
     py -X utf8 test_all.py $env:TEST_TOOLSET
@@ -20,21 +32,20 @@ steps:
 - powershell: |
     Set-PSDebug -Trace 1
     $env:HOME = $env:HOMEDRIVE + $env:HOMEPATH
-    $env:path += ';' + $env:CXX_PATH
+    $env:path = 'C:\Windows\system32;C:\Windows;' + $env:CXX_PATH
     echo "using" $env:TEST_TOOLSET ":" ":" $env:CXX ";" > ${env:HOME}/user-config.jam
-    ./src/engine/b2.exe --debug-configuration b2 warnings-as-errors=on variant=debug,release toolset=$env:TEST_TOOLSET
+    ./src/engine/b2.exe --debug-configuration b2 warnings-as-errors=on variant=debug,release toolset=$env:TEST_TOOLSET ${{ parameters.b2_opts }}
   displayName: "No Warnings"
 - powershell: |
     Set-PSDebug -Trace 1
     $env:HOME = $env:HOMEDRIVE + $env:HOMEPATH
-    $env:path += ';' + $env:CXX_PATH
+    $env:path = 'C:\Windows\system32;C:\Windows;' + $env:CXX_PATH
     echo "using" $env:TEST_TOOLSET ":" ":" $env:CXX ";" > ${env:HOME}/user-config.jam
     ./bootstrap.bat $env:TOOLSET
-    ./b2.exe --debug-configuration --prefix=${env:HOME}/temp/.b2 install toolset=$env:TEST_TOOLSET
+    ./b2.exe --debug-configuration --prefix=${env:HOME}/temp/.b2 install toolset=$env:TEST_TOOLSET ${{ parameters.b2_opts }}
     Remove-Item ./b2.exe
     $env:path += $env:HOME + '/temp/.b2' + ';' + $env:PATH
     cd $env:HOME
     echo $null >> build.jam
-    b2 -v
-    b2 -n --debug-configuration
+    b2 -n --debug-configuration toolset=$env:TEST_TOOLSET ${{ parameters.b2_opts }}
   displayName: Bootstrap
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -20,7 +20,7 @@ freebsd_task:
     - { name: 'FreeBSD, Clang 13', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++13', PACKAGE: 'devel/llvm13' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
     - { name: 'FreeBSD, Clang 12', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++12', PACKAGE: 'devel/llvm12' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
     - { name: 'FreeBSD, Clang 11', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++11', PACKAGE: 'devel/llvm11' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
-    - { name: 'FreeBSD, Clang 10', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++10', PACKAGE: 'devel/llvm10' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
+    # - { name: 'FreeBSD, Clang 10', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++10', PACKAGE: 'devel/llvm10' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
   # To install with ports we need to initialize the package manager. To avoid
   # confirmation prompts we need to set an env var.
   install_script: [

diff --git a/.clang-format b/.clang-format
@@ -2,7 +2,7 @@
 BasedOnStyle: WebKit
 IndentWidth: 4
 TabWidth: 4
-UseTab: Never
+UseTab: Always
 ---
 Language: Cpp
 AccessModifierOffset: 0

diff --git a/.clangd b/.clangd
@@ -0,0 +1,18 @@
+CompileFlags:
+  CompilationDatabase: .build
+Diagnostics:
+  ClangTidy:
+    Add:
+      - modernize-*
+      - bugprone-*
+      - performance-*
+    Remove:
+      - modernize-use-trailing-return-type
+  MissingIncludes: Strict
+InlayHints:
+  BlockEnd: Yes
+  Designators: Yes
+  Enabled: Yes
+  ParameterNames: No
+  DeducedTypes: No
+  TypeNameLimit: 24
diff --git a/.editorconfig b/.editorconfig
@@ -7,9 +7,17 @@ root = true
 [*]
 charset = utf-8
 indent_size = 4
-indent_style = space
+indent_style = tab
 tab_width = 4
 trim_trailing_whitespace = true
 
 [*.yml]
 indent_size = 2
+indent_style = space
+
+[*.jam]
+indent_style = space
+
+[.clangd]
+indent_size = 2
+indent_style = space
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -31,6 +31,6 @@ jobs:
       )
     steps:
       - name: "Checkout"
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: "Backport PR"
         uses: korthout/backport-action@main
diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -52,7 +52,7 @@ jobs:
         shell: msys2 {0}
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
 
       - name: Install Toolset
         uses: msys2/setup-msys2@v2

diff --git a/.github/workflows/installer_windows.yml b/.github/workflows/installer_windows.yml
@@ -34,10 +34,10 @@ jobs:
     runs-on: "windows-latest"
     steps:
       - name: "Checkout"
-        uses: actions/checkout@master
+        uses: actions/checkout@main
         with: { path: "b2" }
       - name: "Checkout"
-        uses: actions/checkout@master
+        uses: actions/checkout@main
         with: { repository: "bfgroup/b2-pkg", path: "b2-pkg" }
       - name: "Install"
         run: |
@@ -52,12 +52,12 @@ jobs:
           cd "${{github.workspace}}/b2-pkg"
           b2 --debug-configuration --b2root="${{github.workspace}}/b2" -j1 -d+2 windows-wix
       - name: "Upload"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@main
         with:
           name: installer
-          path: "${{github.workspace}}\\b2-pkg\\stage\\*.msi*"
+          path: "./b2-pkg/stage/*.msi*"
       - name: "Publish"
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@master
         if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
         with:
-          files: "${{github.workspace}}\\b2-pkg\\stage\\*.msi*"
+          files: "./b2-pkg/stage/*.msi*"
diff --git a/.github/workflows/qemu_multiarch_linux.yml b/.github/workflows/qemu_multiarch_linux.yml
@@ -81,7 +81,7 @@ jobs:
       TOOLSET: ${{ matrix.toolset }}
     steps:
       - name: "Checkout"
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: "Install"
         run: |
           sudo apt-get -o Acquire::Retries=3 update

diff --git a/.github/workflows/release_archives.yml b/.github/workflows/release_archives.yml
@@ -41,7 +41,7 @@ jobs:
     name: ${{ matrix.name }}
     steps:
       - name: "Checkout"
-        uses: actions/checkout@master
+        uses: actions/checkout@main
         with: { path: "b2" }
 
       - name: "Snapshot"
@@ -72,13 +72,13 @@ jobs:
           rm -rf "${{github.workspace}}/b2-${version}"
 
       - name: "Upload"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@main
         with:
-          name: archives-${{github.run_id}}
+          name: B2-${{matrix.name}}
           path: "${{github.workspace}}/b2-*"
 
       - name: "Publish"
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@master
         if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
         with:
           files: "${{github.workspace}}/b2-*"