diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-06-23 11:08:36 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-06-23 11:09:25 -0700 |
| commit | 7f4ee830c985b94cafe594c8cdfe02cf418f95eb (patch) | |
| tree | de17c64497b90994ca806b00d10a4bbb4e1d17ff /windows/pandoc.wxs | |
| parent | a820c1bd1c8b5de0c2b8f8e6bdac5a8fc6602247 (diff) | |
| download | pandoc-7f4ee830c985b94cafe594c8cdfe02cf418f95eb.tar.gz | |
Improved Windows installer - don't ignore properties set on command-line.
See #2708. Needs testing to see if this resolves the issue.
Thanks to @nkalvi.
Diffstat (limited to 'windows/pandoc.wxs')
| -rw-r--r-- | windows/pandoc.wxs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs index 878800149..50a686e55 100644 --- a/windows/pandoc.wxs +++ b/windows/pandoc.wxs @@ -147,6 +147,7 @@ Value="!(loc.ExitDialogText)" /> <!--Offer Per User installs only on workstations (block on servers)--> + <!--Unless ALLUSERS=1 is specified on command line--> <SetProperty Id="WixUISupportPerUser" Value="0" Before="FindRelatedProducts"> <!--https://msdn.microsoft.com/en-us/library/windows/desktop/aa370329(v=vs.85).aspx--> MsiNTProductType > 1 @@ -158,10 +159,10 @@ MsiNTProductType > 1 </SetProperty> <SetProperty Id="ALLUSERS" Value="{}" Before="FindRelatedProducts" Action="CASetPuaPackage"> - MsiNTProductType = 1 + (NOT ALLUSERS = 1) AND MsiNTProductType = 1 </SetProperty> <SetProperty Id="MSIINSTALLPERUSER" Value="1" Before="FindRelatedProducts"> - MsiNTProductType = 1 + (NOT ALLUSERS = 1) AND MsiNTProductType = 1 </SetProperty> <SetProperty Id="WixAppFolder" Value="WixPerMachineFolder" Before="FindRelatedProducts"> MsiNTProductType > 1 @@ -178,6 +179,8 @@ </InstallUISequence> <UIRef Id="WixUI_Advanced_Custom"/> + <!--Enable better description when debug logging--> + <UIRef Id="WixUI_ErrorProgressText" /> </Product> |