Check-in [0b028fd897]
Overview
Comment:Updated clean target to call build clean script Added finding TCLCONFIGDIR support Added build support for TLS on Solaris
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:0b028fd8975f40dda32feee51b3a87979367b2d0
User & Date: rkeene on 2010-02-05 01:34:51
Other Links: manifest | tags
Context
2010-02-05
01:44
Updated to store build log in output directory check-in: 30541f9462 user: rkeene tags: trunk
01:34
Updated clean target to call build clean script Added finding TCLCONFIGDIR support Added build support for TLS on Solaris check-in: 0b028fd897 user: rkeene tags: trunk
00:58
Added script to build all packages Updated ignores Updated Makefile to clean excess tarfiles check-in: 73113a9013 user: rkeene tags: trunk
Changes

Modified server/work/Makefile from [71fa914848] to [e6f364d300].

    13     13   		mkdir "tclpkgs-src-current/$$dir"; \
    14     14   		cp "$$dir/build.sh" "tclpkgs-src-current/$$dir"; \
    15     15   	done
    16     16   
    17     17   clean:
    18     18   	rm -f tclpkgs-*.tar.*
    19     19   	rm -rf tclpkgs-src-current
           20  +	./build_all.sh clean
    20     21   
    21     22   .PHONY: all clean

Modified server/work/build_all.sh from [f1d1c68280] to [e331d246af].

    12     12   	CLEANONLY=1
    13     13   fi
    14     14   if [ "$1" = "distclean" ]; then
    15     15   	CLEANONLY=1
    16     16   	DISTCLEAN=1
    17     17   fi
    18     18   export CLEANONLY DISTCLEAN
           19  +
           20  +# Determine path to "tclConfig.sh"
           21  +TCLCONFIGDIR=$(
           22  +	(
           23  +		echo "${LD_LIBRARY_PATH}" | tr ':' "\n"
           24  +		cat /etc/ld.so.conf 2>/dev/null
           25  +		crle 2>/dev/null | grep '^ *Default Library Path' | sed 's@^ *Default Library Path[^:]*:[^:]*/@/@' | tr ':' "\n"
           26  +	) | grep '^/' | while read chklibdir; do
           27  +		if [ -f "${chklibdir}/tclConfig.sh" ]; then
           28  +			echo "${chklibdir}"
           29  +			break
           30  +		fi
           31  +	done
           32  +)
           33  +if [ -z "${TCLCONFIGDIR}" ]; then
           34  +	TCLCONFIGDIR="/usr/lib"
           35  +fi
           36  +export TCLCONFIGDIR
    19     37   
    20     38   # Build all appropriate directories
    21     39   faileddirs=""
    22     40   for dir in */; do
    23     41   	export dir
    24     42   
    25     43   	if [ ! -f "${dir}/build.sh" ]; then
................................................................................
    43     61   	) || failed=1
    44     62   
    45     63   	if [ "${failed}" = "1" ]; then
    46     64   		rm -rf "${dir}/out"
    47     65   		faileddirs="${faileddirs} ${dir}"
    48     66   	fi
    49     67   done
           68  +
           69  +# Cleanup is done at this point
           70  +if [ "${CLEANONLY}" = "1" ]; then
           71  +	exit 0
           72  +fi
    50     73   
    51     74   # Let the user know what failed to build
    52     75   if [ -n "${faileddirs}" ]; then
    53     76   	echo "The following failed to build:${failddirs}"
    54     77   fi
    55     78   
    56     79   # Create tarfile of built packages
    57     80   PLATFORM="$(./platform)"
    58     81   DATECODE="$(date +%Y%m%d%H%M)"
    59     82   OUTFILEBASE="tclpkgs-${PLATFORM}-${DATECODE}"
    60     83   tar -cf - */out */build.log | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"
    61     84   
    62     85   exit 0

Modified server/work/tls/build.sh from [9e4a5ea3ad] to [dc0eed1286].

    23     23   fi
    24     24   
    25     25   (
    26     26   	rm -rf build
    27     27   	mkdir build
    28     28   	cd build/ || exit 1
    29     29   
    30         -	tar -zxf "../${SRC}"
           30  +	gzip -dc "../${SRC}" | tar -xf -
    31     31   	cd "${BUILDDIR}" || exit 1
    32     32   
    33         -	mkdir "${WORKDIR}"
    34         -
    35         -	./configure --enable-shared --prefix="${WORKDIR}"
    36         -	gmake || exit 1
           33  +	for chkssldir in $(pkg-config openssl --cflags | sed 's@ *-I *@|@g' | tr '|' "\n" | grep '^/'); do
           34  +		if [ -f "${chkssldir}/openssl/opensslv.h" -o -f "${chkssldir}/opensslv.h" ]; then
           35  +			SSLDIR=$(echo "${chkssldir}" | sed 's@/[^/]*/*$@@')
           36  +		fi
           37  +	done
           38  +	if [ -z "${SSLDIR}" ]; then
           39  +		SSLDIR="/usr"
           40  +	fi
    37     41   
    38         -	rm -rf "${WORKDIR}"
           42  +	./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}"
           43  +	gmake || exit 1
    39     44   ) || exit 1
    40     45   
    41     46   (
    42     47   	rm -rf "${PLATDIR}"
    43     48   	mkdir -p "${PLATDIR}"
    44     49   
    45     50   	cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/"
    46     51   	cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/"
    47     52   	cp "build/${BUILDDIR}/tls.tcl" "${PLATDIR}/"
    48     53   ) || exit 1
    49     54   
    50     55   exit 0