Check-in [4c532aef85]
Overview
Comment:Updated to report failure if building of Tk fails
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:4c532aef859916504430af11e595d174d98e1b5a
User & Date: rkeene on 2010-09-26 04:42:44
Other Links: manifest | tags
Context
2010-09-26
04:42
Added back safe successful exits check-in: baaf0c5896 user: rkeene tags: trunk
04:42
Updated to report failure if building of Tk fails check-in: 4c532aef85 user: rkeene tags: trunk
04:42
KitCreator 0.2.3.x check-in: 98787f352d user: rkeene tags: trunk, 0.2.3
Changes

Modified tk/build.sh from [3efb154a49] to [9f9636ed5a].

    50     50   	if [ ! -d '../buildsrc' ]; then
    51     51   		gzip -dc "../${SRC}" | tar -xf -
    52     52   	else    
    53     53   		cp -rp ../buildsrc/* './'
    54     54   	fi
    55     55   
    56     56   	cd "${BUILDDIR}" || exit 1
    57         -	for dir in unix win macosx; do
           57  +	for dir in unix win macosx __fail__; do
           58  +		if [ "${dir}" = "__fail__" ]; then
           59  +			exit 1
           60  +		fi
           61  +
    58     62   		# Remove previous directory's "tkConfig.sh" if found
    59     63   		rm -f 'tkConfig.sh'
    60     64   
    61     65   		cd "${BUILDDIR}/${dir}" || exit 1
    62     66   
    63     67   		if [ "${dir}" = "win" ]; then
    64     68   			# Statically link Tk to Tclkit if we are compiling for
................................................................................
    72     76   		else
    73     77   			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    74     78   			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    75     79   		fi
    76     80   
    77     81   		${MAKE:-make} || continue
    78     82   
    79         -		${MAKE:-make} install
           83  +		${MAKE:-make} install || continue
    80     84   
    81     85   		# Update pkgIndex to load libtk from the local directory rather
    82     86   		# than the parent directory
    83     87   		for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do
    84     88   			sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new"
    85     89   			mv "${pkgIndex}.new" "${pkgIndex}"
    86     90   		done
................................................................................
    91     95   		rm -rf "${OUTDIR}/lib"/tk*/demos
    92     96   
    93     97   		"${STRIP:-strip}" -g "${OUTDIR}"/lib/tk*/*.so >/dev/null 2>/dev/null
    94     98   		find "${OUTDIR}" -type f -name '*.a' | xargs rm -f >/dev/null 2>/dev/null
    95     99   
    96    100   		break
    97    101   	done
    98         -
    99         -	exit 0
   100    102   ) || exit 1
   101    103   
   102    104   exit 0