Differences From Artifact [9ac6c7313f]:
- Executable file kitsh/build.sh — part of check-in [4fa3b7d3ea] at 2011-05-17 01:33:09 on branch trunk — Updated to pull user-specified (or default) kit.ico and kit.rc into Tk, if built and not include KitSH's own resource file when including Tk's since they conflict (user: rkeene, size: 3381) [annotate] [blame] [check-ins using] [more...]
To Artifact [2d7f94aadf]:
- Executable file
kitsh/build.sh
— part of check-in
[b5b42e2343]
at
2011-05-20 06:31:32
on branch merge-kitdll-kitsh-common
— Fixed bug with determining which build is selected
Fixed unexplained bug with determining the target OS information Updated to supply the VFS before building (in support of future C-VFS) (user: rkeene, size: 3381) [annotate] [blame] [check-ins using] 
| ︙ | ︙ | |||
| 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | 
(
	cp -r 'buildsrc' 'build'
	cd "${BUILDDIR}" || exit 1
	# Cleanup, just incase the incoming directory was not pre-cleaned
	${MAKE:-make} distclean >/dev/null 2>/dev/null
	# Figure out if zlib compiled (if not, the system zlib will be used and we
	# will need to have that present)
	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
	export ZLIBDIR
	if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
		unset ZLIBDIR
	fi
 | > > > > > > > > > > > > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | 
(
	cp -r 'buildsrc' 'build'
	cd "${BUILDDIR}" || exit 1
	# Cleanup, just incase the incoming directory was not pre-cleaned
	${MAKE:-make} distclean >/dev/null 2>/dev/null
	# Create VFS directory
	mkdir "starpack.vfs"
	mkdir "starpack.vfs/lib"
	## Copy in all built directories
	cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/'
	## Rename the "vfs" package directory to what "boot.tcl" expects
	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
	## Install "boot.tcl"
	cp 'boot.tcl' 'starpack.vfs/'
	# Figure out if zlib compiled (if not, the system zlib will be used and we
	# will need to have that present)
	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
	export ZLIBDIR
	if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
		unset ZLIBDIR
	fi
 | 
| ︙ | ︙ | |||
| 77 78 79 80 81 82 83 | 
	echo "Running: ${MAKE:-make}"
	${MAKE:-make} || exit 1
	# Strip the kit of all symbols, if possible
	"${STRIP:-strip}" kit >/dev/null 2>/dev/null
 | < < < < < < < < < < < < < | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | 
	echo "Running: ${MAKE:-make}"
	${MAKE:-make} || exit 1
	# Strip the kit of all symbols, if possible
	"${STRIP:-strip}" kit >/dev/null 2>/dev/null
	# Intall VFS onto kit
	## Determine if we have a Tclkit to do this work
	TCLKIT="${TCLKIT:-tclkit}"
	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
		## Install using existing Tclkit
		### Call installer
		echo "Running: \"${TCLKIT}\" installvfs.tcl kit starpack.vfs \"${ENABLECOMPRESSION}\""
 | 
| ︙ | ︙ |