Check-in [806f56eb1d]
Overview
Comment:Updated to download Tcl if suitable headers cannot be found
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:806f56eb1d33a90b052c92ead89e7d9744d352c5
User & Date: rkeene on 2010-02-05 06:03:41
Other Links: manifest | tags
Context
2010-02-05
06:07
Corrected documentation regarding get_extensions check-in: 3744cd1713 user: rkeene tags: trunk
06:03
Updated to download Tcl if suitable headers cannot be found check-in: 806f56eb1d user: rkeene tags: trunk
05:43
Added distclean target to server Updated top-level Makefile to call clean/distclean in server check-in: 6bf2170186 user: rkeene tags: trunk
Changes

Modified server/buildpkgs/Tclx/build.sh from [68a541395b] to [5168189fc5].

    12     12   BUILDDIR="tclx${VERS}"
    13     13   WORKDIR="${TMPDIR:-/tmp}/tclx-$$${RANDOM}${RANDOM}${RANDOM}"
    14     14   PLATFORM="$(../platform)"
    15     15   PLATDIR="$(pwd)/out/${PLATFORM}"
    16     16   
    17     17   export VERS SRC SRCURL BUILDDIR WORKDIR PLATFORM PLATDIR
    18     18   
           19  +(
           20  +	rm -rf build
           21  +	mkdir build
           22  +) || exit 1
           23  +
    19     24   if [ ! -f "${SRC}" ]; then
    20     25   	mkdir src >/dev/null 2>/dev/null
    21     26   
    22     27   	wget -O "${SRC}" "${SRCURL}" || exit 1
    23     28   fi
           29  +
           30  +TCLPRIVATE="${TCLCONFIGDIR}/../include/tcl-private"
           31  +if [ ! -d "${TCLPRIVATE}" ]; then
           32  +	if [ ! -f src/tcl8.4.19.tar.gz ]; then
           33  +		wget -O src/tcl8.4.19.tar.gz http://prdownloads.sourceforge.net/tcl/tcl8.4.19-src.tar.gz
           34  +	fi
           35  +
           36  +	(
           37  +		mkdir build >/dev/null 2>/dev/null
           38  +		cd build || exit 1
           39  +		gzip -dc ../src/tcl8.4.19.tar.gz | tar -xf -
           40  +	)
           41  +
           42  +	TCLPRIVATE="$(pwd)/build/tcl8.4.19"
           43  +fi
           44  +echo "TCLPRIVATE = \"${TCLPRIVATE}\""
           45  +CFLAGS="${CFLAGS} -I${TCLPRIVATE} -I${TCLPRIVATE}/generic -I${TCLPRIVATE}/unix"
           46  +export CFLAGS
           47  +
    24     48   
    25     49   (
    26         -	rm -rf build
    27         -	mkdir build
    28     50   	cd build/ || exit 1
    29     51   
    30     52   	bzip2 -dc "../${SRC}" | tar -xf -
    31     53   	cd "${BUILDDIR}" || exit 1
    32     54   
    33     55   	cat << \__EOF__ | patch -p1
    34     56   --- tclx8.4/configure.relid	2006-02-03 16:13:25.000000000 -0500
................................................................................
    73     95   -    char *srcChannelId, *targetChannelId;
    74     96   +    char *srcChannelId = NULL, *targetChannelId;
    75     97    
    76     98        if ((objc < 2) || (objc > 3)) {
    77     99            return TclX_WrongArgs (interp, objv [0],
    78    100   __EOF__
    79    101   
    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    102   
    89    103   	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --libdir="${PLATDIR}"
    90    104   	${MAKE:-make} || exit 1
    91    105   
    92    106   	mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null
    93    107   
    94    108   	${MAKE:-make} install-lib-binaries PKG_DIR='' || exit 1
    95    109   
    96    110   ) || exit 1
    97    111   
    98    112   ../create_teapot "${PLATDIR}/teapot.txt" "Tclx" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "Extended Tcl"
    99    113   
   100    114   exit 0