KitCreator
Changes On Branch 1fafbabd1acdf07f
Login
HomeDownloadsSource CodeTicketsWiki
Hide Diff Patch Side-by-Side Diff

Changes In Branch winNoRunKit Through [1fafbabd1a] Excluding Merge-Ins

This is equivalent to a diff from 4f42c11e1e to 1fafbabd1a

2015-03-30
21:59
Updated to always copy to a new file Closed-Leaf check-in: 683995c0ec user: rkeene tags: winNoRunKit
21:49
Removed unneeded ifdef check-in: ec170ce37a user: rkeene tags: trunk
2015-03-26
20:44
Permit Tk 8.6.4 to build successfully on Windows using MinGW. Patch is fix for Tk ticket [2a70627a03]. Closed-Leaf check-in: 4db3c24480 user: mistachkin tags: tkt-2a70627a03
19:05
Combine current Windows fixes for testing purposes. check-in: d263c81271 user: mistachkin tags: winAll
04:40
On Windows, stop trying to run 'kit.exe' before it has a functional VFS. check-in: 1fafbabd1a user: mistachkin tags: winNoRunKit
04:39
Allow zlib 1.2.8 to build and integrate properly on Windows using MinGW. Closed-Leaf check-in: 56d1fd1c50 user: mistachkin tags: winZlib128
2015-03-16
01:07
Updated default target to be 8.6.4 check-in: 4f42c11e1e user: rkeene tags: trunk
01:06
Updated nightly tests to be 8.6.4 and 8.5.18 check-in: 3a3b6c57f1 user: rkeene tags: trunk

Modified kitsh/build.sh from [0e6a9ba02e] to [9efdfb74a1].

︙
193
194
195
196
197
198
199


200
201
202
203
204
205
206







207
208
209
210
211
212
213
214
215














216
217
218
219
220
221
222

193
194
195
196
197
198
199
200
201







202
203
204
205
206
207
208
209








210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230








+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+

-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+








	## Determine if we have a Tclkit to do this work
	TCLKIT="${TCLKIT:-tclkit}"
	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
		## Install using existing Tclkit
		### Call installer
		echo "Running: \"${TCLKIT}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\""
		"${TCLKIT}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" || exit 1
	else
		if [ ! -f ./kit.exe ]; then
	elif echo 'exit 0' | ./kit >/dev/null 2>/dev/null; then
		## Bootstrap (cannot cross-compile)
		### Call installer
		cp kit runkit
		echo "set argv [list {${KITTARGET_NAME}} starpack.vfs {${ENABLECOMPRESSION}}]" > setup.tcl
		echo 'if {[catch { clock seconds }]} { proc clock args { return 0 } }' >> setup.tcl
		echo 'source installvfs.tcl' >> setup.tcl
			if echo 'exit 0' | ./kit >/dev/null 2>/dev/null; then
				## Bootstrap (cannot cross-compile)
				### Call installer
				cp kit runkit
				echo "set argv [list {${KITTARGET_NAME}} starpack.vfs {${ENABLECOMPRESSION}}]" > setup.tcl
				echo 'if {[catch { clock seconds }]} { proc clock args { return 0 } }' >> setup.tcl
				echo 'source installvfs.tcl' >> setup.tcl

		echo 'Running: echo | ./runkit setup.tcl'
		echo | ./runkit setup.tcl || exit 1
	else
		## Install using Tclsh, which may work if we're not using Metakit
		### Call installer
		echo "Running: \"${TCLSH_NATIVE}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\""
		"${TCLSH_NATIVE}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" || exit 1
		
				echo 'Running: echo | ./runkit setup.tcl'
				echo | ./runkit setup.tcl || exit 1
			else
				## Install using Tclsh, which may work if we're not using Metakit
				### Call installer
				echo "Running: \"${TCLSH_NATIVE}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\""
				"${TCLSH_NATIVE}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" || exit 1
			fi
		else
			## Install using Tclsh, which may work if we're not using Metakit
			### Call installer
			echo "Running: \"${TCLSH_NATIVE}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\""
			"${TCLSH_NATIVE}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" || exit 1
		fi
	fi

	# Cleanup
	if [ "${KITTARGET}" = "kitdll" ]; then
		## Remove built interpreters if we are building KitDLL --
		## they're just tiny stubs anyway
		rm -f kit runkit
︙

Powered by Fossil · RSS