Add `$RKTShortName' that doesn't include the version and the platform,

use it to improve some installer texts.

(Also update comment about required macro definitions.)
This commit is contained in:
Eli Barzilay 2012-01-25 08:44:24 -05:00
parent 5c977f3471
commit d69a45210c
2 changed files with 7 additions and 5 deletions

View File

@ -1800,7 +1800,9 @@ tgz_to_exe() {
echo "$def RKTVersion \"$version\""
# this must be four numbers
echo "$def RKTVersionLong \"$version1.$version2.$version3.$version4\""
# Full name for the package, and a short name for installer texts
echo "$def RKTHumanName \"$distname v$version ($winplatform)\""
echo "$def RKTShortName \"$distname\""
if [[ "$releasing" != "yes" ]]; then
echo "$def RKTStartName \"$distname v$version\""
else

View File

@ -5,8 +5,8 @@
;; ==================== Configuration
;; The following should define:
;; RKTVersion, RKTVersionLong, RKTHumanName,
;; RKTDirName, RKTRegName
;; RKTVersion, RKTVersionLong, RKTHumanName, RKTShortName,
;; RKTStartName, RKTDirName, RKTRegName, RKTProgFiles
!include racket-defs.nsh
@ -36,11 +36,11 @@ InstallDir "${RKTProgFiles}\${RKTDirName}"
!define MUI_WELCOMEPAGE_TITLE "${RKTHumanName} Setup"
!define MUI_UNWELCOMEPAGE_TITLE "${RKTHumanName} Uninstall"
!ifdef SimpleInstaller
!define MUI_WELCOMEPAGE_TEXT "This is a simple installer for ${RKTHumanName}.$\r$\n$\r$\nIt will only create the Racket folder. To uninstall, simply remove the folder.$\r$\n$\r$\n$_CLICK"
!define MUI_WELCOMEPAGE_TEXT "This is a simple installer for ${RKTShortName}.$\r$\n$\r$\nIt will only create the Racket folder. To uninstall, simply remove the folder.$\r$\n$\r$\n$_CLICK"
!else
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of ${RKTHumanName}.$\r$\n$\r$\nPlease close other Racket applications so the installer can update relevant system files.$\r$\n$\r$\n$_CLICK"
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of ${RKTShortName}.$\r$\n$\r$\nPlease close any running Racket applications so the installer can update the relevant system files.$\r$\n$\r$\n$_CLICK"
!endif
!define MUI_UNWELCOMEPAGE_TEXT "This wizard will guide you through the removal of ${RKTHumanName}.$\r$\n$\r$\nBefore starting, make sure no Racket applications are running.$\r$\n$\r$\n$_CLICK"
!define MUI_UNWELCOMEPAGE_TEXT "This wizard will guide you through the removal of ${RKTShortName}.$\r$\n$\r$\nBefore starting, make sure no Racket applications are running.$\r$\n$\r$\n$_CLICK"
!define MUI_FINISHPAGE_TITLE "${RKTHumanName}"
!ifdef SimpleInstaller