Check-in [4753676e99]
Overview
Comment:More work on the Mac OS X remote-build script
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:4753676e99fadc4623f042f6c65096fa9a5c5c2c
User & Date: rkeene on 2015-04-02 21:31:07
Other Links: manifest | tags
Context
2015-05-29
17:08
Fixed bug where dynamictk was always applied check-in: 360c2ef691 user: rkeene tags: trunk
2015-05-19
16:15
Fixes for building kits using Xcode tools on native OSX Leaf check-in: a61b7cb057 user: hypnotoad tags: osx_fixes
2015-05-11
20:42
Fix hard-coded use of './kit' in the kitsh build script. check-in: 675f0fb1bf user: mistachkin tags: kitTargetNameFix
2015-04-02
21:31
More work on the Mac OS X remote-build script check-in: 4753676e99 user: rkeene tags: trunk
21:25
Fixed deletion of temporary directories for remote builds for Mac OS X check-in: fd476dce2a user: rkeene tags: trunk
Changes

Modified build/make-kit-powermacg5 from [23d9803274] to [9ceb1cf4f7].

     1      1   #! /bin/bash
     2      2   
     3      3   if [ "$(uname -s)" != 'Darwin' ]; then
     4      4   	buildid="$(( hostname; id -u; pwd ) | openssl sha1 | sed 's@^.*= *@@')"
     5      5   	workdir="/tmp/work-kitcreator-${buildid}"
     6         -	rsync -aq --delete -e ssh . powermacg5.vpn.oc9.org:${workdir}/
            6  +
            7  +	rsync -aq --delete -e ssh . powermacg5.vpn.oc9.org:${workdir}/ || exit 1
            8  +
     7      9   	(
     8     10   		newArgv=("$@"); declare -p newArgv
     9     11   		declare -p workdir
    10     12   		export
    11     13   		cat << \_EOF_
    12     14   cd "${workdir}" || exit 1
    13     15   export PATH="${PATH}:/usr/local/bin:/usr/bin"
    14     16   ./kitcreator "${newArgv[@]}"
    15     17   exit "$?"
    16     18   _EOF_
    17         -	) | ssh powermacg5.vpn.oc9.org bash -s || exit "$?"
           19  +	) | ssh powermacg5.vpn.oc9.org bash -s
           20  +	retval="$?"
    18     21   
           22  +	rm -f */build.log
    19     23   	ssh powermacg5.vpn.oc9.org "workdir='${workdir}'; "'cd "${workdir}" && tar -cf - tclkit-* libtclkit* */build.log 2>/dev/null' | tar -xf -
    20     24   
    21     25   	# Clean-up if appropriate
    22     26   	case "$(pwd)" in
    23     27   		/home/rkeene/*)
    24     28   			;;
    25     29   		*)
    26     30   			ssh powermacg5.vpn.oc9.org "workdir='${workdir}'; "'rm -rf "${workdir}"'
    27     31   			;;
    28     32   	esac
           33  +
           34  +	exit "${retval}"
           35  +else
           36  +	exec ./kitcreator "$@"
    29     37   fi
    30     38   
           39  +exit 1