Check-in [023de4a116]
Overview
Comment:Updated to check for 'buildsrc' directory before untarring. If found it is used. (Untested)

Updated to download sources to a temporary file and only rename on success

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:023de4a11652e1c16a7406ed8997067c84d17149
User & Date: rkeene on 2010-09-26 04:39:15
Other Links: manifest | tags
Context
2010-09-26
04:39
Corrected check for mk4tcl to actually be functional

Removed support of "config.h" and started passing all defines on the command line check-in: 636da30116 user: rkeene tags: trunk

04:39
Updated to check for 'buildsrc' directory before untarring. If found it is used. (Untested)

Updated to download sources to a temporary file and only rename on success check-in: 023de4a116 user: rkeene tags: trunk

04:39
Updated to provide an empty input file to AC_LINK_IFELSE. It seems to need this. check-in: c16db35fe7 user: rkeene tags: trunk
Changes

Modified itcl/build.sh from [fd13456f4a] to [faf1ba23d7].

    47     47   	echo "Skipping building Itcl, not required for ${TCL_VERSION}"
    48     48   	exit 1
    49     49   ) || exit 0
    50     50   
    51     51   if [ ! -f "${SRC}" ]; then
    52     52   	mkdir 'src' >/dev/null 2>/dev/null
    53     53   
    54         -	wget -O "${SRC}" "${SRCURL}" || exit 1
           54  +	rm -f "${SRC}.tmp"
           55  +	wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
           56  +	mv "${SRC}.tmp" "${SRC}"
    55     57   fi
    56     58   
    57     59   (
    58     60   	cd 'build' || exit 1
    59     61   
           62  +	if [ ! -d '../buildsrc' ]; then
    60     63   	gzip -dc "../${SRC}" | tar -xf -
           64  +	else    
           65  +		cp -rp ../buildsrc/* './'
           66  +	fi
    61     67   
    62     68   	cd "${BUILDDIR}" || exit 1
    63     69   	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    64     70   
    65     71   	${MAKE:-make} || exit 1
    66     72   
    67     73   	${MAKE:-make} install

Modified mk4tcl/build.sh from [1fdbf70bfc] to [2ffb8472f5].

    28     28           source "${TCLCONFIGDIR}/tclConfig.sh"
    29     29   fi
    30     30   export TCL_VERSION
    31     31   
    32     32   if [ ! -f "${SRC}" ]; then
    33     33   	mkdir 'src' >/dev/null 2>/dev/null
    34     34   
    35         -	wget -O "${SRC}" "${SRCURL}" || exit 1
           35  +	rm -f "${SRC}.tmp"
           36  +	wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
           37  +	mv "${SRC}.tmp" "${SRC}"
    36     38   fi
    37     39   
    38     40   (
    39     41   	cd 'build' || exit 1
    40     42   
           43  +	if [ ! -d '../buildsrc' ]; then
    41     44   	gzip -dc "../${SRC}" | tar -xf -
           45  +	else    
           46  +		cp -rp ../buildsrc/* './'
           47  +	fi
    42     48   
    43     49   	# Apply required patches
    44     50   	cd "${BUILDDIR}" || exit 1
    45     51   	for patch in "${PATCHDIR}/all"/metakit-${MK4VERS}-*.diff "${PATCHDIR}/${TCL_VERSION}"/metakit-${MK4VERS}-*.diff; do
    46     52   		if [ ! -f "${patch}" ]; then
    47     53   			continue
    48     54   		fi

Modified tcl/build.sh from [e2207437c3] to [56c78273b3].

    34     34   			cvs -z3 -d:pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tcl co -r "${CVSTAG}" -P tcl
    35     35   
    36     36   			mv tcl "tcl${TCLVERS}"
    37     37   
    38     38   			tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
    39     39   		)
    40     40   	else
    41         -		wget -O "${SRC}" "${SRCURL}" || exit 1
           41  +		rm -f "${SRC}.tmp"
           42  +		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
           43  +		mv "${SRC}.tmp" "${SRC}"
    42     44   	fi
    43     45   fi
    44     46   
    45     47   (
    46     48   	cd 'build' || exit 1
    47     49   
           50  +	if [ ! -d '../buildsrc' ]; then
    48     51   	gzip -dc "../${SRC}" | tar -xf -
           52  +	else
           53  +		cp -rp ../buildsrc/* './'
           54  +	fi
    49     55   
    50     56   	cd "${BUILDDIR}" || exit 1
    51     57   	for dir in unix win macosx; do
    52     58   		# Remove previous directory's "tclConfig.sh" if found
    53     59   		rm -f 'tclConfig.sh'
    54     60   
    55     61   		cd "${BUILDDIR}/${dir}" || exit 1

Modified tclvfs/build.sh from [fa5b10e0ea] to [befde2796f].

    28     28   	source "${TCLCONFIGDIR}/tclConfig.sh"
    29     29   fi
    30     30   export TCL_VERSION
    31     31   
    32     32   if [ ! -f "${SRC}" ]; then
    33     33   	mkdir 'src' >/dev/null 2>/dev/null
    34     34   
    35         -	wget -O "${SRC}" "${SRCURL}" || exit 1
           35  +	rm -f "${SRC}.tmp"
           36  +	wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
           37  +	mv "${SRC}.tmp" "${SRC}"
    36     38   fi
    37     39   
    38     40   (
    39     41   	cd 'build' || exit 1
    40     42   
           43  +	if [ ! -d '../buildsrc' ]; then
    41     44   	gzip -dc "../${SRC}" | tar -xf -
           45  +	else    
           46  +		cp -rp ../buildsrc/* './'
           47  +	fi
    42     48   
    43     49   	cd "${BUILDDIR}" || exit 1
    44     50   
    45     51           # Apply required patches
    46     52   	for patch in "${PATCHDIR}/all"/tclvfs-${TCLVFSVERS}-*.diff "${PATCHDIR}/${TCL_VERSION}"/tclvfs-${TCLVFSVERS}-*.diff; do
    47     53   		if [ ! -f "${patch}" ]; then
    48     54   			continue

Modified tk/build.sh from [766aa6ae73] to [ab29a29d10].

    34     34   			cvs -z3 -d:pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tktoolkit co -r "${CVSTAG}" -P tk
    35     35   
    36     36   			mv tk "tk${TCLVERS}"
    37     37   
    38     38   			tar -cf - "tk${TCLVERS}" | gzip -c > "../${SRC}"
    39     39   		)
    40     40   	else    
    41         -		wget -O "${SRC}" "${SRCURL}" || exit 1
           41  +		rm -f "${SRC}.tmp"
           42  +		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
           43  +		mv "${SRC}.tmp" "${SRC}"
    42     44   	fi
    43     45   fi
    44     46   
    45     47   (
    46     48   	cd 'build' || exit 1
    47     49   
           50  +	if [ ! -d '../buildsrc' ]; then
    48     51   	gzip -dc "../${SRC}" | tar -xf -
           52  +	else    
           53  +		cp -rp ../buildsrc/* './'
           54  +	fi
    49     55   
    50     56   	cd "${BUILDDIR}" || exit 1
    51     57   	for dir in unix win macosx; do
    52     58   		# Remove previous directory's "tkConfig.sh" if found
    53     59   		rm -f 'tkConfig.sh'
    54     60   
    55     61   		cd "${BUILDDIR}/${dir}" || exit 1