KitCreator
Check-in [a6a6c489dc]
Login
HomeDownloadsSource CodeTicketsWiki
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
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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

︙
137
138
139
140
141
142
143

144

145
146
147
148
149
150
151

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
			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

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 unix win macosx __fail__; do
	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

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 unix win macosx win64 __fail__; do
	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
︙

Powered by Fossil · RSS