Merge remote-tracking branch 'origin/master' into fcitx

Author: Fcitx Bot

.github/workflows/linux.yaml

@@ -36,7 +36,7 @@ jobs:
       - name: bazel build
         working-directory: ./src
         run: |
-          bazelisk build --config oss_linux package --config release_build
+          bazelisk build package --config release_build
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v6
@@ -68,4 +68,4 @@ jobs:
       - name: bazel test
         working-directory: ./src
         run: |
-          bazelisk test ... --config oss_linux -c dbg
+          bazelisk test ... -c dbg

.github/workflows/macos.yaml

@@ -41,12 +41,11 @@ jobs:
         working-directory: ./src
         run: |
           python3 build_tools/build_qt.py --release --confirm_license --macos_cpus=arm64
-          echo "MOZC_QT_PATH=${PWD}/third_party/qt" >> $GITHUB_ENV
 
       - name: bazel build
         working-directory: ./src
         run: |
-          bazelisk build --config oss_macos package --macos_cpus=arm64 --config release_build
+          bazelisk build package --macos_cpus=arm64 --config release_build
 
       - name: upload artifacts
         uses: actions/upload-artifact@v6
@@ -83,12 +82,11 @@ jobs:
         working-directory: ./src
         run: |
           python3 build_tools/build_qt.py --release --confirm_license --macos_cpus=x86_64
-          echo "MOZC_QT_PATH=${PWD}/third_party/qt" >> $GITHUB_ENV
 
       - name: bazel build
         working-directory: ./src
         run: |
-          bazelisk build --config oss_macos package --macos_cpus=x86_64 --config release_build
+          bazelisk build package --macos_cpus=x86_64 --config release_build
 
       - name: upload artifacts
         uses: actions/upload-artifact@v6
@@ -125,12 +123,11 @@ jobs:
         working-directory: ./src
         run: |
           python3 build_tools/build_qt.py --release --confirm_license --macos_cpus=x86_64,arm64
-          echo "MOZC_QT_PATH=${PWD}/third_party/qt" >> $GITHUB_ENV
 
       - name: bazel build
         working-directory: ./src
         run: |
-          bazelisk build --config oss_macos package --macos_cpus=x86_64,arm64 --config release_build
+          bazelisk build package --macos_cpus=x86_64,arm64 --config release_build
 
       - name: upload artifacts
         uses: actions/upload-artifact@v6
@@ -166,7 +163,7 @@ jobs:
       - name: bazel test
         working-directory: ./src
         run: |
-          bazelisk test ... --config oss_macos --build_tests_only -c dbg
+          bazelisk test ... --build_tests_only -c dbg
 
   # actions/cache works without this job, but having this would increase the likelihood of cache hit
   # in other jobs. Another approach would be to use "needs:".

.github/workflows/windows.yaml

@@ -57,7 +57,7 @@ jobs:
         env:
           ANDROID_NDK_HOME: ""
         run: |
-          bazelisk build --config oss_windows --config release_build package
+          bazelisk build --config release_build package
 
       - name: upload Mozc64_x64.msi
         uses: actions/upload-artifact@v6
@@ -110,7 +110,7 @@ jobs:
         env:
           ANDROID_NDK_HOME: ""
         run: |
-          bazelisk build --config oss_windows --config release_build --config win_universal_installer package
+          bazelisk build --config release_build --config win_universal_installer package
 
       - name: upload Mozc64_universal.msi
         uses: actions/upload-artifact@v6
@@ -163,7 +163,7 @@ jobs:
         env:
           ANDROID_NDK_HOME: ""
         run: |
-          bazelisk build package --config oss_windows --config release_build --platforms=//:windows-arm64
+          bazelisk build package --config release_build --platforms=//:windows-arm64
 
       - name: upload Mozc64_arm64.msi
         uses: actions/upload-artifact@v6
@@ -203,7 +203,7 @@ jobs:
         env:
           ANDROID_NDK_HOME: ""
         run: |
-          bazelisk test ... --config oss_windows -c dbg --build_tests_only
+          bazelisk test ... -c dbg --build_tests_only
 
   # actions/cache works without this job, but having this would increase the likelihood of cache hit
   # in other jobs. Another approach would be to use "needs:".

docs/build_mozc_for_linux.md

