Diff

Differences From Artifact [c993cbeca4]:

To Artifact [12528bdfc5]:


    15     15   SRCURL="http://prdownloads.sourceforge.net/tcl/tk${TCLVERS}-src.tar.gz"
    16     16   BUILDDIR="$(pwd)/build/tk${TCLVERS}"
    17     17   PATCHDIR="$(pwd)/patches"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   PATCHSCRIPTDIR="$(pwd)/patchscripts"
    21     21   export SRC SRCURL BUILDDIR PATCHDIR OUTDIR INSTDIR PATCHSCRIPTDIR
           22  +
           23  +# Must be kept in-sync with "../tcl/build.sh"
           24  +TCLFOSSILDATE="../tcl/src/tcl${TCLVERS}.tar.gz.date"
           25  +export TCLFOSSILDATE
    22     26   
    23     27   rm -rf 'build' 'out' 'inst'
    24     28   mkdir 'build' 'out' 'inst' || exit 1
    25     29   
    26     30   # Determine Tcl version
    27     31   TCL_VERSION="unknown"
    28     32   if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then
................................................................................
    33     37   
    34     38   if [ ! -f "${SRC}" ]; then
    35     39   	mkdir 'src' >/dev/null 2>/dev/null
    36     40   
    37     41   	use_fossil='0'
    38     42   	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
    39     43   		use_fossil='1'
    40         -
    41         -		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
    42         -		if [ "${FOSSILTAG}" = "HEAD" ]; then
    43         -			FOSSILTAG="trunk"
    44         -		fi
    45     44   	elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then
    46     45   		use_fossil='1'
    47         -
    48         -		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
    49     46   	fi
    50         -	export FOSSILTAG
    51     47   
    52     48   	if [ "${use_fossil}" = "1" ]; then
    53     49   		(       
           50  +			FOSSILDATE="$(cat "${TCLFOSSILDATE}" 2>/dev/null)"
           51  +
    54     52   			cd src || exit 1
    55     53   
    56     54   			workdir="tmp-$$${RANDOM}${RANDOM}${RANDOM}"
    57     55   			rm -rf "${workdir}"
    58     56   
    59     57   			mkdir "${workdir}" || exit 1
    60     58   			cd "${workdir}" || exit 1
    61     59   
    62         -			wget -O "tmp-tk.tar.gz" "http://core.tcl.tk/tk/tarball/tk-fossil.tar.gz?uuid=${FOSSILTAG}" || rm -f 'tmp-tk.tar.gz'
           60  +			wget -O "tmp-tk.tar.gz" "http://core.tcl.tk/tk/tarball/tk-fossil.tar.gz?uuid=${FOSSILDATE}" || rm -f 'tmp-tk.tar.gz'
    63     61   			gzip -dc "tmp-tk.tar.gz" | tar -xf -
    64     62   
    65     63   			mv "tk-fossil" "tk${TCLVERS}"
    66     64                           
    67     65   			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"
    68     66   
    69     67   			cd ..