Import Upstream version 2c7upstream/2c7

1 files changed, 83 insertions, 43 deletions

diff --git a/Makefile b/Makefile
index 149b1ba..dd11471 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ intro:
 srcdir=$(HOME)/slib/
 dvidir=../dvi/
 dvi:	$(dvidir)slib.dvi
-$(dvidir)slib.dvi:	$(srcdir)slib.texi $(dvidir)slib.fn
+$(dvidir)slib.dvi:	version.txi slib.texi $(dvidir)slib.fn
 #	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
@@ -22,9 +22,16 @@ $(dvidir)slib.fn:
 xdvi:	$(dvidir)slib.dvi
 	xdvi -s 6 $(dvidir)slib.dvi
 htmldir=../public_html/
+slib_toc.html:	version.txi slib.texi
+	texi2html -split -verbose slib.texi
+
+slib/slib_toc.html:
+	cd slib;make slib_toc.html
+	cd slib;texi2html -split -verbose slib.texi
+
 html:	$(htmldir)slib_toc.html
-$(htmldir)slib_toc.html:	$(srcdir)slib.texi
-	cd $(htmldir);make slib_toc.html
+$(htmldir)slib_toc.html:	slib slib_toc.html Makefile
+	hitch slib/slib_\*.html slib_\*.html $(htmldir)
 
 prefix = /usr/local
 exec_prefix = $(prefix)
