Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/macos-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
create-distributable: true
build_variant: universal
env:
boost_version: 1.84.0
BOOST_ROOT: ${{ github.workspace }}/deps/boost-1.84.0
boost_version: 1.88.0
BOOST_ROOT: ${{ github.workspace }}/deps/boost-1.88.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 @@ -23,8 +23,8 @@ jobs:
- { compiler: clang, cc: clang, cxx: clang++ }
- { compiler: msvc, arch: x86, cross_arch: x64_x86 }
env:
boost_version: 1.84.0
BOOST_ROOT: ${{ github.workspace }}\deps\boost-1.84.0
boost_version: 1.88.0
BOOST_ROOT: ${{ github.workspace }}\deps\boost-1.88.0
RIME_PLUGINS: ${{ inputs.rime_plugins }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion README-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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.84.0"
export BOOST_ROOT="$(pwd)/deps/boost-1.88.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.84.0
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.88.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.84.0
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.88.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.84.0
if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost-1.88.0

rem architecture, Visual Studio version and platform toolset
set ARCH=Win32
Expand Down
9 changes: 6 additions & 3 deletions install-boost.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@ setlocal

if not defined RIME_ROOT set RIME_ROOT=%CD%

if not defined boost_version set boost_version=1.84.0
if not defined boost_version set boost_version=1.88.0

if not defined boost_tarball set boost_tarball=boost_%boost_version:.=_%

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

if exist "%BOOST_ROOT%\libs" goto boost_found
for %%I in ("%BOOST_ROOT%\.") do set src_dir=%%~dpI
rem download boost source
aria2c https://github.com/boostorg/boost/releases/download/boost-%boost_version%/boost-%boost_version%.7z -d %src_dir%
aria2c https://archives.boost.io/release/%boost_version%/source/%boost_tarball%.7z -d %src_dir%
pushd %src_dir%
7z x boost-%boost_version%.7z
7z x %boost_tarball%.7z
ren %boost_tarball% boost-%boost_version%
cd boost-%boost_version%
call .\bootstrap.bat
.\b2 headers
Expand Down
11 changes: 6 additions & 5 deletions install-boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@ set -ex

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

boost_version="${boost_version=1.84.0}"
boost_version="${boost_version=1.88.0}"

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

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

download_boost_source() {
cd "${RIME_ROOT}/deps"
if ! [[ -f "${boost_tarball}" ]]; then
curl -LO "${download_url}"
fi
echo "${boost_tarball_sha256sum}" | shasum -a 256 -c
tar -xJf "${boost_tarball}"
tar -xzf "${boost_tarball}"
mv "boost_${boost_version//./_}" "boost-${boost_version}"
[[ -f "${BOOST_ROOT}/bootstrap.sh" ]]
}

Expand Down
Loading