Overview
Comment: | Added support for creating teapot descriptor |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a478ff4b065ed0af7b15a2e364a2f821 |
User & Date: | rkeene on 2010-02-05 02:20:41 |
Other Links: | manifest | tags |
Context
2010-02-05
| ||
02:22 | Added catchall for platform check-in: 7a3272e8a7 user: rkeene tags: trunk | |
02:20 | Added support for creating teapot descriptor check-in: a478ff4b06 user: rkeene tags: trunk | |
01:44 | Updated to store build log in output directory check-in: 30541f9462 user: rkeene tags: trunk | |
Changes
Modified server/work/Makefile from [e6f364d300] to [f2ece7f06f].
1 2 3 4 5 6 | all: tclpkgs-src-current.tar.gz tclpkgs-src-current.tar.gz: tclpkgs-src-current tar -zcf tclpkgs-src-current.tar.gz tclpkgs-src-current rm -rf tclpkgs-src-current | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | all: tclpkgs-src-current.tar.gz tclpkgs-src-current.tar.gz: tclpkgs-src-current tar -zcf tclpkgs-src-current.tar.gz tclpkgs-src-current rm -rf tclpkgs-src-current tclpkgs-src-current: platform build_all.sh create_teapot */build.sh rm -rf tclpkgs-src-current mkdir tclpkgs-src-current cp -rp platform build_all.sh create_teapot tclpkgs-src-current/ for dir in */; do \ if test ! -f "$$dir/build.sh"; then continue; fi; \ mkdir "tclpkgs-src-current/$$dir"; \ cp "$$dir/build.sh" "tclpkgs-src-current/$$dir"; \ done clean: |
︙ | ︙ |
Added server/work/create_teapot version [7fbee19e66].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #! /bin/bash OUTFILE="$1" PKG="$2" PKGVER="$3" SRCURL="$4" PLATFORM="$5" REQS="$6" DESC="$7" TMPFILE="${TMPDIR:-/tmp}/reqfile-$$${RANDOM}${RANDOM}${RANDOM}" export OUTFILE PKG PKGVER SRCURL PLATFORM REQS DESC TMPFILE VALIDSYNTAX=1 if [ -z "${OUTFILE}" ]; then echo 'ERROR: Output not specified' >&2 VALIDSYNTAX=0 fi if [ -z "${PKG}" ]; then echo 'ERROR: Package not specified' >&2 VALIDSYNTAX=0 fi if [ -z "${PKGVER}" ]; then echo 'ERROR: Package version not specified' >&2 VALIDSYNTAX=0 fi if [ -z "${PLATFORM}" ]; then echo 'ERROR: Platform not specified' >&2 VALIDSYNTAX=0 fi if [ -z "${DESC}" ]; then echo 'ERROR: Description not specified' >&2 VALIDSYNTAX=0 fi if [ "${VALIDSYNTAX}" = "0" ]; then echo 'Usage: create_teapot <output> <pkg> <pkgver> <srcurl> <platform> <reqs> <desc>' >&2 exit 1 fi OUTSHORT=$(echo "${OUTFILE}" | sed 's@^.*/@@') TEXTFILE=0 if [ "${OUTSHORT}" = "teapot.txt" ]; then TEXTFILE=1 fi if [ ! -e "${OUTFILE}" ]; then TEXTFILE=1 fi rm -f "${TMPFILE}" cat << __EOF__ > "${TMPFILE}" Package ${PKG} ${PKGVER} Meta platform ${PLATFORM} Meta rsk::build::date $(date +%Y-%m-%d) Meta description ${DESC} __EOF__ echo "${REQS}" | tr ',' "\n" | while read req; do req="$(echo "${req}" | sed 's@^ *@@;s@ *$@@')" if [ -z "${req}" ]; then continue fi if echo "${req}" | grep ' ' >/dev/null; then req="{${req}}" fi echo "Meta require ${req}" >> "${TMPFILE}" done if [ "${TEXTFILE}" = "1" ]; then cat "${TMPFILE}" > "${OUTFILE}" else ( head -1 "${OUTFILE}" echo '' echo '# @@ Meta Begin' sed 's@^@# @' "${TMPFILE}" echo '# @@ Meta End' echo '' tail +2 "${OUTFILE}" ) > "${OUTFILE}.new" cat "${OUTFILE}.new" > "${OUTFILE}" rm -f "${OUTFILE}.new" fi rm -f "${TMPFILE}" |
Modified server/work/tls/build.sh from [94a2a79b39] to [d44be617e2].
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 | ( 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}/" ) || exit 1 exit 0 | > > | 45 46 47 48 49 50 51 52 53 54 55 56 | ( 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" "tls" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "SSL TLS Secure Sockets" ) || exit 1 exit 0 |