@@ -13,7 +13,7 @@ descriptions below and make sure the operations before running them.
 git clone https://github.com/google/mozc.git
 cd mozc/src
 
-bazelisk build package --config oss_linux --config release_build
+bazelisk build package --config release_build
 ```
 
 `bazel-bin/unix/mozc.zip` contains built files.
@@ -114,7 +114,7 @@ You should be able to build Mozc for Linux desktop as follows, assuming
 `bazelisk` is in your `$PATH`.
 
 ```sh
-bazelisk build package --config oss_linux --config release_build
+bazelisk build package --config release_build
 ```
 
 `package` is an alias to build Mozc executables and archive them into
@@ -172,23 +172,23 @@ git update-index --no-assume-unchanged src/config.bzl
 ### Run all tests
 
 ```sh
-bazelisk test ... --config oss_linux --build_tests_only -c dbg
+bazelisk test ... --build_tests_only -c dbg
 ```
 
 *   `...` means all targets under the current and subdirectories.
 
 ### Run tests under the specific directories
 
 ```sh
-bazelisk test base/... composer/... --config oss_linux --build_tests_only -c dbg
+bazelisk test base/... composer/... --build_tests_only -c dbg
 ```
 
 *   `<dir>/...` means all targets under the `<dir>/` directory.
 
 ### Run tests without the specific directories
 
 ```sh
-bazelisk test ... --config oss_linux --build_tests_only -c dbg -- -base/...
+bazelisk test ... --build_tests_only -c dbg -- -base/...
 ```
 
 *   `--` means the end of the flags which start from `-`.
@@ -197,15 +197,15 @@ bazelisk test ... --config oss_linux --build_tests_only -c dbg -- -base/...
 ### Run the specific test
 
 ```sh
-bazelisk test base:util_test --config oss_linux -c dbg
+bazelisk test base:util_test -c dbg
 ```
 
 *   `util_test` is defined in `base/BUILD.bazel`.
 
 ### Output logs to stderr
 
 ```
-bazelisk test base:util_test --config oss_linux --test_arg=--stderrthreshold=0 --test_output=all
+bazelisk test base:util_test --test_arg=--stderrthreshold=0 --test_output=all
 ```
 
 *   The `--test_arg=--stderrthreshold=0 --test_output=all` flags show the

docs/build_mozc_in_osx.md

@@ -18,7 +18,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 bazelisk build package --config oss_macos --config release_build
+bazelisk build package --config release_build
 open bazel-bin/mac/Mozc.pkg
 ```
 
@@ -120,7 +120,7 @@ brew install cmake
 ### Build installer
 
 ```
-MOZC_QT_PATH=${PWD}/third_party/qt bazelisk build package --config oss_macos --config release_build
+bazelisk build package --config release_build
 open bazel-bin/mac/Mozc.pkg
 ```
 
