Check-in [361d408d67]
Overview
SHA1:361d408d671dadf67ac05f8fa616517cd82cba42
Date: 2011-07-05 17:26:00
User: rkeene
Comment:Updated to not attempt to download source if "buildsrc" directory is being used for Tcl/Tk
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2011-07-05
17:28
[d860d314dd] Updated additional build scripts to not attempt download if "buildsrc" directory is being used (user: rkeene, tags: trunk)
17:26
[361d408d67] Updated to not attempt to download source if "buildsrc" directory is being used for Tcl/Tk (user: rkeene, tags: trunk)
17:25
[e2f0284dd2] Corrected bug in KitDLL where additional interpreters would not get their auto_path adjusted correctly (user: rkeene, tags: trunk)
Changes

Modified tcl/build.sh from [f8ef582bfc] to [8a67bfa303].

36
37
38
39
40
41
42






43
44
45
46
47
48
49
..
89
90
91
92
93
94
95

96
97
98

99
100
101
102
103
104
105
		fi
	elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then
		use_fossil='1'

		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
	fi
	export FOSSILTAG







	if [ "${use_fossil}" = "1" ]; then
		(
			cd src || exit 1

			workdir="tmp-$$${RANDOM}${RANDOM}${RANDOM}"
			rm -rf "${workdir}"
................................................................................
			echo "${FOSSILDATE}" > "../../${SRC}.date"

			cd ..

			rm -rf "${workdir}"
		) || exit 1
	else

		rm -f "${SRC}.tmp"
		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
		mv "${SRC}.tmp" "${SRC}"

	fi
fi

(
	cd 'build' || exit 1

	if [ ! -d '../buildsrc' ]; then







>
>
>
>
>
>







 







>
|
|
|
>







36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
..
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
		fi
	elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then
		use_fossil='1'

		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
	fi
	export FOSSILTAG

	if [ -d 'buildsrc' ]; then
		# Override here to avoid downloading tarball from Fossil if we
		# have a particular tree already available.
		use_fossil='0'
	fi

	if [ "${use_fossil}" = "1" ]; then
		(
			cd src || exit 1

			workdir="tmp-$$${RANDOM}${RANDOM}${RANDOM}"
			rm -rf "${workdir}"
................................................................................
			echo "${FOSSILDATE}" > "../../${SRC}.date"

			cd ..

			rm -rf "${workdir}"
		) || exit 1
	else
		if [ ! -d 'buildsrc' ]; then
			rm -f "${SRC}.tmp"
			wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
			mv "${SRC}.tmp" "${SRC}"
		fi
	fi
fi

(
	cd 'build' || exit 1

	if [ ! -d '../buildsrc' ]; then

Modified tk/build.sh from [12528bdfc5] to [58316dd2e7].

40
41
42
43
44
45
46






47
48
49
50
51
52
53
..
64
65
66
67
68
69
70

71
72
73

74
75
76
77
78
79
80

	use_fossil='0'
	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
		use_fossil='1'
	elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then
		use_fossil='1'
	fi







	if [ "${use_fossil}" = "1" ]; then
		(       
			FOSSILDATE="$(cat "${TCLFOSSILDATE}" 2>/dev/null)"

			cd src || exit 1

................................................................................
                        
			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"

			cd ..
			rm -rf "${workdir}"
		)
	else

		rm -f "${SRC}.tmp"
		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
		mv "${SRC}.tmp" "${SRC}"

	fi
fi

(
	cd 'build' || exit 1

	if [ ! -d '../buildsrc' ]; then







>
>
>
>
>
>







 







>
|
|
|
>







40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
..
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88

	use_fossil='0'
	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
		use_fossil='1'
	elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then
		use_fossil='1'
	fi

	if [ -d 'buildsrc' ]; then
		# Override here to avoid downloading tarball from Fossil if we
		# have a particular tree already available.
		use_fossil='0'
	fi

	if [ "${use_fossil}" = "1" ]; then
		(       
			FOSSILDATE="$(cat "${TCLFOSSILDATE}" 2>/dev/null)"

			cd src || exit 1

................................................................................
                        
			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"

			cd ..
			rm -rf "${workdir}"
		)
	else
		if [ ! -d 'buildsrc' ]; then
			rm -f "${SRC}.tmp"
			wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
			mv "${SRC}.tmp" "${SRC}"
		fi
	fi
fi

(
	cd 'build' || exit 1

	if [ ! -d '../buildsrc' ]; then