Differences From Artifact [6be18087ad]:
- Executable file
kitsh/build.sh
— part of check-in
[fd276919ad]
at
2010-09-26 04:43:24
on branch trunk
— Fixed issue with zlib checking
Added support for checking for "tkbase.res.o" (present on Win32 builds) and adding to EXTRA_OBJS to link to the "kit" application (user: rkeene, size: 2778) [annotate] [blame] [check-ins using]
To Artifact [0c09a58b49]:
- Executable file
kitsh/build.sh
— part of check-in
[587e28b4b3]
at
2010-09-26 04:43:32
on branch trunk
— Added support for using an icon and file information resource under Windows
Allow the user to place a kit.ico and kit.rc in root dir to replace one built into tclkit
Copied tclsh RC and icon as default (user: rkeene, size: 3115) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
30 31 32 33 34 35 36 |
(
cp -r 'buildsrc' 'build'
cd "${BUILDDIR}" || exit 1
# Cleanup, just incase the incoming directory was not pre-cleaned
${MAKE:-make} distclean >/dev/null 2>/dev/null
| | > > > > > > > > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
(
cp -r 'buildsrc' 'build'
cd "${BUILDDIR}" || exit 1
# Cleanup, just incase the incoming directory was not pre-cleaned
${MAKE:-make} distclean >/dev/null 2>/dev/null
# 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
# Copy user specified kit.rc and kit.ico in to build directory, if found
if [ -f "${OTHERPKGSDIR}/kit.rc" ]; then
cp "${OTHERPKGSDIR}/kit.rc" "${BUILDDIR}"
fi
if [ -f "${OTHERPKGSDIR}/kit.ico" ]; then
cp "${OTHERPKGSDIR}/kit.ico" "${BUILDDIR}"
fi
# Include extra objects as required
## Initialize list of extra objects
EXTRA_OBJS=""
## Tk Resources (needed for Win32 support)
TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
|
| ︙ | ︙ |