Skip to content

Commit

Permalink
Follow up build instructions on bazelisk (#1184)
Browse files Browse the repository at this point in the history
This follows up to our previous commit [1], which introduced

  .bazelversion

so that we can centralize where to specify the expected version of Bazel
in our CI and build instructions.

This commit replaces the remaining usage of

  bazel

command with

  bazelisk

command then explain where the expected bazel version is specified.

This is just a documentation change. There must be no behavior change in
the final artifacts.

 [1]: 8d704f0

PiperOrigin-RevId: 728118770
  • Loading branch information
yukawa authored Feb 18, 2025
1 parent db249d2 commit d0b7b13
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
7 changes: 4 additions & 3 deletions docs/build_mozc_in_osx.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ python3 build_tools/update_deps.py
# CMake is also required to build Qt.
python3 build_tools/build_qt.py --release --confirm_license
MOZC_QT_PATH=${PWD}/third_party/qt bazel build package --config oss_macos --config release_build
MOZC_QT_PATH=${PWD}/third_party/qt bazelisk build package --config oss_macos --config release_build
open bazel-bin/mac/Mozc.pkg
```

Expand All @@ -49,8 +49,9 @@ Building on Mac requires the following software.
* [Xcode](https://apps.apple.com/us/app/xcode/id497799835)
* Xcode 13 (macOS 13 SDK) or later
* ⚠️Xcode Command Line Tools aren't sufficient.
* [Bazel](https://docs.bazel.build/versions/master/install-os-x.html) for Bazel build
* check [src/.bazelversion](../src/.bazelversion) for the supported Bazel version.
* [Bazelisk](https://github.com/bazelbuild/bazelisk)
* Bazelisk is a wrapper of [Bazel](https://bazel.build/) to use the specific version of Bazel.
* [src/.bazeliskrc](../src/.bazeliskrc) controls which version of Bazel is used.
* Python 3.9 or later with the following pip module.
* `requests`
* CMake 3.18.4 or later (to build Qt6)
Expand Down
3 changes: 2 additions & 1 deletion docs/build_mozc_in_windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ Note that you can specify `--qtdir=` option instead of `--noqt` in GYP phase sin
Additional requirements:

* [Bazelisk](https://github.com/bazelbuild/bazelisk)
* Bazelisk is a wrapper of [Bazel](https://bazel.build/) to use the specific version of Bazel.
* Bazelisk is a wrapper of [Bazel](https://bazel.build) to use the specific version of Bazel.
* [src/.bazeliskrc](../src/.bazeliskrc) controls which version of Bazel is used.
* [MSYS2](https://github.com/msys2/msys2)

After running `build_tools/update_deps.py` and `build_tools/build_qt.py`, run the following command instead of `build_mozc.py`:
Expand Down

0 comments on commit d0b7b13

Please sign in to comment.