Skip to content

Commit be69c44

Browse files
committed
B2 5.3.2
2 parents 4a52d8c + f518c83 commit be69c44

File tree

218 files changed

+4100
-3366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+4100
-3366
lines changed

.ci/azp-linux-prep-container.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
steps:
2-
- script: |
3-
which docker
4-
/tmp/docker exec -t -u root container mv /etc/sudoers /etc/sudoers.bak
5-
/tmp/docker exec -t -u root container apt-get -qq update
6-
/tmp/docker exec -t -u root container apt-get -qq install sudo
7-
/tmp/docker exec -t -u root container mv /etc/sudoers.bak /etc/sudoers
8-
displayName: Sudorize
2+
- task: CmdLine@2
3+
displayName: Sudorize
4+
target: host
5+
inputs:
6+
script: |
7+
/usr/bin/docker exec -t -u root container mv /etc/sudoers /etc/sudoers.bak
8+
/usr/bin/docker exec -t -u root container apt-get -qq update
9+
/usr/bin/docker exec -t -u root container apt-get -qq install sudo
10+
/usr/bin/docker exec -t -u root container mv /etc/sudoers.bak /etc/sudoers
11+
12+
# - script: |
13+
# # Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590
14+
# sudo apt-get -qq install curl xz-utils
15+
# sudo curl -sLO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
16+
# sudo tar -xJ --strip-components 1 -C /node20217 -f node-v20.9.0-linux-x64-glibc-217.tar.xz
17+
# displayName: Node

.ci/azp-linux-test.yml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
parameters:
2-
- name: b2_opts
3-
type: string
4-
default: ''
2+
- name: b2_opts
3+
type: string
4+
default: ""
55

66
steps:
7-
- bash: |
8-
set -e
9-
uname -a
10-
./.ci/linux-cxx-install.sh
11-
python3 --version
12-
displayName: Install
13-
- bash: |
14-
set -e
15-
cd src/engine
16-
set PATH=${PATH};${CXX_PATH}
17-
./build.sh ${TOOLSET}
18-
./b2 -v
19-
cd ../..
20-
echo "using ${TOOLSET%%-[0-9]*} : : ${CXX} ;" > ${HOME}/user-config.jam
21-
displayName: Build
22-
- bash: |
23-
set -e
24-
echo "Available system locales:"
25-
locale -a
26-
echo "Switch to C.UTF-8 locale."
27-
export LC_ALL=C.UTF-8
28-
cd test
29-
./test_all.py ${TOOLSET}
30-
cd ..
31-
displayName: Test
32-
- bash: |
33-
set -e
34-
./src/engine/b2 b2 warnings-as-errors=on variant=debug,release ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
35-
displayName: "No Warnings"
36-
- bash: |
37-
set -e
38-
./bootstrap.sh ${TOOLSET}
39-
./b2 --prefix=$HOME/temp/.b2 install ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
40-
rm ./b2
41-
export PATH=$HOME/temp/.b2/bin:$PATH
42-
cd $HOME
43-
touch build.jam
44-
b2 -v
45-
b2 -n --debug-configuration ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
46-
displayName: Bootstrap
7+
- bash: |
8+
set -e
9+
uname -a
10+
./.ci/linux-cxx-install.sh
11+
python3 --version
12+
displayName: Install
13+
- bash: |
14+
set -e
15+
cd src/engine
16+
set PATH=${PATH};${CXX_PATH}
17+
./build.sh ${TOOLSET}
18+
./b2 -v
19+
cd ../..
20+
echo "using ${TOOLSET%%-[0-9]*} : : ${CXX} ;" > ${HOME}/user-config.jam
21+
displayName: Build
22+
- bash: |
23+
set -e
24+
echo "Available system locales:"
25+
locale -a
26+
echo "Switch to C.UTF-8 locale."
27+
export LC_ALL=C.UTF-8
28+
cd test
29+
./test_all.py ${TOOLSET}
30+
cd ..
31+
displayName: Test
32+
- bash: |
33+
set -e
34+
./src/engine/b2 b2 warnings-as-errors=on variant=debug,release ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
35+
displayName: "No Warnings"
36+
- bash: |
37+
set -e
38+
./bootstrap.sh ${TOOLSET}
39+
./b2 --prefix=$HOME/temp/.b2 install ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
40+
rm ./b2
41+
export PATH=$HOME/temp/.b2/bin:$PATH
42+
cd $HOME
43+
touch build.jam
44+
b2 -v
45+
b2 -n --debug-configuration ${TOOLSET:+toolset=$TOOLSET} ${{ parameters.b2_opts }}
46+
displayName: Bootstrap

.ci/azp-macos-extra.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ steps:
22
- bash: |
33
set -e
44
uname -a
5+
ls -laF /Applications
56
sudo xcode-select -switch ${XCODE_APP}
67
which clang++
78
displayName: Install

.ci/azp-macos-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ steps:
77
- bash: |
88
set -e
99
uname -a
10+
ls -laF /Applications
1011
sudo xcode-select -switch ${XCODE_APP}
1112
which clang++
1213
displayName: Install

