Skip to content

Commit 217c70f

Browse files
committed
chore: upgrade boost to 1.88.0
This verison is verified in Trime(osfans/trime#1646) about three months ago, no issue found. Due to boost release in GitHub was split to *.cmake and *.b2, so we use the boost official release in https://www.boost.org/releases/latest/
1 parent cfa7f01 commit 217c70f

File tree

8 files changed

+20
-16
lines changed

8 files changed

+20
-16
lines changed

.github/workflows/macos-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
create-distributable: true
2424
build_variant: universal
2525
env:
26-
boost_version: 1.84.0
27-
BOOST_ROOT: ${{ github.workspace }}/deps/boost-1.84.0
26+
boost_version: 1.88.0
27+
BOOST_ROOT: ${{ github.workspace }}/deps/boost-1.88.0
2828
RIME_PLUGINS: ${{ inputs.rime_plugins }}
2929
steps:
3030
- name: Checkout last commit

.github/workflows/windows-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
- { compiler: clang, cc: clang, cxx: clang++ }
2424
- { compiler: msvc, arch: x86, cross_arch: x64_x86 }
2525
env:
26-
boost_version: 1.84.0
27-
BOOST_ROOT: ${{ github.workspace }}\deps\boost-1.84.0
26+
boost_version: 1.88.0
27+
BOOST_ROOT: ${{ github.workspace }}\deps\boost-1.88.0
2828
RIME_PLUGINS: ${{ inputs.rime_plugins }}
2929

3030
steps:

README-mac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Set shell variable `BOOST_ROOT` to the path to `boost-<version>` directory prior
4747
to building librime.
4848

4949
``` sh
50-
export BOOST_ROOT="$(pwd)/deps/boost-1.84.0"
50+
export BOOST_ROOT="$(pwd)/deps/boost-1.88.0"
5151
```
5252

5353
**Option 2:** Install Boost libraries from Homebrew.

env.bat.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ rem Customize your build environment and save the modified copy to env.bat
33
set RIME_ROOT=%CD%
44

55
rem REQUIRED: path to Boost source directory
6-
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.84.0
6+
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.88.0
77

88
rem architecture, Visual Studio version and platform toolset
99
set ARCH=Win32

env.vs2019.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ rem Customize your build environment and save the modified copy to env.bat
33
set RIME_ROOT=%CD%
44

55
rem REQUIRED: path to Boost source directory
6-
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.84.0
6+
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.88.0
77

88
rem architecture, Visual Studio version and platform toolset
99
set ARCH=Win32

env.vs2022.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ rem Customize your build environment and save the modified copy to env.bat
33
set RIME_ROOT=%CD%
44

55
rem REQUIRED: path to Boost source directory
6-
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.84.0
6+
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.88.0
77

88
rem architecture, Visual Studio version and platform toolset
99
set ARCH=Win32

install-boost.bat

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@ setlocal
22

33
if not defined RIME_ROOT set RIME_ROOT=%CD%
44

5-
if not defined boost_version set boost_version=1.84.0
5+
if not defined boost_version set boost_version=1.88.0
6+
7+
if not defined boost_tarball set boost_tarball=boost_%boost_version:.=_%
68

79
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-%boost_version%
810

911
if exist "%BOOST_ROOT%\libs" goto boost_found
1012
for %%I in ("%BOOST_ROOT%\.") do set src_dir=%%~dpI
1113
rem download boost source
12-
aria2c https://github.com/boostorg/boost/releases/download/boost-%boost_version%/boost-%boost_version%.7z -d %src_dir%
14+
aria2c https://archives.boost.io/release/%boost_version%/source/%boost_tarball%.7z -d %src_dir%
1315
pushd %src_dir%
14-
7z x boost-%boost_version%.7z
16+
7z x %boost_tarball%.7z
17+
ren %boost_tarball% boost-%boost_version%
1518
cd boost-%boost_version%
1619
call .\bootstrap.bat
1720
.\b2 headers

install-boost.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ set -ex
33

44
RIME_ROOT="$(cd "$(dirname "$0")"; pwd)"
55

6-
boost_version="${boost_version=1.84.0}"
6+
boost_version="${boost_version=1.88.0}"
77

88
BOOST_ROOT="${BOOST_ROOT=${RIME_ROOT}/deps/boost-${boost_version}}"
99

10-
boost_tarball="boost-${boost_version}.tar.xz"
11-
download_url="https://github.com/boostorg/boost/releases/download/boost-${boost_version}/${boost_tarball}"
12-
boost_tarball_sha256sum="2e64e5d79a738d0fa6fb546c6e5c2bd28f88d268a2a080546f74e5ff98f29d0e ${boost_tarball}"
10+
boost_tarball="boost_${boost_version//./_}.tar.gz"
11+
download_url="https://archives.boost.io/release/${boost_version}/source/${boost_tarball}"
12+
boost_tarball_sha256sum="3621533e820dcab1e8012afd583c0c73cf0f77694952b81352bf38c1488f9cb4 ${boost_tarball}"
1313

1414
download_boost_source() {
1515
cd "${RIME_ROOT}/deps"
1616
if ! [[ -f "${boost_tarball}" ]]; then
1717
curl -LO "${download_url}"
1818
fi
1919
echo "${boost_tarball_sha256sum}" | shasum -a 256 -c
20-
tar -xJf "${boost_tarball}"
20+
tar -xzf "${boost_tarball}"
21+
mv "boost_${boost_version//./_}" "boost-${boost_version}"
2122
[[ -f "${BOOST_ROOT}/bootstrap.sh" ]]
2223
}
2324

0 commit comments

Comments
 (0)