On Wed, 18 Mar 2026 23:16:06 GMT, Alexey Semenyuk <[email protected]> wrote:
>> Support "--win-with-ui" boolean option. If specified, jpackage will ensure
>> the output MSI or EXE installer will have User Interface (UI). The UI is
>> based on the standard "WixUI_Minimal" WiX dialog set with the WelcomeEulaDlg
>> dialog removed from the sequence.
>>
>> If any option that implicitly results in the installer with UI is specified
>> ("--win-dir-chooser", "--win-shortcut-prompt", "--license-file"), the
>> "--win-with-ui" option is ignored.
>>
>> Code changes:
>> - Refactor WixUiFragmentBuilder: move code constructing a model for WiX UI
>> source code generation to classes in a new "jdk.jpackage.internal.wixui"
>> package with unit test coverage.
>> - Refactor WixPipeline and WixVariables; add unit tests for WixVariables.
>> - Refactor WinInstallerUiTest to include coverage for the "--win-with-ui"
>> option.
>>
>> Additionally, fixed an issue in WinL10nTest.java that popped up when running
>> the tests locally with different versions of WiX toolkit.
>
> Alexey Semenyuk has updated the pull request incrementally with one
> additional commit since the last revision:
>
> jpackage.md: update
Looks good with minor comments.
src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
line 430:
> 428:
> 429: help.option.win-with-ui=\
> 430: \ Enforces the installer to have UI
Do we need a new line at the end of the file?
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackageMixin.java
line 39:
> 37: boolean withShortcutPrompt();
> 38:
> 39: boolean withUi();
`withUi` -> `withUI`. Below as well.
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/msi-disable-actions.js
line 7:
> 5: * This code is free software; you can redistribute it and/or modify it
> 6: * under the terms of the GNU General Public License version 2 only, as
> 7: * published by the Free Software Foundation.
Missing "Classpath" exception sentence. We have it in other resource files.
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java line 279:
> 277: }
> 278:
> 279: public static MsiDatabase.UIAlterations
> getUIAlerations(JPackageCommand cmd) {
`Alerations` -> `Alterations`
-------------
PR Review: https://git.openjdk.org/jdk/pull/30172#pullrequestreview-3971628427
PR Review Comment: https://git.openjdk.org/jdk/pull/30172#discussion_r2956914173
PR Review Comment: https://git.openjdk.org/jdk/pull/30172#discussion_r2956923185
PR Review Comment: https://git.openjdk.org/jdk/pull/30172#discussion_r2956932907
PR Review Comment: https://git.openjdk.org/jdk/pull/30172#discussion_r2957437118
