Check-in [3f354ca762]
Overview
Comment:Updated to try harder to look for a working Tcl interpreter for building KitDLL

Updated to return in failure if installvfs fails

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:3f354ca7622b218735b38cb1cc13b71c92e3aeaf
User & Date: rkeene on 2011-05-19 23:00:45
Other Links: manifest | tags
Context
2011-05-20
06:39
Added back missing executable flag (bug in Fossil) check-in: ff0f420d0c user: rkeene tags: trunk
2011-05-19
23:00
Updated to try harder to look for a working Tcl interpreter for building KitDLL

Updated to return in failure if installvfs fails check-in: 3f354ca762 user: rkeene tags: trunk

2011-05-17
01:33
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 check-in: 4fa3b7d3ea user: rkeene tags: trunk
Changes

build/make-kit-mipsel became a regular file with contents [814a04e3a0].

whitespace changes only

Modified kitdll/build.sh from [9d057a0710] to [4e8a270142].

    45     45   
    46     46   			"${AR:-ar}" cr "${archive}" *.o || exit 1
    47     47   			"${RANLIB:-ranlib}" "${archive}" || true
    48     48   		)
    49     49   	done
    50     50   
    51     51   	# Determine how we invoke a Tcl interpreter
    52         -	for testsh in "${TCLSH_NATIVE:-false}" "${TCLKIT:-tclkit}"; do
           52  +	for testsh in "${TCLSH_NATIVE:-false}" tclsh tclsh8.4 tclsh8.5 tclsh8.6 "${TCLKIT:-tclkit}"; do
    53     53   		if echo 'exit 0' | "${testsh}" >/dev/null 2>/dev/null; then
    54     54   			TCLSH_NATIVE="${testsh}"
    55     55   
    56     56   			break
    57     57   		fi
    58     58   	done
    59     59   

Modified kitsh/build.sh from [9ac6c7313f] to [ec7be57b0b].

    97     97   	# Intall VFS onto kit
    98     98   	## Determine if we have a Tclkit to do this work
    99     99   	TCLKIT="${TCLKIT:-tclkit}"
   100    100   	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
   101    101   		## Install using existing Tclkit
   102    102   		### Call installer
   103    103   		echo "Running: \"${TCLKIT}\" installvfs.tcl kit starpack.vfs \"${ENABLECOMPRESSION}\""
   104         -		"${TCLKIT}" installvfs.tcl kit starpack.vfs "${ENABLECOMPRESSION}"
          104  +		"${TCLKIT}" installvfs.tcl kit starpack.vfs "${ENABLECOMPRESSION}" || exit 1
   105    105   	else
   106    106   		## Bootstrap (cannot cross-compile)
   107    107   		### Call installer
   108    108   		cp kit runkit
   109    109   		echo "set argv [list kit starpack.vfs {${ENABLECOMPRESSION}}]" > setup.tcl
   110    110   		echo 'if {[catch { clock seconds }]} { proc clock args { return 0 } }' >> setup.tcl
   111    111   		echo 'source installvfs.tcl' >> setup.tcl
   112    112   
   113    113   		echo 'Running: echo | ./runkit'
   114         -		echo | ./runkit
          114  +		echo | ./runkit || exit 1
   115    115   	fi
   116    116   
   117    117   	exit 0
   118    118   ) || exit 1
   119    119   
   120    120   exit 0