[racket-dev] [plt] Push #24190: master branch updated

Oh, this is simpler than what I've tried previously!  (I tried to make the
installer detect whether it is running in a win64.)  But it looks like it
also uses a different registry key for the 64 version, which will be
confusing -- it will allow installing both (with the latter one grabbing
the extension binding to itself), and something like installing the win64
installer when the 32 version is installed will not uninstall it.  (This is
AFAICT, qualified by viewing it from an ipad (which is also doing it's best
to make me capitalize it's name.  ipad.  ipad.  ipad.))


On Saturday, January 21, 2012,  <mflatt at racket-lang.org> wrote:
> mflatt has updated `master' from f02ec48e16 to 9d48858d53.
>  http://git.racket-lang.org/plt/f02ec48e16..9d48858d53
>
> =====[ 1 Commits ]======================================================
>
> Directory summary:
>  54.6% collects/meta/build/nsis/
>  45.3% collects/meta/build/
>
> ~~~~~~~~~~
>
> 9d48858 Matthew Flatt <mflatt at racket-lang.org> 2012-01-21 07:17
> :
> | try to fix Win64 installer: "Program Files (x86)" => "Program Files"
> :
>  M collects/meta/build/build              |    8 +++++++-
>  M collects/meta/build/nsis/installer.nsi |    2 +-
>
> =====[ Overall Diff ]===================================================
>
> collects/meta/build/build
> ~~~~~~~~~~~~~~~~~~~~~~~~~
> --- OLD/collects/meta/build/build
> +++ NEW/collects/meta/build/build
> @@ -1811,7 +1811,13 @@ tgz_to_exe() {
>     else
>       echo "$def RKTDirName \"$distname\""
>     fi
> -    echo "$def RKTRegName \"$distname-$version\""
> +    if [[ "$srcplatform" = "x86_64-win32" ]]; then
> +      echo "$def RKTRegName \"${distname}-64-$version\""
> +      echo "$def RKTProgFiles \"\$PROGRAMFILES64\""
> +    else
> +      echo "$def RKTRegName \"$distname-$version\""
> +      echo "$def RKTProgFiles \"\$PROGRAMFILES\""
> +    fi
>     if [[ "$pname" = "mz" ]]; then echo "$def SimpleInstaller"; fi
>   } > "racket-defs.nsh" \
>     || exit_error "Could not write \"racket-defs.h\""
>
> collects/meta/build/nsis/installer.nsi
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> --- OLD/collects/meta/build/nsis/installer.nsi
> +++ NEW/collects/meta/build/nsis/installer.nsi
> @@ -18,7 +18,7 @@ BGGradient 4040A0 101020
>
>  SetCompressor /SOLID "LZMA"
>
> -InstallDir "$PROGRAMFILES\${RKTDirName}"
> +InstallDir "${RKTProgFiles}\${RKTDirName}"
>  !ifndef SimpleInstaller
>   InstallDirRegKey HKLM "Software\${RKTRegName}" ""
>  !endif
>

-- 
          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                  http://www.barzilay.org/                 Maze is Life!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.racket-lang.org/dev/archive/attachments/20120121/d09ec634/attachment.html>