Change to add CVS tag to documentation and source files, and to use

CVS "export" command rather than "checkout".

diff --git a/v7/dist/make-dist-files b/v7/dist/make-dist-files
index 0b80dc885e30c8bb9528f1b3e5a9d870ab74be01..7d62959d6c8716d9087fd0df35194eeedc72748d 100755 (executable)
--- a/v7/dist/make-dist-files
+++ b/v7/dist/make-dist-files
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# $Id: make-dist-files,v 1.10 2000/12/27 18:26:32 cph Exp $
+# $Id: make-dist-files,v 1.11 2001/01/08 20:52:12 cph Exp $
 #
-# Copyright (c) 2000 Massachusetts Institute of Technology
+# Copyright (c) 2000-2001 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
@@ -34,6 +34,8 @@ case "${TYPE}" in
   ;;
 esac
 
+. /scheme/v7/dist/release-prefix
+
 BUILD_DIR="`pwd`/build-$$"
 BINDIR=${BUILD_DIR}/usr/local/bin
 AUXDIR=${BUILD_DIR}/usr/local/lib/mit-scheme
@@ -143,7 +145,7 @@ make_tarfile ()
 }
 
 if [ "${DESTINATION}" = "" ]; then
-  PRE="`/scheme/v7/dist/release-prefix`-ix86"
+  PRE="`get_release_prefix`-ix86"
   make_tarfile "${PRE}-gnu-linux"
   ${INSTALL} /scheme/v7/dist/freebsd-bin/* ${BINDIR}/.
   make_tarfile "${PRE}-freebsd"

diff --git a/v7/dist/make-doc-files b/v7/dist/make-doc-files
index 67aec2019ad0ef109fc658acbc5af7df89195448..b7f5913baa4f74004ddf8873e8981bb15c0d25ac 100755 (executable)
--- a/v7/dist/make-doc-files
+++ b/v7/dist/make-doc-files
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# $Id: make-doc-files,v 1.13 2000/12/24 04:04:01 cph Exp $
+# $Id: make-doc-files,v 1.14 2001/01/08 20:52:15 cph Exp $
 #
-# Copyright (c) 2000 Massachusetts Institute of Technology
+# Copyright (c) 2000-2001 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
@@ -18,10 +18,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+. /scheme/v7/dist/release-prefix
+
 INSTALL="install"
 INSTALL_DATA="${INSTALL} -m 644"
 DOCDIR="/scheme/v7/doc"
-PREFIX=`/scheme/v7/dist/release-prefix`
+PREFIX=`get_release_prefix`
+TAG=`get_release_tag`
 TLDIR="`pwd`/${PREFIX}"
 
 rm -rf ${TLDIR}
@@ -59,12 +62,11 @@ done
 
 (
     cd ${TLDIR}
-    cvs -d /scheme/cvsroot checkout -P -d doc v7/doc
+    cvs -d /scheme/cvsroot export -r ${TAG} -d doc v7/doc
     cd doc
     autoconf
 )
 ${INSTALL_DATA} ${DOCDIR}/ChangeLog ${TLDIR}/doc/.
-find ${TLDIR} -type d -name CVS -print|xargs rm -rf
 make_tarfile texinfo
 
 rm -rf ${TLDIR}

diff --git a/v7/dist/make-src-files b/v7/dist/make-src-files
index 19b68149e84f86138528969936f6b046c9b071d8..0d114a23fd243e0f04a5f90ff47b302d702d5060 100755 (executable)
--- a/v7/dist/make-src-files
+++ b/v7/dist/make-src-files
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# $Id: make-src-files,v 1.14 2000/12/25 06:20:43 cph Exp $
+# $Id: make-src-files,v 1.15 2001/01/08 20:52:17 cph Exp $
 #
-# Copyright (c) 2000 Massachusetts Institute of Technology
+# Copyright (c) 2000-2001 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
@@ -18,21 +18,32 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+. /scheme/v7/dist/release-prefix
+
 INSTALL="install"
 INSTALL_DATA="${INSTALL} -m 644"
-PREFIX=`/scheme/v7/dist/release-prefix`
+PREFIX=`get_release_prefix`
+TAG=`get_release_tag`
+
 rm -rf ${PREFIX}
 mkdir ${PREFIX}
 DESTINATION="${PREFIX}/src"
 
+(
+    cd /scheme/v7/src/runtime
+    TAG_STATUS="`cvs status -v version.scm | fgrep ${TAG}`"
+    if [ -z "${TAG_STATUS}" ]; then
+       cvs rtag ${TAG} v7/doc v7/src
+    fi
+)
+
 (
     cd ${PREFIX}
-    cvs -d /scheme/cvsroot checkout -P -d src v7/src
+    cvs -d /scheme/cvsroot export -r ${TAG} -d src v7/src
     cd src
     ./Setup.sh
 )
 
-find ${DESTINATION} -type d -name CVS -print | xargs rm -rf
 find ${DESTINATION} -type f -print | xargs chmod g-w
 find ${DESTINATION} -type d -print | xargs chmod g-w
 

diff --git a/v7/dist/release-prefix b/v7/dist/release-prefix
index 95ffa4e5a169d1214278c458a8bd72ae5a21f5fe..1880ecebd2ce6e608eba5506a101b938ba8ddac1 100755 (executable)
--- a/v7/dist/release-prefix
+++ b/v7/dist/release-prefix
@@ -1,6 +1,33 @@
-#!/bin/sh
-get_release()
+
+# $Id: release-prefix,v 1.5 2001/01/08 20:52:20 cph Exp $
+#
+# Copyright (c) 2000-2001 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
+# the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+get_release ()
 {
-  fgrep Release /scheme/v7/src/runtime/version.scm | awk '{ print $3 "." $4 "." $5 }' | tr -d \(\)\'
+    fgrep Release /scheme/v7/src/runtime/version.scm | awk '{ print $3 "." $4 "." $5 }' | tr -d \(\)\'
+}
+
+get_release_prefix ()
+{
+    echo "scheme-`get_release`"
+}
+
+get_release_tag ()
+{
+    echo "release-`get_release | tr . -`"
 }
-echo "scheme-`get_release`"