Check-in [a23f2effdc]
Overview
SHA1:a23f2effdc358a865ef80a2085d01d3a7982a675
Date: 2016-09-06 03:44:28
User: rkeene
Comment:Updated to not print a spurious error to the kitsh build log when Tk is not built
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-09-06
03:55
[db64a530a0] Migrated TclX to the new build system (user: rkeene, tags: trunk)
03:44
[a23f2effdc] Updated to not print a spurious error to the kitsh build log when Tk is not built (user: rkeene, tags: trunk)
03:43
[4ad42dd533] Migrated zlib to new build script (user: rkeene, tags: trunk)
Changes

Modified kitsh/build.sh from [e977fd92ee] to [6c838e6aa6].

    96     96   
    97     97   	# Include extra objects as required
    98     98   	## Initialize list of extra objects
    99     99   	EXTRA_OBJS=""
   100    100   	export EXTRA_OBJS
   101    101   
   102    102   	## Tk Resources (needed for Win32 support) -- remove kit-found resources to prevent the symbols from being in conflict
   103         -	TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
   104         -	TKRSRC="${TKDIR}/lib/tkbase.res.o"
   105         -	if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
   106         -		EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
          103  +	TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" 2>/dev/null && pwd)"
          104  +	if [ -n "${TKDIR}" ]; then
          105  +		TKRSRC="${TKDIR}/lib/tkbase.res.o"
          106  +		if [ -f "${TKRSRC}" ]; then
          107  +			EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
   107    108   
   108         -		echo ' *** Removing "kit.rc" since we have Tk with its own resource file'
          109  +			echo ' *** Removing "kit.rc" since we have Tk with its own resource file'
   109    110   
   110         -		rm -f "${BUILDDIR}/kit.rc"
          111  +			rm -f "${BUILDDIR}/kit.rc"
          112  +		fi
   111    113   	fi
   112    114   
   113    115   	# Cleanup
   114    116   	rm -f kit kit.exe tclsh tclsh.exe
   115    117   
   116    118   	# Determine if target is KitDLL or KitSH
   117    119   	if [ "${KITTARGET}" = "kitdll" ]; then