diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-08-01 22:55:27 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2026-08-09 22:55:24 -0400 |
| commit | 7db9a9436d8734d050582afdb3a2dfda21c606e1 (patch) | |
| tree | 651332dc9e84faee4c026883215f83d78dac63da /src/ext/Util/wixlib | |
| parent | ccfda4f4a158b19f61b018b944eb86272f427f55 (diff) | |
| download | wix-bob/CancelWhenDeferred.tar.gz wix-bob/CancelWhenDeferred.tar.bz2 wix-bob/CancelWhenDeferred.zip | |
Add CancelWhenDeferred, like FailWhenDeferred.bob/CancelWhenDeferred
Useful for integration testing packages.
Diffstat (limited to 'src/ext/Util/wixlib')
| -rw-r--r-- | src/ext/Util/wixlib/UtilExtension_Platform.wxi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi index d28c8df9..6316eaf1 100644 --- a/src/ext/Util/wixlib/UtilExtension_Platform.wxi +++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi | |||
| @@ -5,6 +5,14 @@ | |||
| 5 | <?include ..\..\caDecor.wxi ?> | 5 | <?include ..\..\caDecor.wxi ?> |
| 6 | 6 | ||
| 7 | <Fragment> | 7 | <Fragment> |
| 8 | <CustomAction Id="$(Prefix8)CancelWhenDeferred$(Suffix)" DllEntry="WixCancelWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(Prefix)UtilCA$(Suffix)" /> | ||
| 9 | |||
| 10 | <InstallExecuteSequence> | ||
| 11 | <Custom Action="virtual $(Prefix8)CancelWhenDeferred$(Suffix)" Before="InstallFinalize" Condition="WIXCANCELWHENDEFERRED=1 AND VersionNT > 400" /> | ||
| 12 | </InstallExecuteSequence> | ||
| 13 | </Fragment> | ||
| 14 | |||
| 15 | <Fragment> | ||
| 8 | <CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" /> | 16 | <CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" /> |
| 9 | 17 | ||
| 10 | <InstallExecuteSequence> | 18 | <InstallExecuteSequence> |