Overview
| Comment: | Updated ignores Switched to using "make" unless MAKE environment variable was set Added Tclx (with patches from Slackware) Switched to logging only to a file when building |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
25a0e0e47585535f1fb41b4b27d302e8 |
| User & Date: | rkeene on 2010-02-05 04:41:19 |
| Other Links: | manifest | tags |
Context
|
2010-02-05
| ||
| 04:59 | Updated Tclx build target to install correctly check-in: 3541b6d929 user: rkeene tags: trunk | |
| 04:41 | Updated ignores Switched to using "make" unless MAKE environment variable was set Added Tclx (with patches from Slackware) Switched to logging only to a file when building check-in: 25a0e0e475 user: rkeene tags: trunk | |
| 03:57 | Updated build script to avoid releasing package binary data check-in: 3b36c0ccca user: rkeene tags: trunk | |
Changes
Modified .fossil-settings/ignore-glob from [f012362875] to [c9334bfc6e].
1 2 3 4 5 | client/teapot-client.kit client/teapot-client.kit/* server/buildpkgs/tclpkgs-*.tar.* server/buildpkgs/tclpkgs-*.tar.*/* server/buildpkgs/tls/build | > > > > > > < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | client/teapot-client.kit client/teapot-client.kit/* server/buildpkgs/Tclx/build server/buildpkgs/Tclx/build/* server/buildpkgs/Tclx/out server/buildpkgs/Tclx/out/* server/buildpkgs/Tclx/src server/buildpkgs/Tclx/src/* server/buildpkgs/tclpkgs-*.tar.* server/buildpkgs/tclpkgs-*.tar.*/* server/buildpkgs/tls/build server/buildpkgs/tls/build/* server/buildpkgs/tls/out server/buildpkgs/tls/out/* server/buildpkgs/tls/src server/buildpkgs/tls/src/* server/pkgs server/pkgs/* |
Added server/buildpkgs/Tclx/build.sh version [abb6c05c23].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 |
#! /bin/bash
if [ ! -x "../platform" ]; then
echo "No platform script found, aborting." >&2
exit 1
fi
VERS=8.4
SRC="src/tclx${VERS}.tar.bz2"
SRCURL="http://sourceforge.net/projects/tclx/files/TclX/${VERS}.0/tclx${VERS}.tar.bz2/download"
BUILDDIR="tclx${VERS}"
WORKDIR="${TMPDIR:-/tmp}/tclx-$$${RANDOM}${RANDOM}${RANDOM}"
PLATFORM="$(../platform)"
PLATDIR="out/${PLATFORM}"
export VERS SRC SRCURL BUILDDIR WORKDIR PLATFORM PLATDIR
if [ ! -f "${SRC}" ]; then
mkdir src >/dev/null 2>/dev/null
wget -O "${SRC}" "${SRCURL}" || exit 1
fi
(
rm -rf build
mkdir build
cd build/ || exit 1
bzip2 -dc "../${SRC}" | tar -xf -
cd "${BUILDDIR}" || exit 1
cat << \__EOF__ | patch -p1
--- tclx8.4/configure.relid 2006-02-03 16:13:25.000000000 -0500
+++ tclx8.4/configure 2006-02-03 16:13:33.000000000 -0500
@@ -6999,7 +6999,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print }' /etc/.relid'`
+ system=MP-RAS-`awk '{print }' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
--- tclx8.4/tclconfig/tcl.m4.relid 2006-02-03 16:13:43.000000000 -0500
+++ tclx8.4/tclconfig/tcl.m4 2006-02-03 16:13:57.000000000 -0500
@@ -859,7 +859,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
@@ -2302,7 +2302,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
__EOF__
cat << \__EOF__ | patch -p1
--- tclx8.4/generic/tclXdup.c.varinit 2006-02-03 15:54:38.000000000 -0500
+++ tclx8.4/generic/tclXdup.c 2006-02-03 15:54:53.000000000 -0500
@@ -202,7 +202,7 @@
{
Tcl_Channel newChannel;
int bindFnum, fnum;
- char *srcChannelId, *targetChannelId;
+ char *srcChannelId = NULL, *targetChannelId;
if ((objc < 2) || (objc > 3)) {
return TclX_WrongArgs (interp, objv [0],
__EOF__
bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}"
${MAKE:-make} || exit 1
) || exit 1
(
mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null
cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/"
cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/"
cp "build/${BUILDDIR}/tls.tcl" "${PLATDIR}/"
../create_teapot "${PLATDIR}/teapot.txt" "Tclx" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "Extended Tcl"
) || exit 1
exit 0
|
Added server/buildpkgs/Tclx/tclx-8.4.configure.diff version [b24406143e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
--- tclx8.4/configure.relid 2006-02-03 16:13:25.000000000 -0500
+++ tclx8.4/configure 2006-02-03 16:13:33.000000000 -0500
@@ -6999,7 +6999,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print }' /etc/.relid'`
+ system=MP-RAS-`awk '{print }' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
--- tclx8.4/tclconfig/tcl.m4.relid 2006-02-03 16:13:43.000000000 -0500
+++ tclx8.4/tclconfig/tcl.m4 2006-02-03 16:13:57.000000000 -0500
@@ -859,7 +859,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
@@ -2302,7 +2302,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
|
Added server/buildpkgs/Tclx/tclx-8.4.gcc4.diff version [dfde76f190].
> > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 |
--- tclx8.4/generic/tclXdup.c.varinit 2006-02-03 15:54:38.000000000 -0500
+++ tclx8.4/generic/tclXdup.c 2006-02-03 15:54:53.000000000 -0500
@@ -202,7 +202,7 @@
{
Tcl_Channel newChannel;
int bindFnum, fnum;
- char *srcChannelId, *targetChannelId;
+ char *srcChannelId = NULL, *targetChannelId;
if ((objc < 2) || (objc > 3)) {
return TclX_WrongArgs (interp, objv [0],
|
Modified server/buildpkgs/build_all.sh from [4f07bb6e7e] to [73b14e71ab].
| ︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
fi
failed=0
(
cd "${dir}" || exit 1
rm -rf "build" "out"
if [ "${DISTCLEAN}" = "1" ]; then
rm -rf "src"
fi
if [ "${CLEANONLY}" = "1" ]; then
exit 0
fi
mkdir -p "out/${PLATFORM}" >/dev/null 2>/dev/null
| > | > > > > > > > | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 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 |
fi
failed=0
(
cd "${dir}" || exit 1
rm -rf "build" "out"
rm -f failed-*.log
if [ "${DISTCLEAN}" = "1" ]; then
rm -rf "src"
fi
if [ "${CLEANONLY}" = "1" ]; then
exit 0
fi
mkdir -p "out/${PLATFORM}" >/dev/null 2>/dev/null
./build.sh > "out/${PLATFORM}/build.log" 2>&1 || exit 1
) || failed=1
if [ "${CLEANONLY}" = "0" ]; then
echo "Building ${dir}"
fi
if [ "${failed}" = "1" ]; then
cp "${dir}/out/${PLATFORM}/build.log" "${dir}/failed-${PLATFORM}-`hostname`.log"
rm -rf "${dir}/out"
faileddirs="${faileddirs} ${dir}"
echo "Failed to build ${dir}"
fi
done
# Cleanup is done at this point
if [ "${CLEANONLY}" = "1" ]; then
exit 0
fi
# Let the user know what failed to build
if [ -n "${faileddirs}" ]; then
echo "The following failed to build:${faileddirs}"
fi
# Create tarfile of built packages
PLATFORM="$(./platform)"
DATECODE="$(date +%Y%m%d%H%M)"
OUTFILEBASE="tclpkgs-${PLATFORM}-${DATECODE}"
tar -cf - */out | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"
|
| ︙ | ︙ |
Modified server/buildpkgs/tls/build.sh from [d44be617e2] to [b97c4c4318].
| ︙ | ︙ | |||
36 37 38 39 40 41 42 |
fi
done
if [ -z "${SSLDIR}" ]; then
SSLDIR="/usr"
fi
./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}"
| | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
fi
done
if [ -z "${SSLDIR}" ]; then
SSLDIR="/usr"
fi
./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}"
${MAKE:-make} || exit 1
) || exit 1
(
mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null
cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/"
cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/"
|
| ︙ | ︙ |