From cc50af60c27f329d6427ea4385f171e6e434bffa Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@barzilay.org>
Date: Tue, 24 Jan 2012 07:23:06 -0500
Subject: [PATCH] Include the platform in the windows installer's "human name".

(Otherwise having both installed can be confusing since the uninstaller
has the same name; also, it's good to make a reminder for people who
want the other one.)

Also, just use the platform string in the registry key uniformly.

Also add a comment about detecting Win64 if it's desirable in the
future.
(cherry picked from commit d21e646327e499dbb056fafeb97c681ce4d7bba2)
---
 collects/meta/build/build                     | 8 ++++----
 collects/meta/web/download/download-pages.rkt | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/collects/meta/build/build b/collects/meta/build/build
index f050dc0ec6..b2268d4ebc 100755
--- a/collects/meta/build/build
+++ b/collects/meta/build/build
@@ -1795,10 +1795,11 @@ tgz_to_exe() {
   show "Writing \"racket-defs.nsh\""
   { local def='!define'
     local distname="$(name_of_dist_package "$pname")"
+    local winplatform="${srcplatform%-win32}"
     echo "$def RKTVersion \"$version\""
     # this must be four numbers
     echo "$def RKTVersionLong \"$version1.$version2.$version3.$version4\""
-    echo "$def RKTHumanName \"$distname v$version\""
+    echo "$def RKTHumanName \"$distname v$version ($winplatform)\""
     if [[ "$releasing" != "yes" ]]; then
       echo "$def RKTStartName \"$distname v$version\""
     else
@@ -1810,11 +1811,10 @@ tgz_to_exe() {
     else
       echo "$def RKTDirName \"$distname\""
     fi
-    if [[ "$srcplatform" = "x86_64-win32" ]]; then
-      echo "$def RKTRegName \"${distname}-64-$version\""
+    echo "$def RKTRegName \"$distname-$winplatform-$version\""
+    if [[ "$winplatform" = "x86_64" ]]; then
       echo "$def RKTProgFiles \"\$PROGRAMFILES64\""
     else
-      echo "$def RKTRegName \"$distname-$version\""
       echo "$def RKTProgFiles \"\$PROGRAMFILES\""
     fi
     if [[ "$pname" = "mz" ]]; then echo "$def SimpleInstaller"; fi
diff --git a/collects/meta/web/download/download-pages.rkt b/collects/meta/web/download/download-pages.rkt
index a0ba3c3d66..ad4c46a66b 100644
--- a/collects/meta/web/download/download-pages.rkt
+++ b/collects/meta/web/download/download-pages.rkt
@@ -148,6 +148,11 @@
           Solaris  = /Solaris/;
       if (p == null) return [];
       else if (l("SunOS")) return [Solaris, Unix];
+      @; Note about Windows 64: seems like the best guess could be done by
+      @; checking that the platform has "Win64" or navigator.userAgent has
+      @; either "Win64" or "WOW64".  But the 32 build might be better for many
+      @; people anyway, so keep things as is for now.  (With the `Win' filter
+      @; which will get the 32 version first and the 64 second.)
       else if (l("Win"))   return [Win];
       else if (l("Mac"))   return [(l("Intel")?MacIntel:MacPPC), Mac, Unix];
       else if (l("Linux")) {