[krbdev.mit.edu #7392] git commit

Tom Yu via RT rt at krbdev.mit.edu
Wed Jun 24 17:59:41 EDT 2015



Stop using the WiX Registry element

It is deprecated in favor of more specific XML elements such
as RegistryKey, RegistryValue, and RemoveRegistryKey, so as to
stop overloading a single element for what are fundamentally
different types and operations.

RegistryValue elements can be children of RegistryKey elements,
allowing the Key attribute to be inherited, or bare within the
containing Component.  We do not take advantage of the inheritance
at this time, since that would be a more disruptive change.

WiX would prefer for us to not use the createAndRemoveOnUninstall
attribute of <RegistryKey>, in favor of ForceCreateOnInstall
and/or ForceRemoveOnUninstall, but that can wait for a follow-up
commit.

Some instances of <Registry> were commented-out and can simply be
removed.

Some of the <Registry> elements used to create keys were also
setting the KeyPath attribute, which is not permitted in the
<RegistryKey> element.  According to
http://sourceforge.net/p/wix/bugs/3197/ , this should never have
been allowed, and non-value registry keys should not be used as
MSI KeyPaths.  In all affected cases, there are child
RegistryValue elements that are suitable for use as KeyPath
elements instead.

Some of the <Registry> elements were present with a duplicate
element with different Id that added no new attributes; those
duplicate elements can safely be removed.

<RemoveRegistryKey> is used to replace <Registry> elements
with Action=removeKeyOnInstall.

(cherry picked from commit 280a4b1125743bae3bf05af266131e2a524c8adf)

https://github.com/krb5/krb5/commit/e0fa3bb33b7e7b05c584e0529364d8f1d914048c
Author: Ben Kaduk <kaduk at mit.edu>
Committer: Tom Yu <tlyu at mit.edu>
Commit: e0fa3bb33b7e7b05c584e0529364d8f1d914048c
Branch: krb5-1.13
 src/windows/installer/wix/files.wxi |  269 ++++++++++++++++-------------------
 1 files changed, 126 insertions(+), 143 deletions(-)


More information about the kfwdev mailing list