X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/8855e10ac58cafaf6ae95b4695c3332ceada887d..b4bc538452c92b6a2f9c935028461f5c774a4f1f:/windows/putty.iss

diff --git a/windows/putty.iss b/windows/putty.iss
index 01a73747..f9679160 100644
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -2,6 +2,7 @@
 ; $Id$
 ;
 ; -- Inno Setup installer script for PuTTY and its related tools.
+;    Last tested with Inno Setup 5.0.8.
 ;
 ; TODO for future releases:
 ;
@@ -13,15 +14,16 @@
 
 [Setup]
 AppName=PuTTY
-AppVerName=PuTTY version 0.58
-VersionInfoTextVersion=Release 0.58
-AppVersion=0.58
-VersionInfoVersion=0.58.0.0
+AppVerName=PuTTY version 0.62
+VersionInfoTextVersion=Release 0.62
+AppVersion=0.62
+VersionInfoVersion=0.62.0.0
 AppPublisher=Simon Tatham
 AppPublisherURL=http://www.chiark.greenend.org.uk/~sgtatham/putty/
 AppReadmeFile={app}\README.txt
 DefaultDirName={pf}\PuTTY
 DefaultGroupName=PuTTY
+SetupIconFile=puttyins.ico
 UninstallDisplayIcon={app}\putty.exe
 ChangesAssociations=yes
 ;ChangesEnvironment=yes -- when PATH munging is sorted (probably)
@@ -48,14 +50,18 @@ Source: "pscp.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion re
 Source: "psftp.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
 Source: "plink.exe"; DestDir: "{app}"; Flags: promptifolder replacesameversion restartreplace uninsrestartdelete
 Source: "website.url"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
+Source: "..\doc\putty.chm"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
 Source: "..\doc\putty.hlp"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
 Source: "..\doc\putty.cnt"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
 Source: "..\LICENCE"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
-Source: "..\README.txt"; DestDir: "{app}"; Flags: isreadme restartreplace uninsrestartdelete
+Source: "README.txt"; DestDir: "{app}"; Flags: isreadme restartreplace uninsrestartdelete
 
 [Icons]
 Name: "{group}\PuTTY"; Filename: "{app}\putty.exe"
-Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.hlp"
+; We have to fall back from the .chm to the older .hlp file on some Windows
+; versions.
+Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.chm"; MinVersion: 4.1,5.0
+Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.hlp"; OnlyBelowVersion: 4.1,5.0
 Name: "{group}\PuTTY Web Site"; Filename: "{app}\website.url"
 Name: "{group}\PSFTP"; Filename: "{app}\psftp.exe"
 Name: "{group}\PuTTYgen"; Filename: "{app}\puttygen.exe"
@@ -87,3 +93,14 @@ Root: HKCR; Subkey: "PuTTYPrivateKey\shell\edit\command"; ValueType: string; Val
 ; XXX: it would be nice if this task weren't run if a silent uninstall is
 ;      requested, but "skipifsilent" is disallowed.
 Filename: "{app}\putty.exe"; Parameters: "-cleanup-during-uninstall"; RunOnceId: "PuTTYCleanup"; StatusMsg: "Cleaning up saved sessions etc (optional)..."
+
+[Messages]
+; Since it's possible for the user to be asked to restart their computer,
+; we should override the default messages to explain exactly why, so they
+; can make an informed decision. (Especially as 95% of users won't need or
+; want to restart; see rant above.)
+FinishedRestartLabel=One or more [name] programs are still running. Setup will not replace these program files until you restart your computer. Would you like to restart now?
+; This message is popped up in a message box on a /SILENT install.
+FinishedRestartMessage=One or more [name] programs are still running.%nSetup will not replace these program files until you restart your computer.%n%nWould you like to restart now?
+; ...and this comes up if you try to uninstall.
+UninstalledAndNeedsRestart=One or more %1 programs are still running.%nThe program files will not be removed until your computer is restarted.%n%nWould you like to restart now?