From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 15 Jun 2007 19:24:57 +0000 (+0000)
Subject: Update for LIARC and other changes.
X-Git-Tag: 20090517-FFI~523
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=1ef8fe1eb8aabc2413323eb8d91e71138b294ca7;p=mit-scheme.git

Update for LIARC and other changes.
---

diff --git a/v7/dist/make-dist-files b/v7/dist/make-dist-files
index 42062db32..17d6b3b3b 100755
--- a/v7/dist/make-dist-files
+++ b/v7/dist/make-dist-files
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: make-dist-files,v 1.26 2007/02/04 02:56:10 cph Exp $
+# $Id: make-dist-files,v 1.27 2007/06/15 19:23:15 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2005 Massachusetts Institute of Technology
 #
@@ -26,41 +26,41 @@ if [ $# -gt 3 ]; then
     exit 1
 fi
 
-TYPE="${1:-std}"
-VERSION="${2}"
-DESTINATION="${3}"
+TYPE=${1:-std}
+VERSION=${2}
+DESTINATION=${3}
 
 case "${TYPE}" in
-(6001 | all | std)
+(std)
     ;;
 (snapshot)
-    [ "${VERSION}" ] || VERSION="snapshot"
+    [ "${VERSION}" ] || VERSION=snapshot
     ;;
 (*)
     echo "Unknown distribution type: ${TYPE}"
-    echo "Valid types: std all 6001 snapshot"
+    echo "Valid types: std snapshot"
     exit 1
     ;;
 esac
 
-if [ "${VERSION}" = "snapshot" ]; then
+if [ "${VERSION}" = snapshot ]; then
     VERSION=$(date +%Y%m%d)
 fi
 
-DIST_DIR="/scheme/v7/dist"
+DIST_DIR=/scheme/v7/dist
 
-. "${DIST_DIR}/release-prefix"
+. "${DIST_DIR}"/release-prefix
 
-TL_DIR="$(pwd)"
-BUILD_DIR_REL="$(get_release_prefix "${VERSION}")"
-BUILD_DIR="${TL_DIR}/${BUILD_DIR_REL}"
-SRC_FILE="${BUILD_DIR}.tar.gz"
-STAMP_BUILD="${TL_DIR}/stamp-build"
-STAMP_IMAGE="${TL_DIR}/stamp-image"
+TL_DIR=$(pwd)
+BUILD_DIR_REL=$(get_release_prefix "${VERSION}")
+BUILD_DIR=${TL_DIR}/${BUILD_DIR_REL}
+SRC_FILE=${BUILD_DIR}.tar.gz
+STAMP_BUILD=${TL_DIR}/stamp-build
+STAMP_IMAGE=${TL_DIR}/stamp-image
 
-IMAGE_DIR="${BUILD_DIR}-image"
-BINDIR="${IMAGE_DIR}/usr/local/bin"
-AUXDIR="${IMAGE_DIR}/usr/local/lib/mit-scheme"
+IMAGE_DIR=${BUILD_DIR}-image
+BINDIR=${IMAGE_DIR}/usr/local/bin
+AUXDIR=${IMAGE_DIR}/usr/local/lib/mit-scheme
 
 if [ ! -f "${SRC_FILE}" ]; then
     echo "No source file: ${SRC_FILE}."
@@ -68,7 +68,7 @@ if [ ! -f "${SRC_FILE}" ]; then
 fi
 
 MKDIR="install -d -m 755"
-INSTALL="install"
+INSTALL=install
 FOO=$(${INSTALL} --help 2> /dev/null | fgrep -e --preserve-timestamps)
 [ -n "${FOO}" ] && INSTALL="${INSTALL} --preserve-timestamps"
 INSTALL_DATA="${INSTALL} -m 644"
@@ -81,12 +81,12 @@ if [ ! -f "${STAMP_BUILD}" ];then
 
     tar xzf "${SRC_FILE}"
 
-    cd "${BUILD_DIR}/src"
+    cd "${BUILD_DIR}"/src
     ./configure --enable-static-libs=yes --enable-dynamic-modules=no \
 	--with-mcrypt=no --with-libpq=no --with-db-4=no
     make
 
-    cd "${BUILD_DIR}/doc"
+    cd "${BUILD_DIR}"/doc
     ./configure
     make
 
@@ -96,42 +96,16 @@ fi
 if [ ! -f "${STAMP_IMAGE}" ]; then
     rm -rf "${IMAGE_DIR}"
 
-    cd "${BUILD_DIR}/src"
+    cd "${BUILD_DIR}"/src
     make install DESTDIR="${IMAGE_DIR}"
-    ${MKDIR} "${AUXDIR}/doc/."
-    ${INSTALL_DATA} COPYING "${AUXDIR}/doc/."
+    ${MKDIR} "${AUXDIR}"/doc
+    ${INSTALL_DATA} COPYING "${AUXDIR}"/doc/.
 
-    cd "${BUILD_DIR}/doc"
+    cd "${BUILD_DIR}"/doc
     make install-info-gz DESTDIR="${IMAGE_DIR}" \
 	infodir=/usr/local/lib/mit-scheme/edwin/info
     make install-html DESTDIR="${IMAGE_DIR}"
 
-    ALL_BANDS="runtime.com compiler.com edwin.com all.com 6001.com"
-    case "${TYPE}" in
-    (std | snapshot)
-	for BAND in ${ALL_BANDS}; do
-	    case "${BAND}" in
-	    ("runtime.com"|"all.com")
-		;;
-	    (*)
-		rm -f "${AUXDIR}/${BAND}"
-		;;
-	    esac
-	done
-	;;
-    (6001)
-	for BAND in ${ALL_BANDS}; do
-	    case "${BAND}" in
-	    ("6001.com")
-		;;
-	    (*)
-		rm -f "${AUXDIR}/${BAND}"
-		;;
-	    esac
-	done
-	;;
-    esac
-
     find "${IMAGE_DIR}" -type f -print | xargs chmod og-w
     find "${IMAGE_DIR}" -type d -print | xargs chmod og-w
 
@@ -140,18 +114,18 @@ fi
 
 make_tarfile ()
 {
-    TARFILE="${TL_DIR}/${1}.tar.gz"
+    TARFILE=${TL_DIR}/${1}.tar.gz
     [ -e "${TARFILE}" ] && rm -f "${TARFILE}"
-    (cd ${IMAGE_DIR}/usr/local; tar cvzf "${TARFILE}" *)
+    (cd "${IMAGE_DIR}"/usr/local; tar cvzf "${TARFILE}" *)
     chmod 444 "${TARFILE}"
 }
 
 if [ "${DESTINATION}" = "" ]; then
-    PRE="${BUILD_DIR_REL}-ix86"
-    make_tarfile "${PRE}-gnu-linux"
-    if [ -f "${DIST_DIR}/freebsd-bin/scheme" ]; then
-	${INSTALL} "${DIST_DIR}/freebsd-bin/"* "${BINDIR}/."
-	make_tarfile "${PRE}-freebsd"
+    PRE=${BUILD_DIR_REL}-ix86
+    make_tarfile "${PRE}"-gnu-linux
+    if [ -f "${DIST_DIR}"/freebsd-bin/scheme ]; then
+	${INSTALL} "${DIST_DIR}"/freebsd-bin/* "${BINDIR}"/.
+	make_tarfile "${PRE}"-freebsd
     fi
 else
     make_tarfile "${DESTINATION}"
@@ -160,30 +134,30 @@ fi
 rm -rf "${STAMP_IMAGE}" "${IMAGE_DIR}"
 
 case "${TYPE}" in
-(std | all | 6001)
+(std)
     make_doc_file ()
     {
-	DOCFILE="${BUILD_DIR}-${2}.${3}"
+	DOCFILE=${BUILD_DIR}-${2}.${3}
 	rm -f "${DOCFILE}"
-	(cd "${TL_DIR}"; ${1} "${DOCFILE}" "${BUILD_DIR_REL}/${2}")
+	(cd "${TL_DIR}"; ${1} "${DOCFILE}" "${BUILD_DIR_REL}"/"${2}")
 	chmod a-w "${DOCFILE}"
     }
 
     for FMT in html info pdf ps; do
-	IMAGE_ROOT="doc-${FMT}"
-	IMAGE_DIR="${BUILD_DIR}/${IMAGE_ROOT}"
+	IMAGE_ROOT=doc-${FMT}
+	IMAGE_DIR=${BUILD_DIR}/${IMAGE_ROOT}
 	rm -rf "${IMAGE_DIR}"
 	mkdir "${IMAGE_DIR}"
 	(
-	    cd "${BUILD_DIR}/doc"
-	    make "install-${FMT}" "${FMT}dir=${IMAGE_DIR}"
+	    cd "${BUILD_DIR}"/doc
+	    make install-"${FMT}" "${FMT}"dir="${IMAGE_DIR}"
 	)
 	make_doc_file "tar cvzf" "${IMAGE_ROOT}" "tar.gz"
 	make_doc_file "zip -r" "${IMAGE_ROOT}" "zip"
 	case "${FMT}" in
 	(html | pdf)
-	    rm -rf "${TL_DIR}/${IMAGE_ROOT}"
-	    mv -f "${IMAGE_DIR}" "${TL_DIR}/."
+	    rm -rf "${TL_DIR}"/"${IMAGE_ROOT}"
+	    mv -f "${IMAGE_DIR}" "${TL_DIR}"/.
 	    ;;
 	esac
     done
diff --git a/v7/dist/make-src-files b/v7/dist/make-src-files
index caa05a0c2..5cd3edc72 100755
--- a/v7/dist/make-src-files
+++ b/v7/dist/make-src-files
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: make-src-files,v 1.27 2007/04/04 05:33:47 riastradh Exp $
+# $Id: make-src-files,v 1.28 2007/06/15 19:24:57 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2005,2006 Massachusetts Institute of Technology
 #
@@ -22,9 +22,9 @@
 . /scheme/v7/dist/release-prefix
 
 if [ $# -eq 1 ]; then
-    VERSION="${1}"
+    VERSION=${1}
 else
-    echo "usage: $0 VERSION"
+    echo "usage: ${0} VERSION"
     echo "  VERSION may be 'snapshot' to specify today's date"
     echo "  or 'standard' to specify standard release"
     exit 1
@@ -37,19 +37,22 @@ INSTALL_DATA="${INSTALL} -m 644"
 
 if [ "${VERSION}" = "snapshot" ]; then
     SNAPSHOT_P=true
-    PREFIX="$(get_release_prefix $(date +%Y%m%d))"
-    TAG_FLAG="-D"
+    RELEASE=$(date +%Y%m%d)
+    TAG_FLAG=-D
     TAG=now
 else
     if [ "${VERSION}" = "standard" ]; then
-	VERSION="$(get_release)"
+	VERSION=$(get_release)
     fi
     SNAPSHOT_P=
-    PREFIX="$(get_release_prefix "${VERSION}")"
-    TAG_FLAG="-r"
-    TAG="$(get_release_tag "${VERSION}")"
+    RELEASE=${VERSION}
+    TAG_FLAG=-r
+    TAG=$(get_release_tag "${VERSION}")
 fi
 
+PREFIX=mit-scheme-${RELEASE}
+LIARC_PREFIX=mit-scheme-c-${RELEASE}
+
 CVS="cvs -d ${USER}@cvs.savannah.gnu.org:/sources/mit-scheme"
 
 rm -rf "${PREFIX}"
@@ -58,7 +61,7 @@ mkdir "${PREFIX}"
 if [ -z "${SNAPSHOT_P}" ]; then
     (
 	cd /scheme/v7/src/runtime
-	TAG_STATUS="$(${CVS} status -v version.scm | fgrep ${TAG})"
+	TAG_STATUS=$(${CVS} status -v version.scm | fgrep ${TAG})
 	if [ -z "${TAG_STATUS}" ]; then
 	    ${CVS} rtag "${TAG}" mit-scheme/v7/doc mit-scheme/v7/src \
 		mit-scheme/etc/xscheme.el
@@ -76,31 +79,42 @@ fi
 )
 
 find "${PREFIX}" -type d -name autom4te.cache | xargs rm -rf
-find "${PREFIX}" -type f -print | xargs chmod g-w
-find "${PREFIX}" -type d -print | xargs chmod g-w
+find "${PREFIX}" -print -exec chmod go-w '{}' \;
 
 ${INSTALL_DATA} /scheme/v7/src/ChangeLog changelog.txt
-${INSTALL_DATA} /scheme/v7/src/ChangeLog "${PREFIX}/src/."
-${INSTALL_DATA} /scheme/v7/doc/ChangeLog "${PREFIX}/doc/."
-${INSTALL_DATA} /scheme/v7/dist/Makefile "${PREFIX}/."
+${INSTALL_DATA} /scheme/v7/src/ChangeLog "${PREFIX}"/src/.
+${INSTALL_DATA} /scheme/v7/doc/ChangeLog "${PREFIX}"/doc/.
+${INSTALL_DATA} /scheme/v7/dist/Makefile "${PREFIX}"/.
+
+rm -rf "${LIARC_PREFIX}"
+cp -a "${PREFIX}" "${LIARC_PREFIX}"
+
+(
+    cd "${LIARC_PREFIX}"/src
+    umask 022
+    etc/make-liarc-dist.sh
+)
 
-tarfile="${PREFIX}.tar.gz"
-zipfile="${PREFIX}.zip"
-ucfile="${PREFIX}-ucode.tar.gz"
+TAR_FILE=${PREFIX}.tar.gz
+LIARC_FILE=${LIARC_PREFIX}.tar.gz
+ZIP_FILE=${PREFIX}.zip
+UCODE_FILE=${PREFIX}-ucode.tar.gz
 
-rm -f "${tarfile}"
-rm -f "${zipfile}"
-rm -f "${ucfile}"
+rm -f "${TAR_FILE}"
+rm -f "${LIARC_FILE}"
+rm -f "${ZIP_FILE}"
+rm -f "${UCODE_FILE}"
 
-tar cvzf "${tarfile}" "${PREFIX}"
-tar cvzf "${ucfile}" "${PREFIX}/src/COPYING" "${PREFIX}/src/microcode"
-chmod -w changelog.txt "${tarfile}" "${ucfile}"
+tar cvzf "${TAR_FILE}" "${PREFIX}"
+tar cvzf "${LIARC_FILE}" "${LIARC_PREFIX}"
+tar cvzf "${UCODE_FILE}" "${PREFIX}"/src/COPYING "${PREFIX}"/src/microcode
+chmod -w changelog.txt "${TAR_FILE}" "${LIARC_FILE}" "${UCODE_FILE}"
 
-rm -rf "${PREFIX}/src/lib"
-for S in $(find ${PREFIX} -type l); do
+rm -rf "${PREFIX}"/src/lib
+for S in $(find "${PREFIX}" -type l); do
     [ ! -r "${S}" ] && rm -f "${S}"
 done
-zip -rl "${zipfile}" "${PREFIX}"
-chmod -w "${zipfile}"
+zip -rl "${ZIP_FILE}" "${PREFIX}"
+chmod -w "${ZIP_FILE}"
 
-rm -rf "${PREFIX}"
+rm -rf "${PREFIX}" "${LIARC_PREFIX}"