Diff

Differences From Artifact [b037ed5b3c]:

To Artifact [60eb9576ab]:


   106    106   		EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
   107    107   
   108    108   		echo ' *** Removing "kit.rc" since we have Tk with its own resource file'
   109    109   
   110    110   		rm -f "${BUILDDIR}/kit.rc"
   111    111   	fi
   112    112   
          113  +	# Cleanup
          114  +	rm -f kit kit.exe tclsh tclsh.exe
          115  +
   113    116   	# Determine if target is KitDLL or KitSH
   114    117   	if [ "${KITTARGET}" = "kitdll" ]; then
   115    118   		CONFIGUREEXTRA="${CONFIGUREEXTRA} --enable-kitdll"
   116    119   	fi
   117    120   
   118    121   	# Compile Kit
   119    122   	if [ -z "${ZLIBDIR}" ]; then
................................................................................
   127    130   	fi
   128    131   
   129    132   	echo "Running: ${MAKE:-make} TCLSH_NATIVE=\"${TCLSH_NATIVE}\""
   130    133   	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
   131    134   
   132    135   	# Strip the kit of all symbols, if possible
   133    136   	if ! echo " ${CONFIGUREEXTRA} " | grep ' --enable-symbols ' >/dev/null; then
   134         -		"${STRIP:-strip}" kit >/dev/null 2>/dev/null
          137  +		"${STRIP:-strip}" kit kit.exe >/dev/null 2>/dev/null
   135    138   		"${STRIP:-strip}" -g libtclkit* >/dev/null 2>/dev/null
   136    139   	fi
   137    140   
   138    141   	# Fix up Win32 DLL names
   139    142   	## .DLL.A -> .LIB
   140    143   	for file in libtclkit*.dll.a; do
   141    144   		if [ ! -f "${file}" ]; then
................................................................................
   172    175   			KITTARGET_NAME="${chkkittarget}"
   173    176   
   174    177   			break
   175    178   		done
   176    179   
   177    180   		## Also create an executable named "kit" so that we can run it later
   178    181   		${MAKE:-make} tclsh
   179         -		mv tclsh kit
          182  +		if [ -f "tclsh.exe" ]; then
          183  +			mv tclsh.exe kit.exe
          184  +		else
          185  +			mv tclsh kit
          186  +		fi
   180    187   	else
   181    188   		## The executable is always named "kit"
   182         -		KITTARGET_NAME='kit'
          189  +		if [ -f 'kit.exe' -a ! -f 'kit' ]; then
          190  +			KITTARGET_NAME='kit.exe'
          191  +		else
          192  +			KITTARGET_NAME='kit'
          193  +		fi
   183    194   	fi
   184    195   	export KITTARGET_NAME
   185    196   
   186         -	if [ "x${KITTARGET_NAME}" = 'x__error__' ]; then
          197  +	if [ "${KITTARGET_NAME}" = '__error__' ]; then
   187    198   		echo "Failed to locate kit target!" >&2
   188    199   
   189    200   		exit 1
   190    201   	fi
   191    202   
   192    203   	# Intall VFS onto kit
   193    204   	## Determine if we have a Tclkit to do this work