From 0d12d9037ae50346387fcce400be64d57fc41f92 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Sun, 20 Aug 2023 22:03:22 -0400 Subject: [PATCH] upgrade boost to 1.83 (#696) --- .github/workflows/macos-build.yml | 4 ++-- .github/workflows/windows-build.yml | 4 ++-- README-mac.md | 2 +- env.bat.template | 2 +- env.vs2019.bat | 2 +- env.vs2022.bat | 2 +- install-boost.bat | 2 +- install-boost.sh | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 44df48e8d8..b2974e82ca 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -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 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index b32026f675..aef44a8ee8 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -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 diff --git a/README-mac.md b/README-mac.md index 56a1b1a344..9b4c4fc618 100644 --- a/README-mac.md +++ b/README-mac.md @@ -38,7 +38,7 @@ Set shell variable `BOOST_ROOT` to the path to `boost_` 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. diff --git a/env.bat.template b/env.bat.template index cdcb2563f8..a687714957 100644 --- a/env.bat.template +++ b/env.bat.template @@ -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 diff --git a/env.vs2019.bat b/env.vs2019.bat index cdcb2563f8..a687714957 100644 --- a/env.vs2019.bat +++ b/env.vs2019.bat @@ -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 diff --git a/env.vs2022.bat b/env.vs2022.bat index 6f9d7c70ea..0dda233551 100644 --- a/env.vs2022.bat +++ b/env.vs2022.bat @@ -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 diff --git a/install-boost.bat b/install-boost.bat index 63650cc593..ab7b486d7e 100644 --- a/install-boost.bat +++ b/install-boost.bat @@ -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% diff --git a/install-boost.sh b/install-boost.sh index b7c7f22d06..f07e95a865 100755 --- a/install-boost.sh +++ b/install-boost.sh @@ -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"