Overview
| Comment: | Updated to not provide pkgIndex.tcl for Tk if building statically |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
5970f1de2e808ea45e6b87b31e319c15 |
| User & Date: | rkeene on 2010-10-01 20:49:01 |
| Other Links: | manifest | tags |
Context
|
2010-10-01
| ||
| 23:46 | Renamed library built by KitDLL to include version number by default check-in: fe17341989 user: rkeene tags: trunk | |
| 20:49 | Updated to not provide pkgIndex.tcl for Tk if building statically check-in: 5970f1de2e user: rkeene tags: trunk | |
| 20:45 | Updated to include a "package ifneeded" script for Tk on Win32 in addition to other platforms, if Tk built statically. check-in: d3373882b3 user: rkeene tags: trunk | |
Changes
Modified tk/build.sh from [c666adbf49] to [f6d4d528ed].
| ︙ | ︙ | |||
138 139 140 141 142 143 144 |
"${RC:-windres}" -o tkbase.res.o --define STATIC_BUILD --include "./../generic" --include "${TCLCONFIGDIR}/../generic" --include "${TCLCONFIGDIR}" --include "./rc" "./rc/tk_base.rc"
if [ -f "tkbase.res.o" ]; then
cp "tkbase.res.o" "${INSTDIR}/lib/"
fi
fi
| > > > > > | | | | | | > | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 |
"${RC:-windres}" -o tkbase.res.o --define STATIC_BUILD --include "./../generic" --include "${TCLCONFIGDIR}/../generic" --include "${TCLCONFIGDIR}" --include "./rc" "./rc/tk_base.rc"
if [ -f "tkbase.res.o" ]; then
cp "tkbase.res.o" "${INSTDIR}/lib/"
fi
fi
if [ "${STATICTK}" = "1" ]; then
# If we are building statically, don't create a
# pkgIndex.tcl
rm -f "${INSTDIR}"/lib/tk*/pkgIndex.tcl
else
# Update pkgIndex to load libtk from the local directory rather
# than the parent directory
for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do
sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new"
mv "${pkgIndex}.new" "${pkgIndex}"
done
fi
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/tk* "${OUTDIR}/lib/"
cp -r "${INSTDIR}/lib"/libtk* "${OUTDIR}/lib"/tk*/
rm -rf "${OUTDIR}/lib"/tk*/demos
"${STRIP:-strip}" -g "${OUTDIR}"/lib/tk*/*.so >/dev/null 2>/dev/null
|
| ︙ | ︙ |