Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider switching to WiX 5.0.2 from WiX 4.0.5 #1070

Closed
yukawa opened this issue Oct 6, 2024 · 3 comments
Closed

Consider switching to WiX 5.0.2 from WiX 4.0.5 #1070

yukawa opened this issue Oct 6, 2024 · 3 comments
Assignees

Comments

@yukawa
Copy link
Collaborator

yukawa commented Oct 6, 2024

Description

WiX 5.0.2 was released on Oct 4, 2024.

Unlike WiX 5.0.1, which failed to compile our installer_oss_64bit.wxs, WiX 5.0.2 looks to have no issue on building it without any modification.

Steps to reproduce

Steps to reproduce the behavior:

  1. Replace 4.0.5 with 5.0.2 in the following files.
  • mozc/dotnet-tools.json

    Lines 1 to 12 in ace3145

    {
    "version": 1,
    "isRoot": true,
    "tools": {
    "wix": {
    "version": "4.0.5",
    "commands": [
    "wix"
    ]
    }
    }
    }
  • mozc/src/MODULE.bazel

    Lines 165 to 168 in ace3145

    dotnet_tool_repository(
    name = "wix",
    version = "4.0.5",
    )
  • mozc/src/WORKSPACE.bazel

    Lines 225 to 230 in ace3145

    # dotnet tool repository (to load "wix")
    load("@//bazel:dotnet_tool_repository.bzl", "dotnet_tool_repository")
    dotnet_tool_repository(
    name = "wix",
    version = "4.0.5",
    )
  1. Build Mozc (with either GYP or Bazel)

Expected behavior

There is no difference in Mozc64.msi built.

Actual behavior

There is no difference in Mozc64.msi built.

Version or commit-id

ace3145

Environment

  • OS: Windows 11 23H2
@yukawa yukawa changed the title Consider switching to Wix 5.0.2 from WiX 4.0.5 Consider switching to WiX 5.0.2 from WiX 4.0.5 Oct 6, 2024
@yukawa
Copy link
Collaborator Author

yukawa commented Oct 6, 2024

@hiroyuki-komatsu Can you take a look at this when you have time? I guess all we need to do is just replacing 4.0.5 with 5.0.2 in the above 3 files.

@hiroyuki-komatsu
Copy link
Collaborator

Sure!

hiroyuki-komatsu added a commit that referenced this issue Oct 7, 2024
* Preparation for #1070

#codehealth

PiperOrigin-RevId: 683024974
hiroyuki-komatsu added a commit that referenced this issue Oct 7, 2024
@hiroyuki-komatsu
Copy link
Collaborator

Done.

hiroyuki-komatsu added a commit that referenced this issue Oct 10, 2024
2.30.5595 → 2.30.5618

Conversion
* Updated zip code entries (#1063).
* Updated word entries (#1068, #1069)

Bug fix
* Linux: Enabled switching to the DIRECT mode from the menu (#1061)
* Linux: Enabled switching modes with Super+Space in Wayland (#853, #1059)
* macOS: Fixed the limitation of mouse clicking on the renderer on macOS 15 (120bd93)
* Windows: Fixed the setting of Omaha updater for the GoogleJapaneseInput build (#1072)

Build
* Android: Switched the Bazel rules from WORKSPACE to Bzlmod (#1002)
* Android: Updated the Docker build environment
* Linux: Update the build environment: Ubuntu 22.04 → 24.04 (#924)
* macOS / Windows: Updated the Qt version: 6.7.2 → 6.7.3 (#1065)
* Windows: Supported Bazel build (#948)
* Windows: Updated the Wix version: 4.0.5 → 5.0.2 (#1070)

Code
* Performed code refactoring

PiperOrigin-RevId: 684295272
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants