Check-in [a6a6c489dc]
Overview
SHA1:a6a6c489dcd589ee12449390cee55e57f2b0c928
Date: 2011-10-03 15:31:35
User: rkeene
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

Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2011-10-03
19:04
[e51ad4b533] Updated to not use broken pre-generated Makefiles (user: rkeene, tags: trunk)
15:31
[a6a6c489dc] 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 (user: rkeene, tags: trunk)

2011-09-16
13:40
[d9fcf6ad4a] Updated to format time in ISO-8601 format (user: rkeene, tags: trunk)
Changes

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

137
138
139
140
141
142
143

144
145
146
147
148
149
150
151
	else
		echo " done."
	fi

	case "${pkg}" in
		tcl)
			TCLCONFIGDIR=$(find "$(pwd)/tcl/build" -name tclConfig.sh | head -1 | sed 's@/[^/]*$@@')

			export TCLCONFIGDIR
			;;
	esac

	if [ "${failed}" = "1" ]; then
		buildfailed="1"
	fi
done







>
|







137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
	else
		echo " done."
	fi

	case "${pkg}" in
		tcl)
			TCLCONFIGDIR=$(find "$(pwd)/tcl/build" -name tclConfig.sh | head -1 | sed 's@/[^/]*$@@')
			TCLCONFIGDIRTAIL="$(basename "${TCLCONFIGDIR}")"
			export TCLCONFIGDIR TCLCONFIGDIRTAIL
			;;
	esac

	if [ "${failed}" = "1" ]; then
		buildfailed="1"
	fi
done

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

145
146
147
148
149
150
151





152




153
154
155
156
157
158
159

			(
				. "${patchscript}"
			)
		fi
	done






	for dir in unix win macosx __fail__; do




		if [ "${dir}" = "__fail__" ]; then
			# If we haven't figured out how to build it, reject.

			exit 1
		fi

		# Remove previous directory's "tclConfig.sh" if found







>
>
>
>
>
|
>
>
>
>







145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168

			(
				. "${patchscript}"
			)
		fi
	done

	tryfirstdir=''
	if [ "$(uname -s)" = "Darwin" ]; then
		tryfirstdir='macosx'
	fi

	for dir in "${tryfirstdir}" unix win macosx __fail__; do
		if [ -z "${dir}" ]; then
			continue
		fi

		if [ "${dir}" = "__fail__" ]; then
			# If we haven't figured out how to build it, reject.

			exit 1
		fi

		# Remove previous directory's "tclConfig.sh" if found

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

123
124
125
126
127
128
129
130




131
132
133
134
135
136
137
                                
			(
				. "${patchscript}"
			)
		fi
	done

	for dir in unix win macosx win64 __fail__; do




		if [ "${dir}" = "__fail__" ]; then
			exit 1
		fi

		# Windows/amd64 workarounds
		win64="0"
		if [ "${dir}" = "win64" ]; then







|
>
>
>
>







123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
                                
			(
				. "${patchscript}"
			)
		fi
	done

	for dir in "${TCLCONFIGDIRTAIL}" unix win macosx win64 __fail__; do
		if [ -z "${dir}" ]; then
			continue
		fi

		if [ "${dir}" = "__fail__" ]; then
			exit 1
		fi

		# Windows/amd64 workarounds
		win64="0"
		if [ "${dir}" = "win64" ]; then