From 52e609ff6ab1795b690e73ef9f49187f3bbad65f Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 17 Jan 2012 09:25:57 -0500 Subject: [PATCH] Have a default "" platform so kauai can still be used to make the dmgs. (This is just a hack, $platform should really be used only in the build functions instead of at the toplevel.) (cherry picked from commit 52382442f0d1367994ea2d8e4fa137996df70c26) --- collects/meta/build/build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/collects/meta/build/build b/collects/meta/build/build index bde6d16d0a..840919248f 100755 --- a/collects/meta/build/build +++ b/collects/meta/build/build @@ -74,7 +74,7 @@ defbuild() { # entries, with misc fields set. Machines and platforms must be unique. The # "D" first entry is for default field values (missing default makes the field # required). Warning: an `eval "foo=\"bar\""' is used to assign values. -msets "/machines/D" "workdir=/var/tmp" "moveto=" "copytobak=" \ +msets "/machines/D" "platform=" "workdir=/var/tmp" "moveto=" "copytobak=" \ "configure_args=" "LDFLAGS=" "ext_lib_paths=" "renice=" \ "more_setup_args=" "test_gui=" # defbuild "ccs-solaris" "sparc-solaris" "moveto=/proj/racket" \ @@ -2205,9 +2205,11 @@ if [[ "$1" = "--dispatch" ]]; then init_repo_vars # set the repository variables according to the env vars machineget platform # set the global platform for dependable script pieces if [[ "${machine:-$workmachine}" != "$workmachine" ]]; then - machine_suffix=" [$machine($platform)]" + if [[ "$platform" = "" ]]; then machine_suffix=" [$machine]" + else machine_suffix=" [$machine($platform)]"; fi fi - show "Working on $machine($platform)" + if [[ "$platform" = "" ]]; then show "Working on $machine" + else show "Working on $machine($platform)"; fi show "Dispatching to $go($*)" "$go" "$@" show "Done working on $machine($platform)"