Minor memory leak spotted by Mikhail Kruk.

[sgt/putty] / windows / putty.iss

diff --git a/windows/putty.iss b/windows/putty.iss
index e6d6656..4af117d 100644 (file)
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -5,26 +5,32 @@
 ;\r
 ; TODO for future releases:\r
 ;\r
-;  - It would be neighbourly to set up an [UninstallRun] entry that ran\r
-;    some close cousin of `putty -cleanup', only it should prompt first\r
-;    in case the user wants to keep stuff. And make the `leave it alone'\r
-;    button the DEFAULT. And perhaps warn that on NT-style systems not\r
-;    everything will be caught by this.\r
+;  - It might be nice to have an option to add PSCP, Plink and PSFTP to\r
+;    the PATH. This is probably only practical on NT-class systems; I\r
+;    believe doing this on 9x would require mucking around with\r
+;    AUTOEXEC.BAT.\r
 ;\r
-;  - The Quick Launch bar is an interesting thought. Certainly a fair\r
-;    number of people actually _believe_ my silly joke about how PuTTY\r
-;    is the only thing that makes Windows usable, so perhaps they'd like\r
-;    that. Unchecked by default, though, I think.\r
-;     * does this need to be conditional on the Windows version?\r
+;  - Maybe a "custom" installation might be useful? Hassle with icons,\r
+;    though.\r
 \r
 [Setup]\r
 AppName=PuTTY\r
-AppVerName=PuTTY version 0.56\r
+AppVerName=PuTTY version 0.58\r
+VersionInfoTextVersion=Release 0.58\r
+AppVersion=0.58\r
+;FIXME -- enable this when we've got it going for individual EXEs too\r
+;         and are committed to the version numbering scheme.\r
+;VersionInfoVersion=0.58.0.0\r
+AppPublisher=Simon Tatham\r
+AppPublisherURL=http://www.chiark.greenend.org.uk/~sgtatham/putty/\r
+AppReadmeFile={app}\README.txt\r
 DefaultDirName={pf}\PuTTY\r
 DefaultGroupName=PuTTY\r
 UninstallDisplayIcon={app}\putty.exe\r
 ChangesAssociations=yes\r
+;ChangesEnvironment=yes -- when PATH munging is sorted (probably)\r
 Compression=zip/9\r
+AllowNoIcons=yes\r
 \r
 [Files]\r
 Source: "putty.exe"; DestDir: "{app}"\r
@@ -40,18 +46,23 @@ Source: "..\LICENCE"; DestDir: "{app}"
 Source: "..\README.txt"; DestDir: "{app}"; Flags: isreadme\r
 \r
 [Icons]\r
-Name: "{group}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: startmenu\r
-Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.hlp"; Tasks: startmenu\r
-Name: "{group}\PuTTY Web Site"; Filename: "{app}\website.url"; Tasks: startmenu\r
-Name: "{group}\PSFTP"; Filename: "{app}\psftp.exe"; Tasks: startmenu\r
-Name: "{group}\PuTTYgen"; Filename: "{app}\puttygen.exe"; Tasks: startmenu\r
-Name: "{group}\Pageant"; Filename: "{app}\pageant.exe"; Tasks: startmenu\r
-Name: "{userdesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\r
+Name: "{group}\PuTTY"; Filename: "{app}\putty.exe"; Comment: "SSH, Telnet and Rlogin client";\r
+Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.hlp"\r
+Name: "{group}\PuTTY Web Site"; Filename: "{app}\website.url"\r
+Name: "{group}\PSFTP"; Filename: "{app}\psftp.exe"; Comment: "Command-line interactive SFTP client"\r
+Name: "{group}\PuTTYgen"; Filename: "{app}\puttygen.exe"; Comment: "PuTTY SSH key generation utility"\r
+Name: "{group}\Pageant"; Filename: "{app}\pageant.exe"; Comment: "PuTTY SSH authentication agent"\r
+Name: "{commondesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\common\r
+Name: "{userdesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\user\r
+; Putting this in {commonappdata} doesn't seem to work, on 98SE at least.\r
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\PuTTY"; Filename: "{app}\putty.exe"; Tasks: quicklaunchicon\r
 \r
 [Tasks]\r
-Name: startmenu; Description: "Create a &Start Menu group"\r
-Name: desktopicon; Description: "Create a &desktop icon for PuTTY"\r
-Name: associate; Description: "&Associate .PPK files (PuTTY Private Key) with Pageant"\r
+Name: desktopicon; Description: "Create a &desktop icon for PuTTY"; GroupDescription: "Additional icons:"; Flags: unchecked\r
+Name: desktopicon\common; Description: "For all users"; GroupDescription: "Additional icons:"; Flags: exclusive unchecked\r
+Name: desktopicon\user; Description: "For the current user only"; GroupDescription: "Additional icons:"; Flags: exclusive unchecked\r
+Name: quicklaunchicon; Description: "Create a &Quick Launch icon for PuTTY (current user only)"; GroupDescription: "Additional icons:"; Flags: unchecked\r
+Name: associate; Description: "&Associate .PPK files (PuTTY Private Key) with Pageant and PuTTYgen"; GroupDescription: "Other tasks:"\r
 \r
 [Registry]\r
 Root: HKCR; Subkey: ".ppk"; ValueType: string; ValueName: ""; ValueData: "PuTTYPrivateKey"; Flags: uninsdeletevalue; Tasks: associate\r
@@ -60,3 +71,9 @@ Root: HKCR; Subkey: "PuTTYPrivateKey\DefaultIcon"; ValueType: string; ValueName:
 Root: HKCR; Subkey: "PuTTYPrivateKey\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\pageant.exe"" ""%1"""; Tasks: associate\r
 Root: HKCR; Subkey: "PuTTYPrivateKey\shell\edit"; ValueType: string; ValueName: ""; ValueData: "&Edit"; Tasks: associate\r
 Root: HKCR; Subkey: "PuTTYPrivateKey\shell\edit\command"; ValueType: string; ValueName: ""; ValueData: """{app}\puttygen.exe"" ""%1"""; Tasks: associate\r
+; Add to PATH on NT-class OS?\r
+\r
+[UninstallRun]\r
+; -cleanup-during-uninstall is an undocumented option that tailors the\r
+; message displayed.\r
+Filename: "{app}\putty.exe"; Parameters: "-cleanup-during-uninstall"; RunOnceId: "PuTTYCleanup"; StatusMsg: "Cleaning up saved sessions etc (optional)..."\r