Overview
| Comment: | Added echo lines for every "configure", and "make" |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
12600639d935a0f45ecec82880f11b34 |
| User & Date: | rkeene on 2010-09-26 04:48:40 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:48 | Updated nightly test and publish script to fix bug in cross-compiles check-in: 82a097a2a1 user: rkeene tags: trunk | |
| 04:48 | Added echo lines for every "configure", and "make" check-in: 12600639d9 user: rkeene tags: trunk | |
| 04:48 | Updated to produce Tclkits that lack Mk4 check-in: 266a96d1d3 user: rkeene tags: trunk | |
Changes
Modified itcl/build.sh from [d5535b0fe9] to [db8c325ed3].
| ︙ | ︙ | |||
78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 |
export TEA_PLATFORM
;;
esac
sed 's@TEA_PLATFORM=@test -z "$TEA_PLATFORM" \&\& &@' configure > configure.new && cat configure.new > configure
rm -f configure.new
# Build
./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
${MAKE:-make} || exit 1
${MAKE:-make} install
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/itcl*/ "${OUTDIR}/lib/"
"${STRIP:-strip}" -g "${OUTDIR}"/lib/itcl*/*.so >/dev/null 2>/dev/null
| > > > | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 |
export TEA_PLATFORM
;;
esac
sed 's@TEA_PLATFORM=@test -z "$TEA_PLATFORM" \&\& &@' configure > configure.new && cat configure.new > configure
rm -f configure.new
# Build
echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make}"
${MAKE:-make} || exit 1
echo "Running: ${MAKE:-make} install"
${MAKE:-make} install
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/itcl*/ "${OUTDIR}/lib/"
"${STRIP:-strip}" -g "${OUTDIR}"/lib/itcl*/*.so >/dev/null 2>/dev/null
|
| ︙ | ︙ |
Modified kitsh/build.sh from [0c09a58b49] to [b70457f0fd].
| ︙ | ︙ | |||
62 63 64 65 66 67 68 |
fi
## Export to the environment, to be picked up by the "configure" script
export EXTRA_OBJS
# Compile Kitsh
if [ -z "${ZLIBDIR}" ]; then
| | | > > | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 |
fi
## Export to the environment, to be picked up by the "configure" script
export EXTRA_OBJS
# Compile Kitsh
if [ -z "${ZLIBDIR}" ]; then
echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
else
echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" --with-zlib=\"${ZLIBDIR}\" ${CONFIGUREEXTRA}"
./configure --with-tcl="${TCLCONFIGDIR}" --with-zlib="${ZLIBDIR}" ${CONFIGUREEXTRA}
fi
echo "Running: ${MAKE:-make}"
${MAKE:-make} || exit 1
# Strip the kit of all symbols, if possible
"${STRIP:-strip}" kit >/dev/null 2>/dev/null
# Create VFS directory
mkdir "starpack.vfs"
|
| ︙ | ︙ |
Modified mk4tcl/build.sh from [d269657dc4] to [f48b86fade].
| ︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 |
BUILDTYPE="$(basename "${TCLCONFIGDIR}")"
if [ "${BUILDTYPE}" = "win" ]; then
CPPFLAGS="${CPPFLAGS} -DBUILD_tcl=1"
export CPPFLAGS
fi
# Build static libraries for linking against Tclkit
./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" && \
${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install || (
rm -rf "${INSTDIR}"
mkdir "${INSTDIR}"
exit 1
) || exit 1
| > > > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
BUILDTYPE="$(basename "${TCLCONFIGDIR}")"
if [ "${BUILDTYPE}" = "win" ]; then
CPPFLAGS="${CPPFLAGS} -DBUILD_tcl=1"
export CPPFLAGS
fi
# Build static libraries for linking against Tclkit
echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}"
./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\""
${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" && \
${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install || (
rm -rf "${INSTDIR}"
mkdir "${INSTDIR}"
exit 1
) || exit 1
|
| ︙ | ︙ |
Modified tcl/build.sh from [d7025f1b94] to [1bf5b7b587].
| ︙ | ︙ | |||
72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 |
fi
# Remove previous directory's "tclConfig.sh" if found
rm -f 'tclConfig.sh'
cd "${BUILDDIR}/${dir}" || exit 1
./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" ${CONFIGUREEXTRA}
${MAKE:-make} || continue
${MAKE:-make} install || (
# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
# cross-compile installs
${MAKE:-make} install TCLSH_NATIVE="${TCLKIT:-tclkit}"
) || (
# 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
${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
) || (
# 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
${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
) || 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
| > > > > > > | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
fi
# Remove previous directory's "tclConfig.sh" if found
rm -f 'tclConfig.sh'
cd "${BUILDDIR}/${dir}" || exit 1
echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" ${CONFIGUREEXTRA}"
./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make}"
${MAKE:-make} || continue
echo "Running: ${MAKE:-make} install"
${MAKE:-make} install || (
# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
# cross-compile installs
echo "Running: ${MAKE:-make} install TCLSH_NATIVE=\"${TCLKIT:-tclkit}\""
${MAKE:-make} install TCLSH_NATIVE="${TCLKIT:-tclkit}"
) || (
# 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 TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\""
${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
) || (
# 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 TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\""
${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
) || 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
|
| ︙ | ︙ |
Modified tclvfs/build.sh from [b2a99c5623] to [f2da0a5a15].
| ︙ | ︙ | |||
68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 |
export TEA_PLATFORM
CFLAGS="${CFLAGS} -I${TCLCONFIGDIR}"
export CFLAGS
fi
# Build static version
./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
${MAKE:-make} || exit 1
${MAKE:-make} install
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/vfs*/ "${OUTDIR}/lib/"
rm -f "${OUTDIR}/lib"/vfs*/*.a "${OUTDIR}/lib"/vfs*/*.so
exit 0
| > > > > > | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
export TEA_PLATFORM
CFLAGS="${CFLAGS} -I${TCLCONFIGDIR}"
export CFLAGS
fi
# Build static version
echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make}"
${MAKE:-make} || exit 1
echo "Running: ${MAKE:-make} install"
${MAKE:-make} install
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/vfs*/ "${OUTDIR}/lib/"
rm -f "${OUTDIR}/lib"/vfs*/*.a "${OUTDIR}/lib"/vfs*/*.so
exit 0
|
| ︙ | ︙ |
Modified thread/build.sh from [d1e307e2c4] to [8baee02522].
| ︙ | ︙ | |||
61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
if [ ! -d '../buildsrc' ]; then
gzip -dc "../${SRC}" | tar -xf -
else
cp -rp ../buildsrc/* './'
fi
cd "${BUILDDIR}" || exit 1
./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
${MAKE:-make} || exit 1
${MAKE:-make} install
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/thread*/ "${OUTDIR}/lib/"
"${STRIP:-strip}" -g "${OUTDIR}"/lib/thread*/*.so >/dev/null 2>/dev/null
| > > > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
if [ ! -d '../buildsrc' ]; then
gzip -dc "../${SRC}" | tar -xf -
else
cp -rp ../buildsrc/* './'
fi
cd "${BUILDDIR}" || exit 1
echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make}"
${MAKE:-make} || exit 1
echo "Running: ${MAKE:-make} install"
${MAKE:-make} install
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/thread*/ "${OUTDIR}/lib/"
"${STRIP:-strip}" -g "${OUTDIR}"/lib/thread*/*.so >/dev/null 2>/dev/null
|
| ︙ | ︙ |
Modified tk/build.sh from [e8f807ace8] to [74d986fc51].
| ︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 |
echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
else
echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
fi
${MAKE:-make} || continue
${MAKE:-make} install || continue
# Update to include resources, if found
if [ "${dir}" = "win" ]; then
echo ' *** Creating tkbase.res.o to support Windows build'
echo "\"${RC:-windres}\" -o tkbase.res.o --define STATIC_BUILD --include \"./../generic\" --include \"${TCLCONFIGDIR}/../generic\" --include \"${TCLCONFIGDIR}\" --include \"./rc\" \"./rc/tk_base.rc\""
"${RC:-windres}" -o tkbase.res.o --define STATIC_BUILD --include "./../generic" --include "${TCLCONFIGDIR}/../generic" --include "${TCLCONFIGDIR}" --include "./rc" "./rc/tk_base.rc"
| > > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 |
echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
else
echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
fi
echo "Running: ${MAKE:-make}"
${MAKE:-make} || continue
echo "Running: ${MAKE:-make} install"
${MAKE:-make} install || continue
# Update to include resources, if found
if [ "${dir}" = "win" ]; then
echo ' *** Creating tkbase.res.o to support Windows build'
echo "\"${RC:-windres}\" -o tkbase.res.o --define STATIC_BUILD --include \"./../generic\" --include \"${TCLCONFIGDIR}/../generic\" --include \"${TCLCONFIGDIR}\" --include \"./rc\" \"./rc/tk_base.rc\""
"${RC:-windres}" -o tkbase.res.o --define STATIC_BUILD --include "./../generic" --include "${TCLCONFIGDIR}/../generic" --include "${TCLCONFIGDIR}" --include "./rc" "./rc/tk_base.rc"
|
| ︙ | ︙ |
Modified zlib/build.sh from [8abe54013f] to [2bc46025a6].
| ︙ | ︙ | |||
42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
cd "${BUILDDIR}" || exit 1
# ZLIB Expects AR to contain options
AR="${AR:-ar} rcu"
export AR
# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
# script and will puke
./configure --prefix="${INSTDIR}"
${MAKE:-make} AR="${AR}" || exit 1
${MAKE:-make} install AR="${AR}"
# We don't really care too much about failure in zlib
exit 0
) || exit 1
exit 0
| > > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 |
cd "${BUILDDIR}" || exit 1
# ZLIB Expects AR to contain options
AR="${AR:-ar} rcu"
export AR
# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
# script and will puke
echo "Running: ./configure --prefix=\"${INSTDIR}\""
./configure --prefix="${INSTDIR}"
echo "Running: ${MAKE:-make} AR=\"${AR}\""
${MAKE:-make} AR="${AR}" || exit 1
echo "Running: ${MAKE:-make} install AR=\"${AR}\""
${MAKE:-make} install AR="${AR}"
# We don't really care too much about failure in zlib
exit 0
) || exit 1
exit 0
|