diff --git a/collects/meta/build/build b/collects/meta/build/build index 14b449dddb..b9b5fb3baa 100755 --- a/collects/meta/build/build +++ b/collects/meta/build/build @@ -103,6 +103,8 @@ defbuild "ccs-linux" "i386-linux-ubuntu-jaunty" "moveto=/proj/racket" # These builds are courtesy of Mason Loring Bliss defbuild "blisses1" "x86_64-linux-debian-lenny" defbuild "blisses2" "x86_64-linux-debian-squeeze" +# And this is from Stephen De Gabrielle +defbuild "osx64" "x86_64-osx-mac" # Start the main build last defbuild "$workmachine" "x86_64-linux-f14" "copytobak=$maindir" "test_gui=yes" msets "/" @@ -216,6 +218,7 @@ name_of_platform() { ( "sparc-solaris" ) echo "Solaris" ;; ( "i386-osx-mac" ) echo "Mac OS X (Intel)" ;; ( "ppc-osx-mac" ) echo "Mac OS X (PPC)" ;; + ( "x86_64-osx-mac" ) echo "Mac OS X (x86_64)" ;; ( "ppc-darwin" ) echo "Mac X11 on Darwin (PPC)" ;; ( "i386-darwin" ) echo "Mac X11 on Darwin (Intel)" ;; ( "i386-win32" ) echo "Windows" ;; @@ -269,6 +272,7 @@ platforms_of_dist_type() { "x86_64-win32" \ "i386-osx-mac" \ "ppc-osx-mac" \ + "x86_64-osx-mac" \ "ppc-darwin" \ "i386-darwin" \ "i386-linux" \ diff --git a/collects/meta/dist-specs.rkt b/collects/meta/dist-specs.rkt index da01e9e5de..1f04fcaa6c 100644 --- a/collects/meta/dist-specs.rkt +++ b/collects/meta/dist-specs.rkt @@ -112,6 +112,7 @@ ppc-darwin :=tag unix i386-darwin :=tag unix ppc-osx-mac :=tag mac i386-osx-mac :=tag mac +x86_64-osx-mac :=tag mac sparc-solaris :=tag unix ;; tag specs to make each distribution a proper superset of the previous @@ -722,6 +723,7 @@ platform sparc-solaris => "Solaris" ppc-osx-mac => "Mac OS X (PPC)" i386-osx-mac => "Mac OS X (Intel)" + i386-osx-mac => "Mac OS X (x86_64)" ppc-darwin => "Mac OS X using X11 (PPC)" i386-darwin => "Mac OS X using X11 (Intel)" i386-win32 => "Windows" diff --git a/collects/meta/web/download/data.rkt b/collects/meta/web/download/data.rkt index 8f7a975bc3..a3daab4a72 100644 --- a/collects/meta/web/download/data.rkt +++ b/collects/meta/web/download/data.rkt @@ -54,9 +54,10 @@ ;; binary platforms ["i386-win32" "Windows x86"] ["x86_64-win32" "Windows x64"] - ["(ppc|i386)-osx-mac" + ["(ppc|i386|x86_64)-osx-mac" ,(lambda (_ cpu) - (format "Macintosh OS X (~a)" (if (equal? cpu "ppc") "PPC" "Intel")))] + (format "Macintosh OS X (~a)" + (if (equal? cpu "ppc") "PPC" (format "Intel ~a" cpu))))] ["(ppc|68k)-mac-classic" "Macintosh Classic (\\1)"] ["(ppc|i386)-darwin" ,(lambda (_ cpu)