Import Upstream version 2c3upstream/2c3

1 files changed, 35 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 0f8d7fe..149b1ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for Scheme Library
-# Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997 Aubrey Jaffer.
+# Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 Aubrey Jaffer.
 
 SHELL = /bin/sh
 intro:
@@ -14,11 +14,11 @@ srcdir=$(HOME)/slib/
 dvidir=../dvi/
 dvi:	$(dvidir)slib.dvi
 $(dvidir)slib.dvi:	$(srcdir)slib.texi $(dvidir)slib.fn
-#	cd $(dvidir);texi2dvi $(srcdir)slib.texi
-	-(cd $(dvidir);texindex slib.??)
-	cd $(dvidir);tex $(srcdir)slib.texi
+#	cd $(dvidir);export TEXINPUTS=$(srcdir):;texi2dvi $(srcdir)slib.texi
+	-(cd $(dvidir);export TEXINPUTS=$(srcdir):;texindex slib.??)
+	cd $(dvidir);export TEXINPUTS=$(srcdir):;tex $(srcdir)slib.texi
 $(dvidir)slib.fn:
-	cd $(dvidir);tex $(srcdir)slib.texi
+	cd $(dvidir);export TEXINPUTS=$(srcdir):;tex $(srcdir)slib.texi
 xdvi:	$(dvidir)slib.dvi
 	xdvi -s 6 $(dvidir)slib.dvi
 htmldir=../public_html/
@@ -93,9 +93,15 @@ install48: slib48
 	  > $(bindir)/slib48
 	chmod +x $(bindir)/slib48	
 
+scheme = scm
+
+htmlform.txi:	 *.scm
+	$(scheme) -rschmooz -e'(schmooz "slib.texi")'
+
 info:	$(infodir)/slib.info
-$(infodir)/slib.info:	slib.texi
+$(infodir)/slib.info:	slib.texi htmlform.txi
 	makeinfo slib.texi -o $(infodir)/slib.info
+	install-info $(infodir)/slib.info $(infodir)/dir
 	-rm $(infodir)/slib.info*.gz
 
 infoz:	$(infodir)/slib.info.gz
@@ -104,15 +110,16 @@ $(infodir)/slib.info.gz:	$(infodir)/slib.info
 
 #### Stuff for maintaining SLIB below ####
 
-VERSION = 2c0
+VERSION = 2c3
 ver = $(VERSION)
 ffiles = printf.scm format.scm genwrite.scm obj2str.scm pp.scm \
 	ppfile.scm strcase.scm debug.scm trace.scm lineio.scm \
 	strport.scm scanf.scm chap.scm qp.scm break.scm stdio.scm \
-	strsrch.scm prec.scm
+	strsrch.scm prec.scm schmooz.scm
 lfiles = sort.scm comlist.scm tree.scm logical.scm random.scm tsort.scm
 revfiles = sc4opt.scm sc4sc3.scm sc2.scm mularg.scm mulapply.scm \
-	trnscrpt.scm withfile.scm dynwind.scm promise.scm values.scm
+	trnscrpt.scm withfile.scm dynwind.scm promise.scm values.scm \
+	eval.scm
 afiles = ratize.scm randinex.scm modular.scm primes.scm factor.scm \
 	 charplot.scm root.scm cring.scm determ.scm selfset.scm \
 	 psxtime.scm cltime.scm timezone.scm tzfile.scm
@@ -127,10 +134,12 @@ efiles = record.scm dynamic.scm queue.scm process.scm \
 	wttree.scm wttest.scm array.scm arraymap.scm \
 	sierpinski.scm soundex.scm byte.scm
 rfiles = rdms.scm alistab.scm dbutil.scm paramlst.scm report.scm \
-	batch.scm makcrc.scm dbrowse.scm comparse.scm getopt.scm
+	batch.scm makcrc.scm dbrowse.scm comparse.scm getopt.scm \
+	htmlform.scm getparam.scm glob.scm
 gfiles = tek40.scm tek41.scm
-docfiles = ANNOUNCE README FAQ ChangeLog slib.texi
-mfiles = Makefile require.scm Template.scm syncase.sh mklibcat.scm
+docfiles = ANNOUNCE README FAQ ChangeLog slib.texi fmtdoc.txi
+mfiles = Makefile require.scm Template.scm syncase.sh mklibcat.scm \
+	Bev2slib.scm
 ifiles = chez.init elk.init macscheme.init \
 	mitscheme.init scheme2c.init scheme48.init gambit.init t3.init \
 	vscm.init mitcomp.pat scm.init scsh.init
@@ -160,9 +169,17 @@ $(dest)slib.info.tar.gz:	infotemp/slib
 	$(makedev) TEMP=infotemp/ DEST=$(dest) PROD=slib ver=.info tar.gz
 	rm -rf infotemp
 
+release:	dist
+	rsync -v $(htmldir)SLIB.html martigny.ai.mit.edu:public_html/
+	rsync -v $(dest)README $(dest)slib$(VERSION).tar.gz martigny.ai.mit.edu:dist/
+	upload $(dest)README $(dest)slib$(VERSION).tar.gz prep.ai.mit.edu:gnu/jacal/
+upzip:	$(HOME)/pub/slib.zip
+	rsync -v $(HOME)/pub/slib.zip martigny.ai.mit.edu:pub/
+
 dist:	$(dest)slib$(VERSION).tar.gz
 $(dest)slib$(VERSION).tar.gz:	temp/slib
 	$(makedev) DEST=$(dest) PROD=slib ver=$(VERSION) tar.gz
+	cvs tag -F slib$(VERSION)
 shar:	slib.shar
 slib.shar:	temp/slib
 	$(makedev) PROD=slib shar
@@ -186,7 +203,7 @@ pubdiffs:	temp/slib
 distdiffs:	temp/slib
 	$(makedev) DEST=$(dest) PROD=slib ver=$(ver) distdiffs
 announcediffs:	temp/slib
-	$(makedev) DEST=$(dest) PROD=slib ver=2c0 announcediffs
+	$(makedev) DEST=$(dest) PROD=slib ver=2c3 announcediffs
 
 psdfiles=COPYING.psd README.psd cmuscheme.el comint.el instrum.scm pexpr.scm \
 	primitives.scm psd-slib.scm psd.el read.scm runtime.scm version.scm
@@ -214,14 +231,15 @@ new:
 	mv -f change ChangeLog
 	$(CHPAT) slib$(VERSION) slib$(ver) ANNOUNCE FAQ ../scm/ANNOUNCE \
 		../jacal/ANNOUNCE ../wb/README ../wb/ANNOUNCE \
-		../public_html/README.html ../dist/README \
-		../public_html/SLIB.html ../public_html/JACAL.html \
-		../public_html/SCM.html ../public_html/Hobbit.html \
+		$(htmldir)README.html ../dist/README \
+		$(htmldir)SLIB.html $(htmldir)JACAL.html \
+		$(htmldir)SCM.html $(htmldir)Hobbit.html \
+		$(htmldir)SIMSYNCH.html \
 		../scm/README ../scm/scm.texi \
 		/c/scm/dist/install.bat /c/scm/dist/makefile \
 		/c/scm/dist/mkdisk.bat
 	$(CHPAT) $(VERSION) $(ver) README slib.texi require.scm Makefile \
-		 ../public_html/SLIB.html
+		 $(htmldir)SLIB.html
 
 tagfiles = slib.texi $(mfiles) $(sfiles) $(bfiles) $(tfiles)
 # README and $(ifiles) cause semgentation faults in ETAGS for Emacs version 19.