git.iko.soy/typeable/pandoc
on master help sign in
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.

commit7f4ee830c985b94cafe594c8cdfe02cf418f95eb authorJohn MacFarlane <jgm@berkeley.edu> dateThu 23 Jun 2016, 11:08 (10 years ago) parenta820c1b
1 file changed+5−2
compare with master
unifiedsplit
windows/pandoc.wxs+5−2
windows/pandoc.wxs+5−2
@@ -147,6 +147,7 @@
147147 Value="!(loc.ExitDialogText)" />
148148
149149 <!--Offer Per User installs only on workstations (block on servers)-->
150+ <!--Unless ALLUSERS=1 is specified on command line-->
150151 <SetProperty Id="WixUISupportPerUser" Value="0" Before="FindRelatedProducts">
151152 <!--https://msdn.microsoft.com/en-us/library/windows/desktop/aa370329(v=vs.85).aspx-->
152153 MsiNTProductType > 1
@@ -158,10 +159,10 @@
158159 MsiNTProductType > 1
159160 </SetProperty>
160161 <SetProperty Id="ALLUSERS" Value="{}" Before="FindRelatedProducts" Action="CASetPuaPackage">
161− MsiNTProductType = 1
162+ (NOT ALLUSERS = 1) AND MsiNTProductType = 1
162163 </SetProperty>
163164 <SetProperty Id="MSIINSTALLPERUSER" Value="1" Before="FindRelatedProducts">
164− MsiNTProductType = 1
165+ (NOT ALLUSERS = 1) AND MsiNTProductType = 1
165166 </SetProperty>
166167 <SetProperty Id="WixAppFolder" Value="WixPerMachineFolder" Before="FindRelatedProducts">
167168 MsiNTProductType > 1
@@ -178,6 +179,8 @@
178179 </InstallUISequence>
179180
180181 <UIRef Id="WixUI_Advanced_Custom"/>
182+ <!--Enable better description when debug logging-->
183+ <UIRef Id="WixUI_ErrorProgressText" />
181184
182185 </Product>
183186