Update build script for Inno Setup 5.5.9.

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.

diff --git a/Buildscr b/Buildscr
index e530ad123046a37ac4d3e8bde6ce6f7456b55745..863f01bd31df7d8d009a00528c0762707bc81128 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -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/$@

diff --git a/windows/putty.iss b/windows/putty.iss
index 5856909e5b5d38dce89094f5dba2bf7b14847fcb..79a4dc4985b715fd4e41f660bc99813719a588f8 100644 (file)
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -28,6 +28,7 @@ ChangesAssociations=yes
 ;ChangesEnvironment=yes -- when PATH munging is sorted (probably)\r
 Compression=zip/9\r
 AllowNoIcons=yes\r
+OutputBaseFilename=installer\r
 \r
 [Files]\r
 ; We flag all files with "restartreplace" et al primarily for the benefit\r