`installer.ico' doesn't fit into 8.3, so gets truncated to INSTALLE.ICO in

the Windows source Zips. Rename to `puttyins.ico'.

git-svn-id: svn://svn.tartarus.org/sgt/putty@7241 cda61777-01e9-0310-a592-d414129be87e

diff --git a/icons/Makefile b/icons/Makefile
index 373816f..1074303 100644 (file)
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the PuTTY icon suite.
 
-ICONS = putty puttycfg puttygen pscp pageant pterm ptermcfg installer
+ICONS = putty puttycfg puttygen pscp pageant pterm ptermcfg puttyins
 SIZES = 16 32 48
 
 MODE = # override to -it on command line for opaque testing
@@ -10,7 +10,7 @@ MONOPNGS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S)-mono.png))
 TRUEPNGS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S)-true.png))
 
 ICOS = putty.ico puttygen.ico pscp.ico pageant.ico pageants.ico puttycfg.ico \
-       installer.ico
+       puttyins.ico
 CICONS = xpmputty.c xpmpucfg.c xpmpterm.c xpmptcfg.c
 
 base: icos cicons
@@ -63,11 +63,11 @@ pscp.ico: pscp-16.png pscp-32.png pscp-48.png \
 # Because the installer icon makes heavy use of brown when drawing
 # the cardboard box, it's worth having 8-bit versions of it in
 # addition to the 4- and 1-bit ones.
-installer.ico: installer-16.png installer-32.png installer-48.png \
-               installer-16-mono.png installer-32-mono.png \
-               installer-48-mono.png \
-               installer-16-true.png installer-32-true.png \
-               installer-48-true.png
+puttyins.ico: puttyins-16.png puttyins-32.png puttyins-48.png \
+              puttyins-16-mono.png puttyins-32-mono.png \
+              puttyins-48-mono.png \
+              puttyins-16-true.png puttyins-32-true.png \
+              puttyins-48-true.png
        ./icon.pl -8 $(filter %-true.png, $^) \
                   -4 $(filter-out %-true.png, $(filter-out %-mono.png, $^)) \
                   -1 $(filter %-mono.png, $^) > $@

diff --git a/icons/mkicon.py b/icons/mkicon.py
index cf07630..d40a981 100755 (executable)
--- a/icons/mkicon.py
+++ b/icons/mkicon.py
@@ -795,7 +795,7 @@ def puttygen_icon(size):
 def pscp_icon(size):
     return xybolt(document(size), computer(size), size)
 
-def installer_icon(size):
+def puttyins_icon(size):
     aret = {}
     # The box back goes behind the lightning bolt.
     canvas = xybolt(boxback(size), computer(size), size, boltoffx=-2, boltoffy=+1, aux=aret)

diff --git a/windows/putty.iss b/windows/putty.iss
index 8c40450..0724b20 100644 (file)
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -23,7 +23,7 @@ AppPublisherURL=http://www.chiark.greenend.org.uk/~sgtatham/putty/
 AppReadmeFile={app}\README.txt\r
 DefaultDirName={pf}\PuTTY\r
 DefaultGroupName=PuTTY\r
-SetupIconFile=installer.ico\r
+SetupIconFile=puttyins.ico\r
 UninstallDisplayIcon={app}\putty.exe\r
 ChangesAssociations=yes\r
 ;ChangesEnvironment=yes -- when PATH munging is sorted (probably)\r

diff --git a/windows/installer.ico b/windows/puttyins.ico
similarity index 100%
rename from windows/installer.ico
rename to windows/puttyins.ico