shithub: puzzles

Info  •  Files  •  Log  •  Branches

Update build script for Inno Setup 5.5.9.

Between 5.5.6 and 5.5.9 the default output file name changed. To
defend against that potentially happening again, I'm now explicitly
specifying the output file name in the .iss source file (or rather, in
winiss.pl, which constructs it).

--- a/Buildscr

+++ b/Buildscr

@@ -71,10 +71,10 @@

   # Build installers.

   in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj

   in puzzles with innosetup do/win iscc puzzles.iss

-  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi Output/setup.exe

+  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi Output/installer.exe

   return puzzles/puzzles.chm

   return puzzles/*.exe

-  return puzzles/Output/setup.exe

+  return puzzles/Output/installer.exe

   return puzzles/puzzles.msi

 enddelegate

 in puzzles do chmod +x *.exe

@@ -179,7 +179,7 @@

 deliver puzzles/puzzles.cnt $@

 deliver puzzles/puzzles.zip $@

 deliver puzzles/puzzles.msi puzzles-$(Version)-installer.msi

-deliver puzzles/Output/setup.exe puzzles-$(Version)-installer.exe

+deliver puzzles/Output/installer.exe puzzles-$(Version)-installer.exe

 deliver puzzles/*.jar java/$@

 deliver puzzles/js/*.js js/$@

 deliver puzzles/html/*.html html/$@

--- a/winiss.pl

+++ b/winiss.pl

@@ -56,6 +56,7 @@

 print 'ChangesAssociations=no'."\n";

 print 'Compression=zip/9'."\n";

 print 'AllowNoIcons=yes'."\n";

+print 'OutputBaseFilename=installer'."\n";

 print ''."\n";

 print '[Files]'."\n";

 for $exe (@exes) {