Check-in [21cf4390c8]
Overview
Comment:Updated to deal with more platforms
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 21cf4390c8825753f57033e3994b39394047c526
User & Date: rkeene on 2011-12-04 02:17:54
Other Links: manifest | tags
Context
2011-12-04
16:29
Updated to not complain check-in: 3e39144f1c user: rkeene tags: trunk
02:17
Updated to deal with more platforms check-in: 21cf4390c8 user: rkeene tags: trunk
2011-11-23
13:06
Added "sun4v" and "sun4u" to list of sparc64 types Copied web CustomKit interface into teaparty check-in: 09fa0e9b42 user: rkeene tags: trunk
Changes

Modified server/buildpkgs/Tk85/build.sh from [77bc34c6c2] to [ea016838c5].

36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52













53
54
55
56
57
58

	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --prefix="${PLATDIR}" --libdir="${PLATDIR}" --bindir="${PLATDIR}" ${CONFIGUREEXTRA}

	${MAKE:-make} || exit 1

	${MAKE:-make} install || exit 1

	cat << \_EOF_ | sed 's|@@VERS@@|'"${VERS}"'|g' > "${PLATDIR}/pkgIndex.tcl"
if {[catch {package present Tcl 8.5.0}]} { return }
package ifneeded Tk @@VERS@@ "[list set tk_library $dir]; [list load [file join $dir libtk8.5.so] Tk]"
_EOF_

	mv "${PLATDIR}"/lib/tk8.5/* "${PLATDIR}/"

	rm -f "${PLATDIR}"/*.a
	rm -f "${PLATDIR}/tkConfig.sh" "${PLATDIR}/wish8.5"
	rm -rf "${PLATDIR}/man" "${PLATDIR}/include" "${PLATDIR}/tk8.5" "${PLATDIR}/demos" "${PLATDIR}/lib"













) || exit 1

# Create metadata
../create_teapot "${PLATDIR}/teapot.txt" "Tk" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl ${VERS}" "Cross-platform widget toolkit that provides a library of basic elements for building a graphical user interface (GUI)."

exit 0







<
<
<
<
<



|

>
>
>
>
>
>
>
>
>
>
>
>
>






36
37
38
39
40
41
42





43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66

	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --prefix="${PLATDIR}" --libdir="${PLATDIR}" --bindir="${PLATDIR}" ${CONFIGUREEXTRA}

	${MAKE:-make} || exit 1

	${MAKE:-make} install || exit 1






	mv "${PLATDIR}"/lib/tk8.5/* "${PLATDIR}/"

	rm -f "${PLATDIR}"/*.a
	rm -f "${PLATDIR}/tkConfig.sh" "${PLATDIR}/wish8.5"*
	rm -rf "${PLATDIR}/man" "${PLATDIR}/include" "${PLATDIR}/tk8.5" "${PLATDIR}/demos" "${PLATDIR}/lib"

	LIBFILE='libtk8.5.so'
	for chk_libfile in 'libtk8.5.so' 'tk85.dll' 'libtk8.5.dylib'; do
		if [ -f "${PLATDIR}/${chk_libfile}" ]; then
			LIBFILE="${chk_libfile}"
			break
		fi
	done

	cat << \_EOF_ | sed 's|@@VERS@@|'"${VERS}"'|g;s|@@LIBFILE@@|'"${LIBFILE}"'|g' > "${PLATDIR}/pkgIndex.tcl"
if {[catch {package present Tcl 8.5.0}]} { return }
package ifneeded Tk @@VERS@@ "[list set tk_library $dir]; [list load [file join $dir @@LIBFILE@@] Tk]"
_EOF_
) || exit 1

# Create metadata
../create_teapot "${PLATDIR}/teapot.txt" "Tk" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl ${VERS}" "Cross-platform widget toolkit that provides a library of basic elements for building a graphical user interface (GUI)."

exit 0

Modified server/buildpkgs/build-all-platforms.sh from [cf2c69f90a] to [7f74be5242].

1
2
3
4
5
6
7
8
9
10
11
12
13
#! /bin/bash

CCROOT="${HOME}/root/cross-compilers"
SETUP_CC="${CCROOT}/setup-cc"

for platform in i386-pc-solaris2.10@solaris2.10-ix86 i386-pc-solaris2.10,64@solaris2.10-x86_64 mipsel-unknown-linux-uclibc@linux-glibc2.0-mipsel sparc-sun-solaris2.10@solaris2.10-sparc sparc-sun-solaris2.10,64@solaris2.10-sparc64 x86_64-unknown-freebsd8@freebsd8-x86_64 x86_64-unknown-netbsd5@netbsd5-x86_64; do
	cc_platform="$(echo "${platform}" | cut -f 1 -d '@')"
	tcl_platform="$(echo "${platform}" | cut -f 2 -d '@')"
	opts=''
	setup_cc_opts=''
	configure_opts=''

	if echo "${cc_platform}" | grep ',' >/dev/null; then





|







1
2
3
4
5
6
7
8
9
10
11
12
13
#! /bin/bash

CCROOT="${HOME}/root/cross-compilers"
SETUP_CC="${CCROOT}/setup-cc"

for platform in i386-pc-solaris2.10@solaris2.10-ix86 i386-pc-solaris2.10,64@solaris2.10-x86_64 mipsel-unknown-linux-uclibc@linux-glibc2.0-mipsel sparc-sun-solaris2.8@solaris2.8-sparc sparc-sun-solaris2.8,64@solaris2.8-sparc64 x86_64-unknown-freebsd8@freebsd8-x86_64 x86_64-unknown-netbsd5@netbsd5-x86_64; do
	cc_platform="$(echo "${platform}" | cut -f 1 -d '@')"
	tcl_platform="$(echo "${platform}" | cut -f 2 -d '@')"
	opts=''
	setup_cc_opts=''
	configure_opts=''

	if echo "${cc_platform}" | grep ',' >/dev/null; then
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
	done

	if [ "${is64bit}" = '1' ]; then
		configure_opts="${configure_opts} --enable-64bit"
	fi

	(
		eval "$("${SETUP_CC}" "${cc_platform}" ${setup_cc_opts})"

		FORCE_PLATFORM="${tcl_platform}"
		export FORCE_PLATFORM

		./build_all.sh clean

		./build_all.sh --host="${cc_platform}" ${configure_opts}
	)
done








|










34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
	done

	if [ "${is64bit}" = '1' ]; then
		configure_opts="${configure_opts} --enable-64bit"
	fi

	(
		eval "$("${SETUP_CC}" "${cc_platform}" ${setup_cc_opts} || echo exit 1)"

		FORCE_PLATFORM="${tcl_platform}"
		export FORCE_PLATFORM

		./build_all.sh clean

		./build_all.sh --host="${cc_platform}" ${configure_opts}
	)
done

Modified server/buildpkgs/build_all.sh from [5e7c9aafc7] to [0884ea1589].

86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
					rm -f tclConfig.sh

					exit 1
				) || continue

				## Kludge to make Tcl install when cross-compiling.
				sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
				cat Makefile.new > Makefile
				rm -f Makefile.new

				echo " Executing: ${MAKE:-make} install"
				${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE:-tclsh}")" || break

				LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
				LD_RUN_PATH=".:${LD_RUN_PATH}"
				export LD_LIBRARY_PATH LD_RUN_PATH

				file tclsh tclsh*.exe 2>/dev/null | grep -iv 'No such file' > "${PROJROOTDIR}/platform.magic.file"
				if [ -f tclsh*.exe ]; then







|



|







86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
					rm -f tclConfig.sh

					exit 1
				) || continue

				## Kludge to make Tcl install when cross-compiling.
				sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
				sed 's@^$(TCLSH)@blah@' Makefile.new > Makefile
				rm -f Makefile.new

				echo " Executing: ${MAKE:-make} install"
				${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE:-tclsh}")" TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE:-tclsh}")" || break

				LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
				LD_RUN_PATH=".:${LD_RUN_PATH}"
				export LD_LIBRARY_PATH LD_RUN_PATH

				file tclsh tclsh*.exe 2>/dev/null | grep -iv 'No such file' > "${PROJROOTDIR}/platform.magic.file"
				if [ -f tclsh*.exe ]; then
170
171
172
173
174
175
176








177
178
179
180
181
182
183
	if [ -z "${PLATFORM}" ]; then
		PLATFORM="$(./platform)"
	fi
else
	PLATFORM="${FORCE_PLATFORM}"
fi
export PLATFORM









# Build all appropriate directories
faileddirs=""
if [ -z "${DIRS}" ]; then
	DIRS="`echo */`"
	PKGHASHCODE=''
else







>
>
>
>
>
>
>
>







170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
	if [ -z "${PLATFORM}" ]; then
		PLATFORM="$(./platform)"
	fi
else
	PLATFORM="${FORCE_PLATFORM}"
fi
export PLATFORM

# Set platform specific configuration
case "${PLATFORM}" in
	solaris2*)
		LDFLAGS="${LDFLAGS} -static-libgcc"
		export LDFLAGS
		;;
esac

# Build all appropriate directories
faileddirs=""
if [ -z "${DIRS}" ]; then
	DIRS="`echo */`"
	PKGHASHCODE=''
else