.ci/azp-windows-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ steps:
2626
$env:path = 'C:\Windows\system32;C:\Windows;' + $env:CXX_PATH
2727
cd test
2828
echo "using" $env:TEST_TOOLSET ":" ":" $env:CXX ";" > ${env:HOME}/user-config.jam
29-
py -X utf8 test_all.py $env:TEST_TOOLSET
29+
py -X utf8 test_all.py $env:TEST_TOOLSET --not-parallel
3030
cd ..
3131
displayName: Test
3232
- powershell: |

.ci/linux-cxx-install.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ echo ">>>>>"
2828
echo ">>>>> APT: REPO.."
2929
echo ">>>>>"
3030
${SUDO} apt-get ${APT_OPT} install software-properties-common
31-
if test "${OS_ISSUE}" = "Ubuntu" ; then
32-
${SUDO} apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
33-
fi
31+
# if test "${OS_ISSUE}" = "Ubuntu" ; then
32+
# ${SUDO} apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
33+
# fi
3434
if test -n "${LLVM_OS}" ; then
3535
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
36-
${SUDO} apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
36+
${SUDO} apt-add-repository "deb https://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
3737
fi
3838
echo ">>>>>"
3939
echo ">>>>> APT: UPDATE 2/2.."
@@ -48,4 +48,4 @@ ${SUDO} apt-get ${APT_OPT} install ${PACKAGES}
4848
# subject to the Boost Software License, Version 1.0. (See accompanying
4949
# file LICENSE.txt)
5050
#
51-
# Copyright Rene Rivera 2020-2023.
51+
# Copyright René Ferdinand Rivera Morell

