zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update build script for Inno Setup 5.5.9.

Browse Source 
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).
This commit is contained in:
Simon Tatham
2016-04-09 11:44:03 +01:00
parent c0bc13c3f2
commit 9d15092e7f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Buildscr
View File

@ -71,10 +71,10 @@ delegate windows
# Build installers. # Build installers.
in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj
in puzzles with innosetup do/win iscc puzzles.iss 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/puzzles.chm
return puzzles/*.exe return puzzles/*.exe
return puzzles/Output/setup.exe return puzzles/Output/installer.exe
return puzzles/puzzles.msi return puzzles/puzzles.msi
enddelegate enddelegate
in puzzles do chmod +x *.exe in puzzles do chmod +x *.exe
@ -179,7 +179,7 @@ deliver puzzles/puzzles.hlp $@
deliver puzzles/puzzles.cnt $@ deliver puzzles/puzzles.cnt $@
deliver puzzles/puzzles.zip $@ deliver puzzles/puzzles.zip $@
deliver puzzles/puzzles.msi puzzles-$(Version)-installer.msi 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/*.jar java/$@
deliver puzzles/js/*.js js/$@ deliver puzzles/js/*.js js/$@
deliver puzzles/html/*.html html/$@ deliver puzzles/html/*.html html/$@

1
winiss.pl
View File

@ -56,6 +56,7 @@ print 'DefaultGroupName=Simon Tatham\'s Puzzles'."\n";
print 'ChangesAssociations=no'."\n"; print 'ChangesAssociations=no'."\n";
print 'Compression=zip/9'."\n"; print 'Compression=zip/9'."\n";
print 'AllowNoIcons=yes'."\n"; print 'AllowNoIcons=yes'."\n";
print 'OutputBaseFilename=installer'."\n";
print ''."\n"; print ''."\n";
print '[Files]'."\n"; print '[Files]'."\n";
for $exe (@exes) { for $exe (@exes) {