RFR: 8319457: Update jpackage to support WiX Toolset 4 on Windows
Alexander Matveev
almatvee at openjdk.org
Tue Jun 4 01:23:11 UTC 2024
On Mon, 20 May 2024 21:14:09 GMT, Alexey Semenyuk <asemenyuk at openjdk.org> wrote:
> Add support for WiX4 in jpackage.
>
> jpackage supports both WiX3 and WiX4. It will pick WiX4 if both versions are installed.
>
> Custom WiX3 sources will be automatically converted to WiX4 format if WiX4 is used. The converter provides:
>
> - full support of the conversion of WiX L10N (.wxl) files, i.e. full support of "http://schemas.microsoft.com/wix/2006/localization" to "http://wixtoolset.org/schemas/v4/wxl" namespace conversion;
> - partial support of WiX source (.wxs) files, i.e. partial support of "http://schemas.microsoft.com/wix/2006/wi" to "http://wixtoolset.org/schemas/v4/wxs" namespace conversion;
>
> The converter is a XSLT stylesheet. The default converter is `src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/wix3-to-wix4-conv.xsl`. It can be replaced with the custom converter by adding "wix-conv.xsl" file to the resource directory.
Looks good overall. Only two minor comments.
1) Do we need to handle default case for unknown wix type? In same cases you have `default -> throw new IllegalArgumentException();` and in some you do not have.
2) Looks like resource files are saved in wrong format. Is it expected?
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl line 1:
> 1: <?xml version = '1.0' encoding = 'utf-8'?>
MsiInstallerStrings_de(ja,zh_CA).wxl are probably saved in wrong format. Can you double check if it is intentional change?
-------------
PR Review: https://git.openjdk.org/jdk/pull/19318#pullrequestreview-2095104559
PR Review Comment: https://git.openjdk.org/jdk/pull/19318#discussion_r1625207485
More information about the build-dev
mailing list