Check-in [54623be7eb]
Overview
Comment:Updated to support linking against Tk 8.5 if Tk 8.4 is not available
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 54623be7eb0a2eef56d1813bf67e5d00aa5342d3
User & Date: rkeene on 2011-09-10 22:27:11
Other Links: manifest | tags
Context
2011-09-10
22:28
Updated to use Tcl 8.5/8.4 depending on which is built Added script to cross-compile for various platforms check-in: fb61490a11 user: rkeene tags: trunk
22:27
Updated to support linking against Tk 8.5 if Tk 8.4 is not available check-in: 54623be7eb user: rkeene tags: trunk
2011-09-09
18:02
Fixed extraneous warning check-in: 76e3414ae6 user: rkeene tags: trunk
Changes

Modified server/buildpkgs/Tkimg/build.sh from [a2eba5fa07] to [0243109d66].

16
17
18
19
20
21
22




23
24
25

26
27
28
29
30
31
32
# Download source
download_src

# We require linking against Tk, so find Tk 8.4 and use it.  If it can't be found, abort.
tcl_plat_build_dir="$(basename "${TCLBUILDDIR}")"
tkdir="$(echo "$(pwd)/../Tk84/build"/tk*/${tcl_plat_build_dir})"
if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then




	echo "Unable to find Tk 8.4 directory, please build Tk84 before Tkimg" >&2

	exit 1

fi

# Determine installation root

INSTROOT="$(pwd)/out"
export INSTROOT








>
>
>
>
|

|
>







16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
# Download source
download_src

# We require linking against Tk, so find Tk 8.4 and use it.  If it can't be found, abort.
tcl_plat_build_dir="$(basename "${TCLBUILDDIR}")"
tkdir="$(echo "$(pwd)/../Tk84/build"/tk*/${tcl_plat_build_dir})"
if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
	setup_tcl85

	tkdir="$(echo "$(pwd)/../Tk85/build"/tk*/${tcl_plat_build_dir})"
	if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
		echo "Unable to find Tk 8.4 or Tk 8.5 directory, please build Tk84 or Tk85 before Tkimg" >&2

		exit 1
	fi
fi

# Determine installation root

INSTROOT="$(pwd)/out"
export INSTROOT