Overview
| Comment: | Updated to not print a spurious error to the kitsh build log when Tk is not built |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | a23f2effdc358a865ef80a2085d01d3a7982a675 |
| User & Date: | rkeene on 2016-09-06 03:44:28 |
| Other Links: | manifest | tags |
Context
|
2016-09-06
| ||
| 03:55 | Migrated TclX to the new build system check-in: db64a530a0 user: rkeene tags: trunk | |
| 03:44 | Updated to not print a spurious error to the kitsh build log when Tk is not built check-in: a23f2effdc user: rkeene tags: trunk | |
| 03:43 | Migrated zlib to new build script check-in: 4ad42dd533 user: rkeene tags: trunk | |
Changes
Modified kitsh/build.sh from [e977fd92ee] to [6c838e6aa6].
96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
# Include extra objects as required
## Initialize list of extra objects
EXTRA_OBJS=""
export EXTRA_OBJS
## Tk Resources (needed for Win32 support) -- remove kit-found resources to prevent the symbols from being in conflict
TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
TKRSRC="${TKDIR}/lib/tkbase.res.o"
if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
echo ' *** Removing "kit.rc" since we have Tk with its own resource file'
rm -f "${BUILDDIR}/kit.rc"
fi
# Cleanup
rm -f kit kit.exe tclsh tclsh.exe
# Determine if target is KitDLL or KitSH
if [ "${KITTARGET}" = "kitdll" ]; then
|
| > | | | | | > |
96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 |
# Include extra objects as required
## Initialize list of extra objects
EXTRA_OBJS=""
export EXTRA_OBJS
## Tk Resources (needed for Win32 support) -- remove kit-found resources to prevent the symbols from being in conflict
TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" 2>/dev/null && pwd)"
if [ -n "${TKDIR}" ]; then
TKRSRC="${TKDIR}/lib/tkbase.res.o"
if [ -f "${TKRSRC}" ]; then
EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
echo ' *** Removing "kit.rc" since we have Tk with its own resource file'
rm -f "${BUILDDIR}/kit.rc"
fi
fi
# Cleanup
rm -f kit kit.exe tclsh tclsh.exe
# Determine if target is KitDLL or KitSH
if [ "${KITTARGET}" = "kitdll" ]; then
|