From a3687c1f52c2a9b41e7a2852dffaff3ad64bbe3f Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Tue, 13 Dec 2005 06:41:05 +0000 Subject: [PATCH] Ugh: the CVS/Root file for this directory was not updated after the move to Savannah, and consequently all of the updates have been recorded in the wrong place. Merge them back in now. --- v7/dist/copyright.c | 21 +++---- v7/dist/copyright.scm | 21 +++---- v7/dist/make-dist-files | 119 ++++++++++++++++++++++------------------ v7/dist/make-scmutils | 38 +++++++------ v7/dist/make-src-files | 101 ++++++++++++++++++++-------------- v7/dist/release-prefix | 6 +- 6 files changed, 171 insertions(+), 135 deletions(-) diff --git a/v7/dist/copyright.c b/v7/dist/copyright.c index df9145037..549c6fb5c 100644 --- a/v7/dist/copyright.c +++ b/v7/dist/copyright.c @@ -1,23 +1,24 @@ /* -*-C-*- -$Id: copyright.c,v 1.3 2002/11/20 18:32:26 cph Exp $ +$Id: copyright.c,v 1.4 2005/12/13 06:40:58 cph Exp $ -Copyright 2002 Massachusetts Institute of Technology +Copyright 2005 Massachusetts Institute of Technology -This file is part of MIT Scheme. +This file is part of MIT/GNU Scheme. -MIT Scheme is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. +MIT/GNU Scheme is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. -MIT Scheme is distributed in the hope that it will be useful, but +MIT/GNU Scheme is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT Scheme; if not, write to the Free Software Foundation, -Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +USA. */ diff --git a/v7/dist/copyright.scm b/v7/dist/copyright.scm index 76b465cd6..5e63a6679 100644 --- a/v7/dist/copyright.scm +++ b/v7/dist/copyright.scm @@ -1,24 +1,25 @@ #| -*-Scheme-*- -$Id: copyright.scm,v 1.3 2002/11/20 18:32:19 cph Exp $ +$Id: copyright.scm,v 1.4 2005/12/13 06:41:00 cph Exp $ -Copyright 2002 Massachusetts Institute of Technology +Copyright 2005 Massachusetts Institute of Technology -This file is part of MIT Scheme. +This file is part of MIT/GNU Scheme. -MIT Scheme is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. +MIT/GNU Scheme is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. -MIT Scheme is distributed in the hope that it will be useful, but +MIT/GNU Scheme is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT Scheme; if not, write to the Free Software Foundation, -Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +USA. |# diff --git a/v7/dist/make-dist-files b/v7/dist/make-dist-files index 75f7876cf..765f1faa7 100755 --- a/v7/dist/make-dist-files +++ b/v7/dist/make-dist-files @@ -1,8 +1,8 @@ #!/bin/sh -# $Id: make-dist-files,v 1.22 2002/06/18 00:51:18 cph Exp $ +# $Id: make-dist-files,v 1.23 2005/12/13 06:41:02 cph Exp $ # -# Copyright (c) 2000-2002 Massachusetts Institute of Technology +# Copyright 2000,2001,2002,2003,2005 Massachusetts Institute of Technology # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,14 +31,22 @@ VERSION="${2}" DESTINATION="${3}" case "${TYPE}" in -6001|all|std) - ;; -*) - echo "Unknown distribution type: ${TYPE}" - exit 1 - ;; +(6001 | all | std) + ;; +(snapshot) + [ "${VERSION}" ] || VERSION="snapshot" + ;; +(*) + echo "Unknown distribution type: ${TYPE}" + echo "Valid types: std all 6001 snapshot" + exit 1 + ;; esac +if [ "${VERSION}" = "snapshot" ]; then + VERSION=$(date +%Y%m%d) +fi + DIST_DIR="/scheme/v7/dist" . "${DIST_DIR}/release-prefix" @@ -46,7 +54,7 @@ DIST_DIR="/scheme/v7/dist" TL_DIR="$(pwd)" BUILD_DIR_REL="$(get_release_prefix "${VERSION}")" BUILD_DIR="${TL_DIR}/${BUILD_DIR_REL}" -SRC_FILE="${BUILD_DIR}-src.tar.gz" +SRC_FILE="${BUILD_DIR}.tar.gz" STAMP_BUILD="${TL_DIR}/stamp-build" STAMP_IMAGE="${TL_DIR}/stamp-image" @@ -60,7 +68,7 @@ if [ ! -f "${SRC_FILE}" ]; then fi MKDIR="install -d -m 755" -INSTALL="install -p" +INSTALL="install --preserve-timestamps" INSTALL_DATA="${INSTALL} -m 644" # It takes a lot of work to build the image. @@ -72,8 +80,8 @@ if [ ! -f "${STAMP_BUILD}" ];then tar xzf "${SRC_FILE}" cd "${BUILD_DIR}/src" - ./configure --enable-static-libs=yes --enable-dynamic-crypto=no \ - --with-mcrypt=no + ./configure --enable-static-libs=yes --enable-dynamic-modules=no \ + --with-mcrypt=no --with-libpq=no --with-db4=no make cd "${BUILD_DIR}/doc" @@ -84,7 +92,7 @@ if [ ! -f "${STAMP_BUILD}" ];then fi if [ ! -f "${STAMP_IMAGE}" ]; then - rm -rf ${IMAGE_DIR} + rm -rf "${IMAGE_DIR}" cd "${BUILD_DIR}/src" make install DESTDIR="${IMAGE_DIR}" @@ -101,26 +109,24 @@ if [ ! -f "${STAMP_IMAGE}" ]; then ${INSTALL_DATA} ${DIST_DIR}/info/r5rs.* "${AUXDIR}/edwin/info/." ALL_BANDS="runtime.com compiler.com edwin.com all.com 6001.com" - case ${TYPE} in - std) + case "${TYPE}" in + (std | snapshot) for BAND in ${ALL_BANDS}; do case "${BAND}" in - "runtime.com"|"all.com") + ("runtime.com"|"all.com") ;; - *) + (*) rm -f "${AUXDIR}/${BAND}" ;; esac done ;; - all) - ;; - 6001) + (6001) for BAND in ${ALL_BANDS}; do case "${BAND}" in - "6001.com") + ("6001.com") ;; - *) + (*) rm -f "${AUXDIR}/${BAND}" ;; esac @@ -143,41 +149,48 @@ make_tarfile () } if [ "${DESTINATION}" = "" ]; then - PRE="${BUILD_DIR_REL}-ix86" - make_tarfile "${PRE}-gnu-linux" - ${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}" + make_tarfile "${DESTINATION}" fi rm -rf "${STAMP_IMAGE}" "${IMAGE_DIR}" -make_doc_file () -{ - DOCFILE="${BUILD_DIR}-${2}.${3}" - rm -f "${DOCFILE}" - (cd "${TL_DIR}"; ${1} "${DOCFILE}" "${BUILD_DIR_REL}/${2}") - chmod a-w "${DOCFILE}" -} - -for TYPE in html info pdf ps; do - IMAGE_ROOT="doc-${TYPE}" - IMAGE_DIR="${BUILD_DIR}/${IMAGE_ROOT}" - rm -rf "${IMAGE_DIR}" - mkdir "${IMAGE_DIR}" - ( - cd "${BUILD_DIR}/doc" - make "install-${TYPE}" "${TYPE}dir=${IMAGE_DIR}" - ) - make_doc_file "tar cvzf" "${IMAGE_ROOT}" "tar.gz" - make_doc_file "zip -r" "${IMAGE_ROOT}" "zip" - case "${TYPE}" in - html | pdf) - rm -rf "${TL_DIR}/${IMAGE_ROOT}" - mv -f "${IMAGE_DIR}" "${TL_DIR}/." - ;; - esac -done +case "${TYPE}" in +(std | all | 6001) + make_doc_file () + { + DOCFILE="${BUILD_DIR}-${2}.${3}" + rm -f "${DOCFILE}" + (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}" + rm -rf "${IMAGE_DIR}" + mkdir "${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}/." + ;; + esac + done + ;; +esac +cd "${TL_DIR}" rm -rf "${STAMP_BUILD}" "${BUILD_DIR}" diff --git a/v7/dist/make-scmutils b/v7/dist/make-scmutils index e38085da5..20bcdde3a 100755 --- a/v7/dist/make-scmutils +++ b/v7/dist/make-scmutils @@ -1,8 +1,8 @@ #!/bin/sh -# $Id: make-scmutils,v 1.4 2002/11/20 18:20:40 cph Exp $ +# $Id: make-scmutils,v 1.5 2005/12/13 06:41:03 cph Exp $ # -# Copyright (c) 2001, 2002 Massachusetts Institute of Technology +# Copyright 2001,2002,2004 Massachusetts Institute of Technology # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ # # 2. Link or copy a scheme binary release into it: # -# ln /scheme/v7/dist/X.Y.Z/scheme-X.Y.Z-ix86-gnu-linux.tar.gz . +# ln /scheme/v7/dist/X.Y.Z/mit-scheme-X.Y.Z-ix86-gnu-linux.tar.gz . # # 3. Run this script: # @@ -41,18 +41,20 @@ if [ $# -gt 0 ]; then exit 1 fi -SCHEME_TAR=$(ls scheme-*-ix86-gnu-linux.tar.gz 2> /dev/null) +SCHEME_TAR=$(ls mit-scheme-*-ix86-gnu-linux.tar.gz 2> /dev/null) if [ -z "${SCHEME_TAR}" ]; then - echo "Unable to find file 'scheme-X.Y.Z-ix86-gnu-linux.tar.gz'" + echo "Unable to find file 'mit-scheme-X.Y.Z-ix86-gnu-linux.tar.gz'" exit 1 fi -SVERSION=$(echo "${SCHEME_TAR}" | tail -1 | sed -e 's/^scheme-\(..*\)-ix86-gnu-linux\.tar\.gz$/\1/') +SVERSION=$(echo "${SCHEME_TAR}" | tail -1 | sed -e 's/^mit-scheme-\(..*\)-ix86-gnu-linux\.tar\.gz$/\1/') + +echo "MIT/GNU Scheme version: ${SVERSION}" TL_DIR="$(pwd)" SOURCE_DIR="/sw/scmutils" DIST_DIR="/scheme/v7/dist" -SCHEME_DIR="${TL_DIR}/scheme-${SVERSION}" +SCHEME_DIR="${TL_DIR}/mit-scheme-${SVERSION}" SBINDIR="${SCHEME_DIR}/bin" SAUXDIR="${SCHEME_DIR}/lib/mit-scheme" @@ -76,7 +78,7 @@ INSTALL_DATA="${INSTALL} -m 644" SCHEME="${SBINDIR}/scheme -library ${SAUXDIR}" if [ ! -f "${STAMP_UNPACK}" ];then - echo "Unpack MIT Scheme" + echo "Unpack MIT/GNU Scheme" rm -rf "${SCHEME_DIR}" ${MKDIR} "${SCHEME_DIR}" (cd "${SCHEME_DIR}"; tar xzf "../${SCHEME_TAR}") @@ -90,20 +92,22 @@ if [ ! -f "${STAMP_BUILD}" ];then cpx -qsE "${SOURCE_DIR}/src" "${BUILD_DIR}" rm -f "${BUILD_DIR}/load.scm" ln -s "${SOURCE_DIR}/dist/load.scm" "${BUILD_DIR}/." - cd "${BUILD_DIR}" - echo "Compile binaries" - ${SCHEME} -compiler -heap 4000 > compile.out \ + ( + cd "${BUILD_DIR}" + echo "Compile binaries" + ${SCHEME} -compiler -heap 4000 > compile.out \ < load.out \ + echo "Compiler output in ${BUILD_DIR}/compile.out" + echo "Generate mechanics band" + ${SCHEME} -edwin -compiler -heap 4000 > load.out \ <