Differences From Artifact [2d66362eb1]:
- Executable file kitsh/build.sh — part of check-in [d2e00f0f73] at 2010-09-26 04:41:24 on branch trunk — Added support for specifying a STRIP environment variable (user: rkeene, size: 2342) [annotate] [blame] [check-ins using]
To 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]
31 31 cp -r 'buildsrc' 'build' 32 32 cd "${BUILDDIR}" || exit 1 33 33 34 34 # Cleanup, just incase the incoming directory was not pre-cleaned 35 35 ${MAKE:-make} distclean >/dev/null 2>/dev/null 36 36 37 37 # Figure out if zlib compiled 38 - ZLIBDIR=$(cd "${OTHERPKGSDIR}/zlib/inst"; pwd) 38 + ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)" 39 39 export ZLIBDIR 40 - if [ ! -f "${ZLIBDIR}/lib/libz.a" ]; then 40 + if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then 41 41 unset ZLIBDIR 42 42 fi 43 + 44 + # Include extra objects as required 45 + ## Initialize list of extra objects 46 + EXTRA_OBJS="" 47 + 48 + ## Tk Resources (needed for Win32 support) 49 + TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)" 50 + TKRSRC="${TKDIR}/lib/tkbase.res.o" 51 + if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then 52 + EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}" 53 + fi 54 + 55 + ## Export to the environment, to be picked up by the "configure" script 56 + export EXTRA_OBJS 43 57 44 58 # Compile Kitsh 45 59 if [ -z "${ZLIBDIR}" ]; then 46 60 echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" 47 61 48 62 ./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} 49 63 else