X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Buildscr;h=863f01bd31df7d8d009a00528c0762707bc81128;hb=1de7240eb88fa24a8532ded116b4ec72dd213008;hp=6e2bbc3b70481c21559063abe40455fde828492c;hpb=5c5879b99d2a0785095a384f48a2d934e1b2d4c5;p=PuTTY.git

diff --git a/Buildscr b/Buildscr
index 6e2bbc3b..863f01bd 100644
--- a/Buildscr
+++ b/Buildscr
@@ -171,20 +171,20 @@ delegate windows
   in putty/doc with htmlhelp do/win hhc putty.hhp & type putty.chm >nul
 
   # Build the WiX MSI installer.
-  in putty/windows with wix do/win candle -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -sval installer.wixobj
+  in putty/windows with wix do/win candle -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj
 
   # Build the old Inno Setup installer.
   in putty/windows with innosetup do/win iscc putty.iss
 
   # Sign the installers.
-  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer.msi Output/setup.exe
+  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer.msi Output/installer.exe
 
   # Finished Windows builds.
   return putty/windows/*.exe
   return putty/windows/*.map
   return putty/doc/putty.chm
   return putty/windows/installer.msi
-  return putty/windows/Output/setup.exe
+  return putty/windows/Output/installer.exe
 enddelegate
 in putty/doc do make mostlyclean
 in putty/doc do make $(Docmakever)
@@ -195,7 +195,7 @@ in putty/doc do zip puttydoc.zip *.html
 deliver putty/windows/*.exe putty/x86/$@
 deliver putty/windows/putty.zip putty/x86/$@
 deliver putty/windows/installer.msi putty/x86/$(Ifilename).msi
-deliver putty/windows/Output/setup.exe putty/x86/$(Ifilename).exe
+deliver putty/windows/Output/installer.exe putty/x86/$(Ifilename).exe
 deliver putty/doc/puttydoc.zip putty/$@
 deliver putty/doc/putty.chm putty/$@
 deliver putty/doc/putty.hlp putty/$@