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

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

1
2
3
4
5

6

7
8
9
10
11
12
13
14
15
16
17

18

19
20
21
22
23
24
25
26
27
28




29
30

#! /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}/

	(
		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 || exit "$?"



	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




fi







>
|
>










|
>

>










>
>
>
>


>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
#! /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