suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include the platform in the windows installer's "human name".

Browse Source 
(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 d21e646327)
This commit is contained in:
Eli Barzilay 2012-01-24 07:23:06 -05:00 committed by Ryan Culpepper
parent 9ee130dc49
commit cc50af60c2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collects/meta/build/build
View File

@ -1795,10 +1795,11 @@ tgz_to_exe() {
show "Writing \"racket-defs.nsh\"" show "Writing \"racket-defs.nsh\""
{ local def='!define' { local def='!define'
local distname="$(name_of_dist_package "$pname")" local distname="$(name_of_dist_package "$pname")"
local winplatform="${srcplatform%-win32}"
echo "$def RKTVersion \"$version\"" echo "$def RKTVersion \"$version\""
# this must be four numbers # this must be four numbers
echo "$def RKTVersionLong \"$version1.$version2.$version3.$version4\"" echo "$def RKTVersionLong \"$version1.$version2.$version3.$version4\""
echo "$def RKTHumanName \"$distname v$version\"" echo "$def RKTHumanName \"$distname v$version ($winplatform)\""
if [[ "$releasing" != "yes" ]]; then if [[ "$releasing" != "yes" ]]; then
echo "$def RKTStartName \"$distname v$version\"" echo "$def RKTStartName \"$distname v$version\""
else else
@ -1810,11 +1811,10 @@ tgz_to_exe() {
else else
echo "$def RKTDirName \"$distname\"" echo "$def RKTDirName \"$distname\""
fi fi
if [[ "$srcplatform" = "x86_64-win32" ]]; then echo "$def RKTRegName \"$distname-$winplatform-$version\""
echo "$def RKTRegName \"${distname}-64-$version\"" if [[ "$winplatform" = "x86_64" ]]; then
echo "$def RKTProgFiles \"\$PROGRAMFILES64\"" echo "$def RKTProgFiles \"\$PROGRAMFILES64\""
else else
echo "$def RKTRegName \"$distname-$version\""
echo "$def RKTProgFiles \"\$PROGRAMFILES\"" echo "$def RKTProgFiles \"\$PROGRAMFILES\""
fi fi
if [[ "$pname" = "mz" ]]; then echo "$def SimpleInstaller"; fi if [[ "$pname" = "mz" ]]; then echo "$def SimpleInstaller"; fi

5
collects/meta/web/download/download-pages.rkt
View File

@ -148,6 +148,11 @@
Solaris = /Solaris/; Solaris = /Solaris/;
if (p == null) return []; if (p == null) return [];
else if (l("SunOS")) return [Solaris, Unix]; 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("Win")) return [Win];
else if (l("Mac")) return [(l("Intel")?MacIntel:MacPPC), Mac, Unix]; else if (l("Mac")) return [(l("Intel")?MacIntel:MacPPC), Mac, Unix];
else if (l("Linux")) { else if (l("Linux")) {