Check-in [a6a6c489dc]
Overview
Comment:Updated to try to build Tk in the same sub-directory as Tcl first

Updated Tcl to try to build in the macosx directory first on Darwin

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:a6a6c489dcd589ee12449390cee55e57f2b0c928
User & Date: rkeene on 2011-10-03 15:31:35
Other Links: manifest | tags
Context
2011-10-03
19:04
Updated to not use broken pre-generated Makefiles check-in: e51ad4b533 user: rkeene tags: trunk
15:31
Updated to try to build Tk in the same sub-directory as Tcl first

Updated Tcl to try to build in the macosx directory first on Darwin check-in: a6a6c489dc user: rkeene tags: trunk

2011-09-16
13:40
Updated to format time in ISO-8601 format check-in: d9fcf6ad4a user: rkeene tags: trunk
Changes

Modified kitcreator from [841b4aa9c5] to [f143b94d8a].

   137    137   	else
   138    138   		echo " done."
   139    139   	fi
   140    140   
   141    141   	case "${pkg}" in
   142    142   		tcl)
   143    143   			TCLCONFIGDIR=$(find "$(pwd)/tcl/build" -name tclConfig.sh | head -1 | sed 's@/[^/]*$@@')
   144         -			export TCLCONFIGDIR
          144  +			TCLCONFIGDIRTAIL="$(basename "${TCLCONFIGDIR}")"
          145  +			export TCLCONFIGDIR TCLCONFIGDIRTAIL
   145    146   			;;
   146    147   	esac
   147    148   
   148    149   	if [ "${failed}" = "1" ]; then
   149    150   		buildfailed="1"
   150    151   	fi
   151    152   done

Modified tcl/build.sh from [4268eb0491] to [e5d135d2c7].

   145    145   
   146    146   			(
   147    147   				. "${patchscript}"
   148    148   			)
   149    149   		fi
   150    150   	done
   151    151   
   152         -	for dir in unix win macosx __fail__; do
          152  +	tryfirstdir=''
          153  +	if [ "$(uname -s)" = "Darwin" ]; then
          154  +		tryfirstdir='macosx'
          155  +	fi
          156  +
          157  +	for dir in "${tryfirstdir}" unix win macosx __fail__; do
          158  +		if [ -z "${dir}" ]; then
          159  +			continue
          160  +		fi
          161  +
   153    162   		if [ "${dir}" = "__fail__" ]; then
   154    163   			# If we haven't figured out how to build it, reject.
   155    164   
   156    165   			exit 1
   157    166   		fi
   158    167   
   159    168   		# Remove previous directory's "tclConfig.sh" if found

Modified tk/build.sh from [58316dd2e7] to [73621b259f].

   123    123                                   
   124    124   			(
   125    125   				. "${patchscript}"
   126    126   			)
   127    127   		fi
   128    128   	done
   129    129   
   130         -	for dir in unix win macosx win64 __fail__; do
          130  +	for dir in "${TCLCONFIGDIRTAIL}" unix win macosx win64 __fail__; do
          131  +		if [ -z "${dir}" ]; then
          132  +			continue
          133  +		fi
          134  +
   131    135   		if [ "${dir}" = "__fail__" ]; then
   132    136   			exit 1
   133    137   		fi
   134    138   
   135    139   		# Windows/amd64 workarounds
   136    140   		win64="0"
   137    141   		if [ "${dir}" = "win64" ]; then