From ff649883e8e9809e016cbb6f135134b2366c0eb2 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Wed, 26 Jun 2024 00:59:02 +0000 Subject: [PATCH] Temporarily revert `//win32/installer:artifacts` This is a follow up commit to my previous commits, which added //win32/installer:artifacts target to build Mozc with Bazel on Windows (#948). It seems that it has caused some build errors in other platforms. Let's revert them back until we figure out how to solve the issue. #codehealth PiperOrigin-RevId: 646670786 --- .github/workflows/windows.yaml | 2 +- src/win32/installer/BUILD.bazel | 74 --------------------------------- 2 files changed, 1 insertion(+), 75 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 2ba47d3ba..46b3f9fd6 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -123,7 +123,7 @@ jobs: env: ANDROID_NDK_HOME: "" run: | - bazel --bazelrc=windows.bazelrc build //win32/installer:artifacts --config oss_windows --verbose_failures --cpu=x64_windows + bazel --bazelrc=windows.bazelrc build //server:mozc_server --config oss_windows --verbose_failures --cpu=x64_windows test: # https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md diff --git a/src/win32/installer/BUILD.bazel b/src/win32/installer/BUILD.bazel index 493c87b63..caf78613f 100644 --- a/src/win32/installer/BUILD.bazel +++ b/src/win32/installer/BUILD.bazel @@ -28,77 +28,3 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Build rules for the Windows installer. - -load( - "//:build_defs.bzl", - "CPU", - "mozc_win_build_rule", -) - -package(default_visibility = ["//visibility:private"]) - -mozc_win_build_rule( - name = "mozc_tool", - cpu = CPU.X64, - target = "//gui/tool:mozc_tool", -) - -mozc_win_build_rule( - name = "mozc_renderer", - cpu = CPU.X64, - target = "//renderer/win32:win32_renderer_main", -) - -mozc_win_build_rule( - name = "mozc_server", - cpu = CPU.X64, - target = "//server:mozc_server", -) - -mozc_win_build_rule( - name = "mozc_broker", - cpu = CPU.X64, - target = "//win32/broker:mozc_broker_main", -) - -mozc_win_build_rule( - name = "mozc_cache_service", - cpu = CPU.X64, - target = "//win32/cache_service:mozc_cache_service", -) - -mozc_win_build_rule( - name = "mozc_tip32", - cpu = CPU.X86, - static_crt = True, - target = "//win32/tip:mozc_tip", -) - -mozc_win_build_rule( - name = "mozc_tip64", - cpu = CPU.X64, - static_crt = True, - target = "//win32/tip:mozc_tip", -) - -mozc_win_build_rule( - name = "custom_action", - cpu = CPU.X64, - static_crt = True, - target = "//win32/custom_action", -) - -filegroup( - name = "executables", - srcs = [ - ":custom_action", - ":mozc_broker", - ":mozc_cache_service", - ":mozc_renderer", - ":mozc_server", - ":mozc_tip32", - ":mozc_tip64", - ":mozc_tool", - ], - target_compatible_with = ["@platforms//os:windows"], -)