Check-in [3541b6d929]
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

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

     8      8   
     9      9   VERS=8.4
    10     10   SRC="src/tclx${VERS}.tar.bz2"
    11     11   SRCURL="http://sourceforge.net/projects/tclx/files/TclX/${VERS}.0/tclx${VERS}.tar.bz2/download"
    12     12   BUILDDIR="tclx${VERS}"
    13     13   WORKDIR="${TMPDIR:-/tmp}/tclx-$$${RANDOM}${RANDOM}${RANDOM}"
    14     14   PLATFORM="$(../platform)"
    15         -PLATDIR="out/${PLATFORM}"
           15  +PLATDIR="$(pwd)/out/${PLATFORM}"
    16     16   
    17     17   export VERS SRC SRCURL BUILDDIR WORKDIR PLATFORM PLATDIR
    18     18   
    19     19   if [ ! -f "${SRC}" ]; then
    20     20   	mkdir src >/dev/null 2>/dev/null
    21     21   
    22     22   	wget -O "${SRC}" "${SRCURL}" || exit 1
................................................................................
    73     73   -    char *srcChannelId, *targetChannelId;
    74     74   +    char *srcChannelId = NULL, *targetChannelId;
    75     75    
    76     76        if ((objc < 2) || (objc > 3)) {
    77     77            return TclX_WrongArgs (interp, objv [0],
    78     78   __EOF__
    79     79   
    80         -	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}"
           80  +
           81  +	TCLPRIVATE="${TCLCONFIGDIR}/../include/tcl-private"
           82  +	echo "TCLPRIVATE = \"${TCLPRIVATE}\""
           83  +	if [ -d "${TCLPRIVATE}" ]; then
           84  +		CFLAGS="${CFLAGS} -I${TCLPRIVATE} -I${TCLPRIVATE}/generic -I${TCLPRIVATE}/unix"
           85  +		export CFLAGS
           86  +	fi
           87  +
           88  +
           89  +	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --libdir="${PLATDIR}"
    81     90   	${MAKE:-make} || exit 1
    82     91   ) || exit 1
    83     92   
    84     93   (
    85     94   	mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null
    86     95   
    87         -	cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/"
    88         -	cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/"
    89         -	cp "build/${BUILDDIR}/tls.tcl" "${PLATDIR}/"
           96  +	${MAKE:-make} install-lib-binaries PKG_DIR='' || exit 1
    90     97   
    91     98   	../create_teapot "${PLATDIR}/teapot.txt" "Tclx" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "Extended Tcl"
    92     99   ) || exit 1
    93    100   
    94    101   exit 0