diff --git a/Buildscr b/Buildscr index de7f41b5..8bd680df 100644 --- a/Buildscr +++ b/Buildscr @@ -177,11 +177,8 @@ delegate windows in putty/windows with wix do/win candle -arch x86 -dWin64=no -dBuilddir=build32\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer32.msi in putty/windows with wix do/win candle -arch x64 -dWin64=yes -dBuilddir=build64\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer64.msi - # Build the old Inno Setup installer, for 32-bit only. - in putty/windows with innosetup do/win iscc putty.iss - # Sign the installers. - ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi Output/installer.exe + ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi # Finished Windows builds. return putty/windows/buildold/*.exe @@ -192,7 +189,6 @@ delegate windows return putty/windows/build64/*.map return putty/windows/installer32.msi return putty/windows/installer64.msi - return putty/windows/Output/installer.exe enddelegate in putty/doc do make mostlyclean in putty/doc do make $(Docmakever) @@ -210,7 +206,6 @@ deliver putty/windows/build64/*.exe putty/w64/$@ deliver putty/windows/build64/putty.zip putty/w64/$@ deliver putty/windows/installer32.msi putty/w32/$(Ifilename32).msi deliver putty/windows/installer64.msi putty/w64/$(Ifilename64).msi -deliver putty/windows/Output/installer.exe putty/w32/$(Ifilename32).exe deliver putty/doc/puttydoc.zip putty/$@ deliver putty/doc/putty.chm putty/$@ deliver putty/doc/putty.hlp putty/$@