Skip to content

Commit

Permalink
upgrade boost to 1.83 (rime#696)
Browse files Browse the repository at this point in the history
  • Loading branch information
eagleoflqj authored and graphemecluster committed Aug 21, 2023
1 parent 5a415b3 commit cd01a91
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
build:
runs-on: macos-latest
env:
boost_version: 1.78.0
BOOST_ROOT: ${{ github.workspace }}/deps/boost_1_78_0
boost_version: 1.83.0
BOOST_ROOT: ${{ github.workspace }}/deps/boost_1_83_0
RIME_PLUGINS: ${{ inputs.rime_plugins }}
steps:
- name: Checkout last commit
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
build:
runs-on: windows-latest
env:
boost_version: 1.78.0
BOOST_ROOT: ${{ github.workspace }}\deps\boost_1_78_0
boost_version: 1.83.0
BOOST_ROOT: ${{ github.workspace }}\deps\boost_1_83_0
RIME_PLUGINS: ${{ inputs.rime_plugins }}
steps:
- name: Checkout last commit
Expand Down
2 changes: 1 addition & 1 deletion README-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Set shell variable `BOOST_ROOT` to the path to `boost_<version>` directory prior
to building librime.

``` sh
export BOOST_ROOT="$(pwd)/deps/boost_1_78_0"
export BOOST_ROOT="$(pwd)/deps/boost_1_83_0"
```

**Option 2:** Install Boost libraries from Homebrew.
Expand Down
2 changes: 1 addition & 1 deletion env.bat.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rem Customize your build environment and save the modified copy to env.bat
set RIME_ROOT=%CD%

rem REQUIRED: path to Boost source directory
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_78_0
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_83_0

rem architecture, Visual Studio version and platform toolset
set ARCH=Win32
Expand Down
2 changes: 1 addition & 1 deletion env.vs2019.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rem Customize your build environment and save the modified copy to env.bat
set RIME_ROOT=%CD%

rem REQUIRED: path to Boost source directory
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_78_0
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_83_0

rem architecture, Visual Studio version and platform toolset
set ARCH=Win32
Expand Down
2 changes: 1 addition & 1 deletion env.vs2022.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rem Customize your build environment and save the modified copy to env.bat
set RIME_ROOT=%CD%

rem REQUIRED: path to Boost source directory
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_78_0
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_83_0

rem architecture, Visual Studio version and platform toolset
set ARCH=Win32
Expand Down
2 changes: 1 addition & 1 deletion install-boost.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ setlocal

if not defined RIME_ROOT set RIME_ROOT=%CD%

if not defined boost_version set boost_version=1.78.0
if not defined boost_version set boost_version=1.83.0
set boost_x_y_z=%boost_version:.=_%

if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_%boost_x_y_z%
Expand Down
6 changes: 3 additions & 3 deletions install-boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ set -ex

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

boost_version="${boost_version=1.78.0}"
boost_version="${boost_version=1.83.0}"
boost_x_y_z="${boost_version//./_}"

BOOST_ROOT="${BOOST_ROOT=${RIME_ROOT}/deps/boost_${boost_x_y_z}}"

boost_tarball="boost_${boost_x_y_z}.tar.bz2"
download_url="https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/${boost_tarball}"
boost_tarball_sha256sum_1_78_0='8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc boost_1_78_0.tar.bz2'
boost_tarball_sha256sum="${boost_tarball_sha256sum=${boost_tarball_sha256sum_1_78_0}}"
boost_tarball_sha256sum_1_83_0='6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e boost_1_83_0.tar.bz2'
boost_tarball_sha256sum="${boost_tarball_sha256sum=${boost_tarball_sha256sum_1_83_0}}"

download_boost_source() {
cd "${RIME_ROOT}/deps"
Expand Down

0 comments on commit cd01a91

Please sign in to comment.