@@ -91,27 +98,38 @@ install48: slib48
 	(echo '#!/bin/sh'; \
 	 echo exec $(RUNNABLE) -i '$(LIB)/$(IMAGE)' \"\$$\@\") \
 	  > $(bindir)/slib48
-	chmod +x $(bindir)/slib48	
+	chmod +x $(bindir)/slib48
+
+#### Stuff for maintaining SLIB below ####
+
+VERSION = 2c7
+ver = $(VERSION)
+version.txi:	Makefile
+	echo @set SLIBVERSION $(VERSION) > version.txi
+	echo @set SLIBDATE `date +"%B %Y"` >> version.txi
 
 scheme = scm
 
 htmlform.txi:	 *.scm
 	$(scheme) -rschmooz -e'(schmooz "slib.texi")'
-
-info:	$(infodir)/slib.info
-$(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
+slib$(VERSION).info:	version.txi slib.texi htmlform.txi objdoc.txi
+	-mv slib.info slibtemp.info
+	makeinfo slib.texi --no-split -o slib.info
+	mv slib.info slib$(VERSION).info
+	-mv slibtemp.info slib.info
+slib.info:	slib$(VERSION).info
+	infobar slib/slib.info slib$(VERSION).info slib.info
+info:	installinfo
+installinfo:	$(infodir)/slib.info
+$(infodir)/slib.info:	slib.info
+	cp -a slib.info $(infodir)/slib.info
+	-install-info $(infodir)/slib.info $(infodir)/dir
+	-rm $(infodir)/slib.info.gz
+infoz:	installinfoz
+installinfoz:	$(infodir)/slib.info.gz
 $(infodir)/slib.info.gz:	$(infodir)/slib.info
-	gzip -f $(infodir)/slib.info*
-
-#### Stuff for maintaining SLIB below ####
+	gzip -f $(infodir)/slib.info
 
-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 \
@@ -120,10 +138,10 @@ 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 \
 	eval.scm
-afiles = ratize.scm randinex.scm modular.scm primes.scm factor.scm \
+afiles = ratize.scm randinex.scm modular.scm factor.scm \
 	 charplot.scm root.scm cring.scm determ.scm selfset.scm \
 	 psxtime.scm cltime.scm timezone.scm tzfile.scm
-bfiles = collect.scm fluidlet.scm struct.scm yasos.scm
+bfiles = collect.scm fluidlet.scm struct.scm object.scm recobj.scm yasyn.scm
 scfiles = r4rsyn.scm scmacro.scm synclo.scm synrul.scm synchk.scm \
 	repl.scm macwork.scm mwexpand.scm mwdenote.scm mwsynrul.scm
 scafiles = scainit.scm scaglob.scm scamacr.scm scaoutp.scm scaexpp.scm \
@@ -132,17 +150,19 @@ dfiles = defmacex.scm mbe.scm
 efiles = record.scm dynamic.scm queue.scm process.scm \
 	priorque.scm hash.scm hashtab.scm alist.scm \
 	wttree.scm wttest.scm array.scm arraymap.scm \
-	sierpinski.scm soundex.scm byte.scm
+	sierpinski.scm soundex.scm byte.scm nclients.scm
 rfiles = rdms.scm alistab.scm dbutil.scm paramlst.scm report.scm \
 	batch.scm makcrc.scm dbrowse.scm comparse.scm getopt.scm \
-	htmlform.scm getparam.scm glob.scm
+	htmlform.scm getparam.scm glob.scm fft.scm
 gfiles = tek40.scm tek41.scm
-docfiles = ANNOUNCE README FAQ ChangeLog slib.texi fmtdoc.txi
+docfiles = ANNOUNCE README FAQ slib.info slib.texi objdoc.txi fmtdoc.txi \
+	ChangeLog
 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
+ifiles = bigloo.init chez.init elk.init macscheme.init \
+	mitscheme.init scheme2c.init scheme48.init gambit.init t3.init	\
+	vscm.init mitcomp.pat scm.init scsh.init pscheme.init STk.init	\
+	RScheme.init umbscheme.init
 tfiles = plottest.scm formatst.scm macrotst.scm scmactst.scm \
 	dwindtst.scm structst.scm
 sfiles = $(ffiles) $(lfiles) $(revfiles) $(afiles) $(scfiles) $(efiles) \
@@ -151,6 +171,7 @@ allfiles = $(docfiles) $(mfiles) $(ifiles) $(sfiles) $(tfiles) $(bfiles)
 
 makedev = make -f $(HOME)/makefile.dev
 CHPAT=$(HOME)/bin/chpat
+RSYNC=rsync -v --rsync-path bin/rsync
 dest = $(HOME)/dist/
 temp/slib:	$(allfiles)
 	-rm -rf temp
@@ -163,22 +184,40 @@ infotemp/slib:	slib.info
 	mkdir infotemp
 	mkdir infotemp/slib
 	ln slib.info slib.info-* infotemp/slib
+#For change-barred HTML.
+slib:
+	unzip -a $(dest)slib[0-9]*.zip
 
-distinfo:	$(dest)slib.info.tar.gz
-$(dest)slib.info.tar.gz:	infotemp/slib
-	$(makedev) TEMP=infotemp/ DEST=$(dest) PROD=slib ver=.info tar.gz
+distinfo:	$(dest)slib.info.zip
+$(dest)slib.info.zip:	infotemp/slib
+	$(makedev) TEMP=infotemp/ DEST=$(dest) PROD=slib ver=.info zip
 	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/
+	cp $(srcdir)ANNOUNCE $(htmldir)SLIB_ANNOUNCE
+	$(RSYNC) $(htmldir)SLIB.html $(htmldir)SLIB_ANNOUNCE nestle.ai.mit.edu:public_html/
+	$(RSYNC) $(dest)README $(dest)slib$(VERSION).zip nestle.ai.mit.edu:dist/
+#	upload $(dest)README $(dest)slib$(VERSION).zip ftp.gnu.org:gnu/jacal/
+#	$(MAKE) indiana
+indiana:
+	upload $(dest)slib$(VERSION).zip ftp@ftp.cs.indiana.edu:/pub/scheme-repository/incoming
+	echo -e \
+	'I have uploaded slib$(VERSION).zip to ftp.cs.indiana.edu:/pub/scheme-repository/incoming\n' \
+	'for placement into ftp.cs.indiana.edu:/pub/scheme-repository/code/lib/' \
+	 | mail -s 'SLIB upload' -b jaffer scheme-repository-request@cs.indiana.edu
+
+postnews:
+	echo -e "Newsgroups: comp.lang.scheme\n" | cat - ANNOUNCE | \
+	inews -h -O -S \
+	-f "announce@docupress.com (Aubrey Jaffer & Radey Shouman)" \
+	 -t "SLIB$(VERSION) Released" -d world
+
 upzip:	$(HOME)/pub/slib.zip
-	rsync -v $(HOME)/pub/slib.zip martigny.ai.mit.edu:pub/
+	$(RSYNC) $(HOME)/pub/slib.zip nestle.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
+dist:	$(dest)slib$(VERSION).zip
+$(dest)slib$(VERSION).zip:	temp/slib
+	$(makedev) DEST=$(dest) PROD=slib ver=$(VERSION) zip
 	cvs tag -F slib$(VERSION)
 shar:	slib.shar
 slib.shar:	temp/slib
@@ -190,10 +229,10 @@ slib.com:	temp/slib
 zip:	slib.zip
 slib.zip:	temp/slib
 	$(makedev) PROD=slib zip
-distzip:	slib$(VERSION).zip
-slib$(VERSION).zip:	temp/slib
-	$(makedev) DEST=$(dest) PROD=slib ver=$(VERSION) zip
-	mv $(dest)slib$(VERSION).zip /c/scm/dist/
+doszip:	/c/scm/dist/slib$(VERSION).zip
+/c/scm/dist/slib$(VERSION).zip:	temp/slib
+	$(makedev) DEST=/c/scm/dist/ PROD=slib ver=$(VERSION) zip
+	zip -d /c/scm/dist/slib$(VERSION).zip slib/slib.info
 pubzip:	temp/slib
 	$(makedev) DEST=$(HOME)/pub/ PROD=slib zip
 
@@ -203,7 +242,7 @@ pubdiffs:	temp/slib
 distdiffs:	temp/slib
 	$(makedev) DEST=$(dest) PROD=slib ver=$(ver) distdiffs
 announcediffs:	temp/slib
-	$(makedev) DEST=$(dest) PROD=slib ver=2c3 announcediffs
+	$(makedev) DEST=$(dest) PROD=slib ver=$(VERSION) 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
@@ -234,14 +273,15 @@ new:
 		$(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 \
+		$(htmldir)SIMSYNCH.html ../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 \
 		 $(htmldir)SLIB.html
+	cvs commit -m '(*SLIB-VERSION*): Bumped from $(VERSION) to $(ver).'
+	cvs tag -F slib$(ver)
 
-tagfiles = slib.texi $(mfiles) $(sfiles) $(bfiles) $(tfiles)
+tagfiles = version.txi slib.texi $(mfiles) $(sfiles) $(bfiles) $(tfiles)
 # README and $(ifiles) cause semgentation faults in ETAGS for Emacs version 19.
 tags:	$(tagfiles)
 	etags $(tagfiles)