nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-10 15:48:06 -05:00
Code Issues Projects Releases Wiki Activity

Update build script for Inno Setup 5.5.9.

Browse Source 
I've just upgraded my build environment to the latest Inno Setup
(apparently fixing some DLL hijacking issues), and found that the
build script doesn't run any more because the name of the output file
has changed - it used to produce Output/setup.exe, but now it produces
Output/mysetup.exe.

Rather than just fixing the build script to expect the new name, I've
explicitly specified an output filename of my own choice in putty.iss,
so that the build script should now work with versions before and
after the change.
This commit is contained in:
Simon Tatham 2016-04-08 11:00:08 +01:00
parent f0f19b6147
commit d29d33e165
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Buildscr
View File

@ -177,14 +177,14 @@ delegate windows
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/$@

1
windows/putty.iss
View File

@ -28,6 +28,7 @@ ChangesAssociations=yes
;ChangesEnvironment=yes -- when PATH munging is sorted (probably)
Compression=zip/9
AllowNoIcons=yes
OutputBaseFilename=installer
[Files]
; We flag all files with "restartreplace" et al primarily for the benefit