teaparty
Check-in [3541b6d929]
Login
HomeTimelineFilesTicketsWiki
Overview
Comment:Updated Tclx build target to install correctly
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3541b6d929ae1bc11ee77be98fb8e8db9d3f0231
User & Date: rkeene on 2010-02-05 04:59:33
Other Links: manifest | tags
Context
2010-02-05
05:03
Corrected teapot index creation for Tclx Corrected order of printing of working directory check-in: 3d6c0da0bc user: rkeene tags: trunk
04:59
Updated Tclx build target to install correctly check-in: 3541b6d929 user: rkeene tags: trunk
04:41
Updated ignores Switched to using "make" unless MAKE environment variable was set Added Tclx (with patches from Slackware) Switched to logging only to a file when building check-in: 25a0e0e475 user: rkeene tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified server/buildpkgs/Tclx/build.sh from [abb6c05c23] to [7ac5b6a99b].

︙︙
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22


VERS=8.4
SRC="src/tclx${VERS}.tar.bz2"
SRCURL="http://sourceforge.net/projects/tclx/files/TclX/${VERS}.0/tclx${VERS}.tar.bz2/download"
BUILDDIR="tclx${VERS}"
WORKDIR="${TMPDIR:-/tmp}/tclx-$$${RANDOM}${RANDOM}${RANDOM}"
PLATFORM="$(../platform)"
PLATDIR="out/${PLATFORM}"

export VERS SRC SRCURL BUILDDIR WORKDIR PLATFORM PLATDIR

if [ ! -f "${SRC}" ]; then
	mkdir src >/dev/null 2>/dev/null

	wget -O "${SRC}" "${SRCURL}" || exit 1








|








8
9
10
11
12
13
14
15
16
17
18
19
20
21
22


VERS=8.4
SRC="src/tclx${VERS}.tar.bz2"
SRCURL="http://sourceforge.net/projects/tclx/files/TclX/${VERS}.0/tclx${VERS}.tar.bz2/download"
BUILDDIR="tclx${VERS}"
WORKDIR="${TMPDIR:-/tmp}/tclx-$$${RANDOM}${RANDOM}${RANDOM}"
PLATFORM="$(../platform)"
PLATDIR="$(pwd)/out/${PLATFORM}"

export VERS SRC SRCURL BUILDDIR WORKDIR PLATFORM PLATDIR

if [ ! -f "${SRC}" ]; then
	mkdir src >/dev/null 2>/dev/null

	wget -O "${SRC}" "${SRCURL}" || exit 1
︙︙
73
74
75
76
77
78
79









80
81
82
83
84
85
86
87
88
89
90
91
92
93
94

-    char *srcChannelId, *targetChannelId;
+    char *srcChannelId = NULL, *targetChannelId;
 
     if ((objc < 2) || (objc > 3)) {
         return TclX_WrongArgs (interp, objv [0],
__EOF__










	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}"
	${MAKE:-make} || exit 1
) || exit 1

(
	mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null

	cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/"
	cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/"
	cp "build/${BUILDDIR}/tls.tcl" "${PLATDIR}/"

	../create_teapot "${PLATDIR}/teapot.txt" "Tclx" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "Extended Tcl"
) || exit 1

exit 0








>
>
>
>
>
>
>
>
>
|






|
<
<






73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96


97
98
99
100
101

-    char *srcChannelId, *targetChannelId;
+    char *srcChannelId = NULL, *targetChannelId;
 
     if ((objc < 2) || (objc > 3)) {
         return TclX_WrongArgs (interp, objv [0],
__EOF__


	TCLPRIVATE="${TCLCONFIGDIR}/../include/tcl-private"
	echo "TCLPRIVATE = \"${TCLPRIVATE}\""
	if [ -d "${TCLPRIVATE}" ]; then
		CFLAGS="${CFLAGS} -I${TCLPRIVATE} -I${TCLPRIVATE}/generic -I${TCLPRIVATE}/unix"
		export CFLAGS
	fi


	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --libdir="${PLATDIR}"
	${MAKE:-make} || exit 1
) || exit 1

(
	mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null

	${MAKE:-make} install-lib-binaries PKG_DIR='' || exit 1



	../create_teapot "${PLATDIR}/teapot.txt" "Tclx" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "Extended Tcl"
) || exit 1

exit 0

Powered by Fossil · RSS