Overview
Comment: | Updated to not attempt to download source if "buildsrc" directory is being used for Tcl/Tk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 361d408d671dadf67ac05f8fa616517cd82cba42 |
User & Date: | rkeene on 2011-07-05 17:26:00 |
Other Links: | manifest | tags |
Context
2011-07-05
| ||
17:28 | Updated additional build scripts to not attempt download if "buildsrc" directory is being used check-in: d860d314dd user: rkeene tags: trunk | |
17:26 | Updated to not attempt to download source if "buildsrc" directory is being used for Tcl/Tk check-in: 361d408d67 user: rkeene tags: trunk | |
17:25 | Corrected bug in KitDLL where additional interpreters would not get their auto_path adjusted correctly check-in: e2f0284dd2 user: rkeene tags: trunk | |
Changes
Modified tcl/build.sh from [f8ef582bfc] to [8a67bfa303].
36 36 fi 37 37 elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then 38 38 use_fossil='1' 39 39 40 40 FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g') 41 41 fi 42 42 export FOSSILTAG 43 + 44 + if [ -d 'buildsrc' ]; then 45 + # Override here to avoid downloading tarball from Fossil if we 46 + # have a particular tree already available. 47 + use_fossil='0' 48 + fi 43 49 44 50 if [ "${use_fossil}" = "1" ]; then 45 51 ( 46 52 cd src || exit 1 47 53 48 54 workdir="tmp-$$${RANDOM}${RANDOM}${RANDOM}" 49 55 rm -rf "${workdir}" ................................................................................ 89 95 echo "${FOSSILDATE}" > "../../${SRC}.date" 90 96 91 97 cd .. 92 98 93 99 rm -rf "${workdir}" 94 100 ) || exit 1 95 101 else 96 - rm -f "${SRC}.tmp" 97 - wget -O "${SRC}.tmp" "${SRCURL}" || exit 1 98 - mv "${SRC}.tmp" "${SRC}" 102 + if [ ! -d 'buildsrc' ]; then 103 + rm -f "${SRC}.tmp" 104 + wget -O "${SRC}.tmp" "${SRCURL}" || exit 1 105 + mv "${SRC}.tmp" "${SRC}" 106 + fi 99 107 fi 100 108 fi 101 109 102 110 ( 103 111 cd 'build' || exit 1 104 112 105 113 if [ ! -d '../buildsrc' ]; then
Modified tk/build.sh from [12528bdfc5] to [58316dd2e7].
40 40 41 41 use_fossil='0' 42 42 if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then 43 43 use_fossil='1' 44 44 elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then 45 45 use_fossil='1' 46 46 fi 47 + 48 + if [ -d 'buildsrc' ]; then 49 + # Override here to avoid downloading tarball from Fossil if we 50 + # have a particular tree already available. 51 + use_fossil='0' 52 + fi 47 53 48 54 if [ "${use_fossil}" = "1" ]; then 49 55 ( 50 56 FOSSILDATE="$(cat "${TCLFOSSILDATE}" 2>/dev/null)" 51 57 52 58 cd src || exit 1 53 59 ................................................................................ 64 70 65 71 tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}" 66 72 67 73 cd .. 68 74 rm -rf "${workdir}" 69 75 ) 70 76 else 71 - rm -f "${SRC}.tmp" 72 - wget -O "${SRC}.tmp" "${SRCURL}" || exit 1 73 - mv "${SRC}.tmp" "${SRC}" 77 + if [ ! -d 'buildsrc' ]; then 78 + rm -f "${SRC}.tmp" 79 + wget -O "${SRC}.tmp" "${SRCURL}" || exit 1 80 + mv "${SRC}.tmp" "${SRC}" 81 + fi 74 82 fi 75 83 fi 76 84 77 85 ( 78 86 cd 'build' || exit 1 79 87 80 88 if [ ! -d '../buildsrc' ]; then