Check-in [2b40af4d64]
Overview
Comment:Change the order files are copied to the VFS staging directory so packages may override boot.tcl and tclkit.ico more easily
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:2b40af4d64864eaf974dfc1d30caf82bcc2e3fdb
User & Date: rkeene on 2016-08-04 15:09:05
Other Links: manifest | tags
Context
2016-08-09
15:15
Added fix for TclVFS bug 81845 check-in: a7c695de5d user: rkeene tags: trunk
2016-08-04
15:09
Change the order files are copied to the VFS staging directory so packages may override boot.tcl and tclkit.ico more easily check-in: 2b40af4d64 user: rkeene tags: trunk
15:06
Quit building "boot.tcl.h" for kitsh since it is unused check-in: 268b96c949 user: rkeene tags: trunk
Changes

Modified kitsh/build.sh from [a050224c70] to [e977fd92ee].

    66     66   	${MAKE:-make} distclean >/dev/null 2>/dev/null
    67     67   	rm -rf 'starpack.vfs'
    68     68   
    69     69   	# Create VFS directory
    70     70   	mkdir "starpack.vfs"
    71     71   	mkdir "starpack.vfs/lib"
    72     72   
           73  +	## Install "boot.tcl"
           74  +	cp 'boot.tcl' 'starpack.vfs/'
           75  +
           76  +	## Install "tclkit.ico"
           77  +	cp 'tclkit.ico' 'starpack.vfs/'
           78  +
    73     79   	## Copy in all built directories
    74     80   	cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/'
    75     81   
    76     82   	## Rename the "vfs" package directory to what "boot.tcl" expects
    77     83   	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
    78     84   
    79         -	## Install "boot.tcl"
    80         -	cp 'boot.tcl' 'starpack.vfs/'
    81         -
    82         -	## Install "tclkit.ico"
    83         -	cp 'tclkit.ico' 'starpack.vfs/'
    84         -
    85     85   	# Figure out if zlib compiled (if not, the system zlib will be used and we
    86     86   	# will need to have that present)
    87     87   	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
    88     88   	export ZLIBDIR
    89     89   	if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
    90     90   		unset ZLIBDIR
    91     91   	fi