Skip to content

win: Fix MSI generation on Visual Studio != 2013

Rodrigo Muino Tomonari requested to merge github/fork/JaneaSystems/joaocgreis-F8C-fix-msi-vs2015 into master

This is a port from joyent/node, needed to build the MSI with VS2015.

Original PR: https://github.com/joyent/node/pull/25569

  • The first commit fixes problems when building with VS != 2013, by making sure that WiX has support for the correct version of VS and that the correct WiX directory is used. This also ensures that the correct PlatformToolset is used.
  • The second commit adds support for WiX 3.8. This is optional, but has been useful for at least one user. Custom actions as C files only seem to work with WiX 3.9, before that they must be C++. This changes the file to C++ with extern C declarations, as is common in WiX documentation. Since VS2013 is only supported from WiX 3.8 onwards, that is the only version for which this effectively adds support.

To use ICU with VS2015, https://github.com/nodejs/node/pull/2283 needs to land. I tested both PRs together.

cc @nodejs/platform-windows @nodejs/build

Merge request reports