From d69a45210cd67009a54ee5e47d922af23049b872 Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@barzilay.org>
Date: Wed, 25 Jan 2012 08:44:24 -0500
Subject: [PATCH] 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.)
---
 collects/meta/build/build              |  2 ++
 collects/meta/build/nsis/installer.nsi | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/collects/meta/build/build b/collects/meta/build/build
index 202f7b8727..df7a9b4362 100755
--- a/collects/meta/build/build
+++ b/collects/meta/build/build
@@ -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
diff --git a/collects/meta/build/nsis/installer.nsi b/collects/meta/build/nsis/installer.nsi
index 2fc114dee0..c82f7ae5b9 100644
--- a/collects/meta/build/nsis/installer.nsi
+++ b/collects/meta/build/nsis/installer.nsi
@@ -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