@@ -130,22 +130,22 @@ To build an Intel64 macOS binary regardless of the host CPU architecture.
 
 ```
 python3 build_tools/build_qt.py --release --debug --confirm_license --macos_cpus=x64_64
-MOZC_QT_PATH=${PWD}/third_party/qt bazelisk build package --config oss_macos --config release_build --macos_cpus=x64_64
+bazelisk build package --config release_build --macos_cpus=x64_64
 open bazel-bin/mac/Mozc.pkg
 ```
 
 To build a Universal macOS Binary both x86_64 and arm64.
 
 ```
 python3 build_tools/build_qt.py --release --debug --confirm_license --macos_cpus=x86_64,arm64
-MOZC_QT_PATH=${PWD}/third_party/qt bazelisk build package --config oss_macos --config release_build --macos_cpus=x86_64,arm64
+bazelisk build package --config release_build --macos_cpus=x86_64,arm64
 open bazel-bin/mac/Mozc.pkg
 ```
 
 ### Unit tests
 
 ```
-MOZC_QT_PATH=${PWD}/third_party/qt bazelisk test ... --config oss_macos --build_tests_only -c dbg
+bazelisk test ... --build_tests_only -c dbg
 ```
 
 See [build Mozc in Docker](build_mozc_in_docker.md#unittests) for details.

docs/build_mozc_in_windows.md

@@ -15,7 +15,7 @@ cd mozc\src
 
 python build_tools/update_deps.py
 python build_tools/build_qt.py --release --confirm_license
-bazelisk build --config oss_windows --config release_build package
+bazelisk build --config release_build package
 
 python build_tools/open.py bazel-bin/win32/installer/Mozc64.msi
 ```

src/base/win32/win_api_test_helper.cc

@@ -114,7 +114,8 @@ class HookTargetInfo {
         continue;
       }
       const FunctionPointer original_proc_address =
-          ::GetProcAddress(module_handle, request.proc_name.c_str());
+          reinterpret_cast<FunctionPointer>(
+              ::GetProcAddress(module_handle, request.proc_name.c_str()));
       if (original_proc_address == nullptr) {
         LOG(FATAL) << "GetProcAddress returned nullptr.";
         continue;

src/base/win32/win_api_test_helper.h

@@ -74,7 +74,7 @@ class WinAPITestHelper {
   class RestoreInfo;
   typedef RestoreInfo* RestoreInfoHandle;
 
-  typedef void* FunctionPointer;
+  using FunctionPointer = void (*)();
   struct HookRequest {
    public:
     HookRequest(const std::string& src_module, const std::string& src_proc_name,
@@ -88,7 +88,8 @@ class WinAPITestHelper {
   static HookRequest MakeHookRequest(const std::string& module,
                                      const std::string& proc_name,
                                      const NewProcType& new_proc_ref) {
-    return HookRequest(module, proc_name, &new_proc_ref);
+    return HookRequest(module, proc_name,
+                       reinterpret_cast<FunctionPointer>(&new_proc_ref));
   }
 
   // Overwrites on-memory Import Address Table (IAT) of |target_module| with

src/bazel/bazel_wrapper/bazel.bat

@@ -13,12 +13,18 @@ set TMP_MOZC_BASH_PATH=%TMP_MOZC_SRC_DIR%\third_party\msys64\usr\bin\bash.exe
 if exist %TMP_MOZC_BASH_PATH% set BAZEL_SH=%TMP_MOZC_BASH_PATH%
 set TMP_MOZC_BASH_PATH=
 
+rem Inject BAZEL_VC via vs_util.py if the user has not set it explicitly.
+if not defined BAZEL_VC (
+  for /f "usebackq delims=" %%P in (`python "%TMP_MOZC_SRC_DIR%\build_tools\vs_util.py"`) do set BAZEL_VC=%%P
+)
+
 set TMP_MOZC_BAZEL_WRAPPER_DIR=
 set TMP_MOZC_SRC_DIR=
 
 :: For debugging.
 echo BAZEL_LLVM=%BAZEL_LLVM%
 echo BAZEL_REAL=%BAZEL_REAL%
+echo BAZEL_VC=%BAZEL_VC%
 
 %BAZEL_REAL% %* & call:myexit
 

src/build_tools/vs_util.py

@@ -30,6 +30,7 @@
 
 """A helper script to use Visual Studio."""
 
+import argparse
 import json
 import os
 import pathlib
@@ -188,3 +189,37 @@ def get_vs_env_vars(
   if exitcode != 0:
     raise ChildProcessError(f'Failed to execute {vcvarsall}')
   return json.loads(stdout.decode('ascii'))
+
+
+def get_vc_dir(
+    arch: str, vcvarsall_path_hint: Union[str, None] = None
+) -> pathlib.Path:
+  """Returns the VC directory path for use as 'BAZEL_VC'.
+
+  Args:
+    arch: host/target architecture
+    vcvarsall_path_hint: optional path to vcvarsall.bat
+
+  Returns:
+    The VC directory path, e.g. 'C:\\...\\Community\\VC'.
+
+  Raises:
+    FileNotFoundError: When 'vcvarsall.bat' cannot be found.
+  """
+  # vcvarsall.bat lives at <VC>\Auxiliary\Build\vcvarsall.bat
+  return get_vcvarsall(arch, vcvarsall_path_hint).parent.parent.parent
+
+
+def main() -> int:
+  parser = argparse.ArgumentParser(
+      description='Print the VC directory (value suitable for BAZEL_VC).'
+  )
+  parser.add_argument('--arch', default='x64')
+  parser.add_argument('--vcvarsall_path', default=None)
+  args = parser.parse_args()
+  print(get_vc_dir(args.arch, args.vcvarsall_path))
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main())