Changes In Branch win32-install Through [2ec7ce2722] Excluding Merge-Ins
This is equivalent to a diff from cdcb07f969 to 2ec7ce2722
|
2016-06-29
| ||
| 01:19 | Merge updates from trunk. check-in: e29b34acd1 user: mistachkin tags: win32-install | |
|
2016-02-12
| ||
| 16:56 | Start testing 8.5.19 check-in: 70021142fe user: rkeene tags: trunk | |
|
2015-12-14
| ||
| 21:01 | Experimental adjustments to the install targets for Win32. check-in: 2ec7ce2722 user: mistachkin tags: win32-install | |
|
2015-10-28
| ||
| 15:49 | More patches to try to make TLS 1.6.7 work check-in: cdcb07f969 user: rkeene tags: trunk | |
| 15:28 | Updated TLS package to 1.6.7, still needs lots of testing since the new TLS package is apparently really broken check-in: e2c7a97b27 user: rkeene tags: trunk | |
Modified tcl/build.sh from [a0fc7f495f] to [c5ef63a316].
| ︙ | ︙ | |||
237 238 239 240 241 242 243 |
# Remove broken pre-generated Makfiles
rm -f GNUmakefile Makefile makefile
echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" ${CONFIGUREEXTRA}"
./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" ${CONFIGUREEXTRA}
| | | | | | | | | | | | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
# Remove broken pre-generated Makfiles
rm -f GNUmakefile Makefile makefile
echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" ${CONFIGUREEXTRA}"
./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make} binaries"
${MAKE:-make} binaries || continue
echo "Running: ${MAKE:-make} install-binaries install-libraries"
${MAKE:-make} install-binaries install-libraries || (
# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
# cross-compile installs
echo "Running: ${MAKE:-make} install-binaries install-libraries TCLSH_NATIVE=\"${TCLSH_NATIVE}\""
${MAKE:-make} install-binaries install-libraries TCLSH_NATIVE="${TCLSH_NATIVE}"
) || (
# Make install can fail if cross-compiling using Tcl 8.5.x
# because the Makefile calls "$(TCLSH)". We can't simply
# redefine TCLSH because it also uses TCLSH as a build target
sed 's@^$(TCLSH)@blah@' Makefile > Makefile.new
cat Makefile.new > Makefile
rm -f Makefile.new
echo "Running: ${MAKE:-make} install-binaries install-libraries TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
${MAKE:-make} install-binaries install-libraries TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
) || (
# Make install can fail if cross-compiling using Tcl 8.5.9
# because the Makefile calls "${TCL_EXE}". We can't simply
# redefine TCL_EXE because it also uses TCL_EXE as a build target
sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
cat Makefile.new > Makefile
rm -f Makefile.new
echo "Running: ${MAKE:-make} install-binaries install-libraries TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
${MAKE:-make} install-binaries install-libraries TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
) || exit 1
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/"
rm -rf "${OUTDIR}/lib/pkgconfig"
rm -f "${OUTDIR}"/lib/* >/dev/null 2>/dev/null
find "${OUTDIR}" -name '*.a' | xargs rm -f >/dev/null 2>/dev/null
|
| ︙ | ︙ |