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: |
2b40af4d64864eaf974dfc1d30caf82b |
| 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 67 68 69 70 71 72 73 74 75 76 77 78 |
${MAKE:-make} distclean >/dev/null 2>/dev/null
rm -rf 'starpack.vfs'
# 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'
| > > > > > > < < < < < < | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 |
${MAKE:-make} distclean >/dev/null 2>/dev/null
rm -rf 'starpack.vfs'
# Create VFS directory
mkdir "starpack.vfs"
mkdir "starpack.vfs/lib"
## Install "boot.tcl"
cp 'boot.tcl' 'starpack.vfs/'
## Install "tclkit.ico"
cp 'tclkit.ico' 'starpack.vfs/'
## 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'
# 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
|
| ︙ | ︙ |