Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -144,6 +144,6 @@ kitdll/buildsrc/kitdll-0.0/vfs_kitdll_data_tcl.c kitdll/buildsrc/kitdll-0.0/vfs_kitdll.tcl.h kitdll/build/kitdll-* kitdll/build/kitdll-*/* kitdll/build.log -libtclkit-*.* +libtclkit*.* Index: build/make-kit-macosx-amd64 ================================================================== --- build/make-kit-macosx-amd64 +++ build/make-kit-macosx-amd64 @@ -2,6 +2,6 @@ CC='gcc -arch x86_64' CXX='g++ -arch x86_64' export CC CXX -./build/make-kit-powermacg5 "$@" --enable-aqua --host=x86_64-apple-darwin9 +./build/make-kit-remote buildb.wu.ac.at "$@" --enable-aqua --host=x86_64-apple-darwin9 Index: build/make-kit-macosx-i386 ================================================================== --- build/make-kit-macosx-i386 +++ build/make-kit-macosx-i386 @@ -2,6 +2,6 @@ CC='gcc -arch i386' CXX='g++ -arch i386' export CC CXX -./build/make-kit-powermacg5 "$@" --enable-aqua --host=i386-apple-darwin9 +./build/make-kit-remote buildb.wu.ac.at "$@" --enable-aqua --host=i386-apple-darwin9 Index: build/make-kit-macosx-ppc ================================================================== --- build/make-kit-macosx-ppc +++ build/make-kit-macosx-ppc @@ -1,3 +1,3 @@ #! /bin/sh -./build/make-kit-powermacg5 "$@" --enable-aqua +./build/make-kit-remote powermacg5.vpn.oc9.org "$@" --enable-aqua Index: build/make-kit-macosx-ppc64 ================================================================== --- build/make-kit-macosx-ppc64 +++ build/make-kit-macosx-ppc64 @@ -2,6 +2,6 @@ CC='gcc -arch ppc64' CXX='g++ -arch ppc64' export CC CXX -./build/make-kit-powermacg5 "$@" --enable-aqua +./build/make-kit-remote powermacg5.vpn.oc9.org "$@" --enable-aqua DELETED build/make-kit-powermacg5 Index: build/make-kit-powermacg5 ================================================================== --- build/make-kit-powermacg5 +++ build/make-kit-powermacg5 @@ -1,39 +0,0 @@ -#! /bin/bash - -if [ "$(uname -s)" != 'Darwin' ]; then - buildid="$(( hostname; id -u; pwd ) | openssl sha1 | sed 's@^.*= *@@')" - workdir="/tmp/work-kitcreator-${buildid}" - - rsync -aq --delete -e ssh . powermacg5.vpn.oc9.org:${workdir}/ || exit 1 - - ( - newArgv=("$@"); declare -p newArgv - declare -p workdir - export - cat << \_EOF_ -cd "${workdir}" || exit 1 -export PATH="${PATH}:/usr/local/bin:/usr/bin" -./kitcreator "${newArgv[@]}" -exit "$?" -_EOF_ - ) | ssh powermacg5.vpn.oc9.org bash -s - retval="$?" - - rm -f */build.log - ssh powermacg5.vpn.oc9.org "workdir='${workdir}'; "'cd "${workdir}" && tar -cf - tclkit-* libtclkit* */build.log 2>/dev/null' | tar -xf - - - # Clean-up if appropriate - case "$(pwd)" in - /home/rkeene/*) - ;; - *) - ssh powermacg5.vpn.oc9.org "workdir='${workdir}'; "'rm -rf "${workdir}"' - ;; - esac - - exit "${retval}" -else - exec ./kitcreator "$@" -fi - -exit 1 ADDED build/make-kit-remote Index: build/make-kit-remote ================================================================== --- build/make-kit-remote +++ build/make-kit-remote @@ -0,0 +1,36 @@ +#! /bin/bash + +TARGET="$1" +shift + +buildid="$(( hostname; id -u; pwd ) | openssl sha1 | sed 's@^.*= *@@')" +workdir="/tmp/work-kitcreator-${buildid}" + +rsync -aq --delete -e ssh . "${TARGET}:${workdir}/" || exit 1 + +( + newArgv=("$@"); declare -p newArgv + declare -p workdir + export + cat << \_EOF_ +cd "${workdir}" || exit 1 +export PATH="${PATH}:/usr/local/bin:/usr/bin" +./kitcreator "${newArgv[@]}" +exit "$?" +_EOF_ +) | ssh "${TARGET}" bash -s +retval="$?" + +rm -f */build.log +ssh "${TARGET}" "workdir='${workdir}'; "'cd "${workdir}" && tar -cf - tclkit-* libtclkit* */build.log 2>/dev/null' | tar -xf - + +# Clean-up if appropriate +case "$(pwd)" in + /home/rkeene/*) + ;; + *) + ssh "${TARGET}" "workdir='${workdir}'; "'rm -rf "${workdir}"' + ;; +esac + +exit "${retval}" Index: kitcreator ================================================================== --- kitcreator +++ kitcreator @@ -20,11 +20,11 @@ shift fi export TCLVERS # Add the helpers directory to the path -PATH="$(dirname "$(which "$0")")"/common/helpers:"${PATH}" +PATH="$(cd "$(dirname "$(which "$0")")" && pwd)"/common/helpers:"${PATH}" export PATH # Verify that "pre.sh" has been run if this is a development snapshot of # KitCreator if [ -f 'build/pre.sh' ]; then