.cirrus.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@ freebsd_task:
88
skip: "changesIncludeOnly('.ci/azp-*', 'appveyor.yml', 'azure-pipelines.yml', '*.adoc')"
99
# All the GCC's and Clang's currently supported by FreeBSD ports.
1010
matrix:
11-
- { name: 'FreeBSD, GCC 13', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++13', PACKAGE: 'gcc13' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
12-
- { name: 'FreeBSD, GCC 12', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++12', PACKAGE: 'gcc12' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
13-
- { name: 'FreeBSD, GCC 11', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++11', PACKAGE: 'gcc11' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
14-
- { name: 'FreeBSD, GCC 10', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++10', PACKAGE: 'gcc10' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
15-
- { name: 'FreeBSD, GCC 9', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++9', PACKAGE: 'gcc9' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
16-
- { name: 'FreeBSD, Clang 17', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++17', PACKAGE: 'devel/llvm17' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
17-
- { name: 'FreeBSD, Clang 16', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++16', PACKAGE: 'devel/llvm16' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
18-
- { name: 'FreeBSD, Clang 15', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++15', PACKAGE: 'devel/llvm15' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
19-
- { name: 'FreeBSD, Clang 14', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++14', PACKAGE: 'devel/llvm14' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
20-
- { name: 'FreeBSD, Clang 13', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++13', PACKAGE: 'devel/llvm13' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
21-
- { name: 'FreeBSD, Clang 12', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++12', PACKAGE: 'devel/llvm12' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
22-
- { name: 'FreeBSD, Clang 11', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++11', PACKAGE: 'devel/llvm11' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
23-
# - { name: 'FreeBSD, Clang 10', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++10', PACKAGE: 'devel/llvm10' }, freebsd_instance: { image_family: 'freebsd-14-0' } }
11+
- { name: 'FreeBSD, GCC 14', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++14', PACKAGE: 'lang/gcc14' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
12+
- { name: 'FreeBSD, GCC 13', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++13', PACKAGE: 'gcc13' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
13+
- { name: 'FreeBSD, GCC 12', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++12', PACKAGE: 'gcc12' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
14+
- { name: 'FreeBSD, GCC 11', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++11', PACKAGE: 'gcc11' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
15+
# - { name: 'FreeBSD, GCC 10', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++10', PACKAGE: 'gcc10' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
16+
# - { name: 'FreeBSD, GCC 9', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++9', PACKAGE: 'gcc9' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
17+
- { name: 'FreeBSD, Clang 19', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++19', PACKAGE: 'devel/llvm19' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
18+
- { name: 'FreeBSD, Clang 18', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++18', PACKAGE: 'devel/llvm18' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
19+
- { name: 'FreeBSD, Clang 17', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++17', PACKAGE: 'devel/llvm17' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
20+
- { name: 'FreeBSD, Clang 16', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++16', PACKAGE: 'devel/llvm16' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
21+
- { name: 'FreeBSD, Clang 15', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++15', PACKAGE: 'devel/llvm15' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
22+
- { name: 'FreeBSD, Clang 14', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++14', PACKAGE: 'devel/llvm14' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
23+
- { name: 'FreeBSD, Clang 13', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++13', PACKAGE: 'devel/llvm13' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
24+
- { name: 'FreeBSD, Clang 12', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++12', PACKAGE: 'devel/llvm12' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
25+
- { name: 'FreeBSD, Clang 11', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++11', PACKAGE: 'devel/llvm11' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
26+
# - { name: 'FreeBSD, Clang 10', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++10', PACKAGE: 'devel/llvm10' }, freebsd_instance: { image_family: 'freebsd-14-2' } }
2427
# To install with ports we need to initialize the package manager. To avoid
2528
# confirmation prompts we need to set an env var.
2629
install_script: [

.clang-format

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ UseTab: Always
77
Language: Cpp
88
AccessModifierOffset: 0
99
AlignAfterOpenBracket: DontAlign
10-
AlignConsecutiveAssignments: false
11-
AlignConsecutiveDeclarations: false
10+
AlignArrayOfStructures: None
11+
AlignConsecutiveAssignments: None
12+
AlignConsecutiveBitFields: None
13+
AlignConsecutiveDeclarations: None
14+
AlignConsecutiveMacros: None
1215
AlignEscapedNewlines: DontAlign
1316
AlignOperands: DontAlign
14-
AlignTrailingComments: false
17+
AlignTrailingComments: { Kind: Never }
1518
AllowAllArgumentsOnNextLine: true
1619
AllowAllConstructorInitializersOnNextLine: true
1720
AllowAllParametersOfDeclarationOnNextLine: true
@@ -29,22 +32,22 @@ BinPackParameters: false
2932
BitFieldColonSpacing: Both
3033
BreakBeforeBraces: Custom
3134
BraceWrapping:
32-
AfterCaseLabel: true
33-
AfterClass: true
34-
AfterControlStatement: Always
35-
AfterEnum: true
36-
AfterExternBlock: true
37-
AfterFunction: true
38-
AfterNamespace: false
39-
AfterStruct: true
40-
AfterUnion: true
41-
BeforeCatch: true
42-
BeforeElse: true
43-
BeforeWhile: true
44-
IndentBraces: false
45-
SplitEmptyFunction: false
46-
SplitEmptyNamespace: true
47-
SplitEmptyRecord: false
35+
AfterCaseLabel: true
36+
AfterClass: true
37+
AfterControlStatement: Always
38+
AfterEnum: true
39+
AfterExternBlock: true
40+
AfterFunction: true
41+
AfterNamespace: false
42+
AfterStruct: true
43+
AfterUnion: true
44+
BeforeCatch: true
45+
BeforeElse: true
46+
BeforeWhile: true
47+
IndentBraces: false
48+
SplitEmptyFunction: false
49+
SplitEmptyNamespace: true
50+
SplitEmptyRecord: false
4851
BreakBeforeBinaryOperators: All
4952
BreakBeforeTernaryOperators: true
5053
BreakConstructorInitializers: BeforeComma
@@ -70,6 +73,7 @@ NamespaceIndentation: None
7073
PenaltyBreakBeforeFirstCallParameter: 0
7174
PenaltyBreakFirstLessLess: 0
7275
PenaltyReturnTypeOnItsOwnLine: 999999
76+
PenaltyIndentedWhitespace: 999999
7377
PointerAlignment: Middle
7478
PPIndentWidth: 0
7579
ReflowComments: true

.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,16 @@ trim_trailing_whitespace = true
1515
indent_size = 2
1616
indent_style = space
1717

18+
[*.clang-format]
19+
indent_size = 1
20+
indent_style = space
21+
1822
[*.jam]
1923
indent_style = space
2024

25+
[*.sh]
26+
indent_style = space
27+
2128
[.clangd]
2229
indent_size = 2
2330
indent_style = space

.github/workflows/qemu_multiarch_linux.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ on:
1919
"appveyor.yml",
2020
"azure-pipelines.yml",
2121
".ci/azp-*.yml",
22+
".github/workflows/backport.yml",
23+
".github/workflows/core_tests.yml",
2224
".github/workflows/installer_*.yml",
25+
".github/workflows/release_archives.yml",
2326
]
2427

2528
jobs:
@@ -28,24 +31,6 @@ jobs:
2831
fail-fast: false
2932
matrix:
3033
include:
31-
- {
32-
name: "Ubuntu 22.04 Jammy (armhf)",
33-
image: "multiarch/ubuntu-debootstrap:armhf-jammy",
34-
cxx: "g++",
35-
toolset: "gcc",
36-
}
37-
- {
38-
name: "Ubuntu 22.04 Jammy (arm64)",
39-
image: "multiarch/ubuntu-debootstrap:arm64-jammy",
40-
cxx: "g++",
41-
toolset: "gcc",
42-
}
43-
- {
44-
name: "Ubuntu 22.04 Jammy (ppc64el)",
45-
image: "multiarch/ubuntu-debootstrap:ppc64el-jammy",
46-
cxx: "g++",
47-
toolset: "gcc",
48-
}
4934
- {
5035
name: "Ubuntu 20.04 Focal (armhf)",
5136
image: "multiarch/ubuntu-debootstrap:armhf-focal",

0 commit comments

Comments
 (0)