Check-in [aae12ba51d]
Overview
Comment:Updated to support trying local tclsh if cross-compiling and no Tclkit is available
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:aae12ba51dc235e339e37bc7a7384e941100c8ea
User & Date: rkeene on 2014-06-02 01:39:12
Other Links: manifest | tags
Context
2014-06-02
01:42
Make sure we skip the "common" directory check-in: f083221ace user: rkeene tags: trunk
01:39
Updated to support trying local tclsh if cross-compiling and no Tclkit is available check-in: aae12ba51d user: rkeene tags: trunk
2014-05-29
05:56
Corrected typo in previous commit causing all things to be rendered as cross-compiles check-in: fcac83fca7 user: rkeene tags: trunk
Changes

Modified kitsh/build.sh from [ddd5d26892] to [0e6a9ba02e].

   193    193   	## Determine if we have a Tclkit to do this work
   194    194   	TCLKIT="${TCLKIT:-tclkit}"
   195    195   	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
   196    196   		## Install using existing Tclkit
   197    197   		### Call installer
   198    198   		echo "Running: \"${TCLKIT}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\""
   199    199   		"${TCLKIT}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" || exit 1
   200         -	else
          200  +	elif echo 'exit 0' | ./kit >/dev/null 2>/dev/null; then
   201    201   		## Bootstrap (cannot cross-compile)
   202    202   		### Call installer
   203    203   		cp kit runkit
   204    204   		echo "set argv [list {${KITTARGET_NAME}} starpack.vfs {${ENABLECOMPRESSION}}]" > setup.tcl
   205    205   		echo 'if {[catch { clock seconds }]} { proc clock args { return 0 } }' >> setup.tcl
   206    206   		echo 'source installvfs.tcl' >> setup.tcl
   207    207   
   208         -		echo 'Running: echo | ./runkit'
          208  +		echo 'Running: echo | ./runkit setup.tcl'
   209    209   		echo | ./runkit setup.tcl || exit 1
          210  +	else
          211  +		## Install using Tclsh, which may work if we're not using Metakit
          212  +		### Call installer
          213  +		echo "Running: \"${TCLSH_NATIVE}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\""
          214  +		"${TCLSH_NATIVE}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" || exit 1
          215  +		
   210    216   	fi
   211    217   
   212    218   	# Cleanup
   213    219   	if [ "${KITTARGET}" = "kitdll" ]; then
   214    220   		## Remove built interpreters if we are building KitDLL --
   215    221   		## they're just tiny stubs anyway
   216    222   		rm -f kit runkit
   217    223   	fi
   218    224   
   219    225   	exit 0
   220    226   ) || exit 1
   221    227   
   222    228   exit 0