Check-in [31baf7fa49]
Overview
Comment:Simplify and fix handling of 'kit.exe' instead of 'kit' on Windows.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 31baf7fa49ab40d1013dbcd31994945a20470714
User & Date: mistachkin on 2015-10-07 22:44:37
Other Links: manifest | tags
Context
2015-10-08
18:29
Do not delete the Kit DLL after building it. check-in: 65edae117a user: mistachkin tags: trunk
2015-10-07
22:44
Simplify and fix handling of 'kit.exe' instead of 'kit' on Windows. check-in: 31baf7fa49 user: mistachkin tags: trunk
02:38
Fix hard-coded use of './kit' in the kitsh build script and improve how the kit target name is defined. check-in: f84245cd51 user: mistachkin tags: trunk
Changes

Modified kitsh/build.sh from [d9a8c3dd79] to [daac00effa].

182
183
184
185
186
187
188
189

190
191
192
193
194
195
196
182
183
184
185
186
187
188

189
190
191
192
193
194
195
196







-
+







		if [ -f "tclsh.exe" ]; then
			mv tclsh.exe kit.exe
		else
			mv tclsh kit
		fi
	else
		## The executable is always named "kit"
		if [ -f 'kit.exe' -a ! -f 'kit' ]; then
		if [ -f 'kit.exe' ]; then
			KITTARGET_NAME='./kit.exe'
		else
			KITTARGET_NAME='./kit'
		fi
	fi
	export KITTARGET_NAME

222
223
224
225
226
227
228
229

230
231
232
233
234
235
236
237
238
239
240
241
242
222
223
224
225
226
227
228

229
230
231
232
233
234
235
236
237
238
239
240
241
242







-
+













			## 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}\" \"${KITTARGET_NAME}.new\""
			"${TCLSH_NATIVE}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" "${KITTARGET_NAME}.new" || exit 1
		fi
	fi

	cat "${KITTARGET_NAME}.new" > "${KITTARGET_NAME}" || exit 1
	cp "${KITTARGET_NAME}.new" "${KITTARGET_NAME}"
	rm -f "${KITTARGET_NAME}.new"

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

	exit 0
) || exit 1

exit 0