Import Upstream version 2c0upstream/2c0

1 files changed, 78 insertions, 60 deletions

diff --git a/Makefile b/Makefile
index a2b8de7..0f8d7fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for Scheme Library
-# Copyright (C) 1991, 1992, 1993, 1994, 1995 Aubrey Jaffer.
+# Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997 Aubrey Jaffer.
 
 SHELL = /bin/sh
 intro:
@@ -20,7 +20,11 @@ $(dvidir)slib.dvi:	$(srcdir)slib.texi $(dvidir)slib.fn
 $(dvidir)slib.fn:
 	cd $(dvidir);tex $(srcdir)slib.texi
 xdvi:	$(dvidir)slib.dvi
-	xdvi $(dvidir)slib.dvi
+	xdvi -s 6 $(dvidir)slib.dvi
+htmldir=../public_html/
+html:	$(htmldir)slib_toc.html
+$(htmldir)slib_toc.html:	$(srcdir)slib.texi
+	cd $(htmldir);make slib_toc.html
 
 prefix = /usr/local
 exec_prefix = $(prefix)
@@ -31,8 +35,9 @@ RUNNABLE = scheme48
 LIB = $(libdir)/$(RUNNABLE)
 VM = scheme48vm
 IMAGE = slib.image
+INSTALL_DATA = install -c
 
-slib48:
+slib48.036:
 	(echo ,load `pwd`/scheme48.init; \
 	 echo "(define *args* '())"; \
 	 echo "(define (program-arguments) (cons \"$(VM)\" *args*))"; \
@@ -43,33 +48,75 @@ slib48:
 	  > $(bindir)/slib48
 	chmod +x $(bindir)/slib48
 
+$(LIB)/slibcat:
+	touch $(LIB)/slibcat
+
+slib48:	$(LIB)/slibcat Makefile
+	(echo ",batch on"; \
+	 echo ",config"; \
+	 echo ",load =scheme48/misc/packages.scm"; \
+	 echo "(define-structure slib-primitives"; \
+	 echo "	 (export s48-error"; \
+	 echo "	   s48-ascii->char"; \
+	 echo "	   s48-force-output"; \
+	 echo "	   s48-current-error-port"; \
+	 echo "	   s48-system";\
+	 echo "	   s48-with-handler";\
+	 echo "	   s48-getenv)";\
+	 echo "	 (open scheme signals ascii extended-ports i/o"; \
+	 echo "	       primitives handle unix-getenv)"; \
+	 echo "	 (begin"; \
+	 echo "	   (define s48-error error)"; \
+	 echo "	   (define s48-ascii->char ascii->char)"; \
+	 echo "	   (define s48-force-output force-output)"; \
+	 echo "	   (define s48-current-error-port current-error-port)"; \
+	 echo "	   (define (s48-system c) (vm-extension 96 c))"; \
+	 echo "	   (define s48-with-handler with-handler)"; \
+	 echo "	   (define s48-getenv getenv)))"; \
+	 echo ",user"; \
+	 echo ",open slib-primitives"; \
+	 echo "(define (implementation-vicinity) \"$(LIB)/\")"; \
+	 echo "(define (library-vicinity) \"`pwd`/\")"; \
+	 echo ",load scheme48.init"; \
+	 echo "(define *args* '())"; \
+	 echo "(define (program-arguments) (cons \"scheme48\" *args*))"; \
+	 echo "(set! *catalog* #f)"; \
+	 echo ",collect"; \
+	 echo ",batch off"; \
+	 echo ",dump $(IMAGE) \"(slib $(VERSION))\""; \
+	 echo ",exit") | scheme48
+
+install48: slib48
+	$(INSTALL_DATA) $(IMAGE) $(LIB)
+	(echo '#!/bin/sh'; \
+	 echo exec $(RUNNABLE) -i '$(LIB)/$(IMAGE)' \"\$$\@\") \
+	  > $(bindir)/slib48
+	chmod +x $(bindir)/slib48	
+
 info:	$(infodir)/slib.info
-	-make schelog-info
 $(infodir)/slib.info:	slib.texi
 	makeinfo slib.texi -o $(infodir)/slib.info
+	-rm $(infodir)/slib.info*.gz
 
 infoz:	$(infodir)/slib.info.gz
-	-make schelog-infoz
 $(infodir)/slib.info.gz:	$(infodir)/slib.info
-	-rm $(infodir)/slib.info*.gz
-	gzip $(infodir)/slib.info*
+	gzip -f $(infodir)/slib.info*
 
 #### Stuff for maintaining SLIB below ####
 
-VERSION = 2a6
+VERSION = 2c0
 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
+	strsrch.scm prec.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
 afiles = ratize.scm randinex.scm modular.scm primes.scm factor.scm \
-	 charplot.scm time.scm cltime.scm root.scm
-bfiles = collect.scm fluidlet.scm struct.scm \
-	object.scm recobj.scm yasyn.scm
-#	yasos.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
 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 \
@@ -78,15 +125,15 @@ 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
+	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
 gfiles = tek40.scm tek41.scm
 docfiles = ANNOUNCE README FAQ ChangeLog slib.texi
-mfiles = Makefile require.scm Template.scm
+mfiles = Makefile require.scm Template.scm syncase.sh mklibcat.scm
 ifiles = chez.init elk.init macscheme.init \
 	mitscheme.init scheme2c.init scheme48.init gambit.init t3.init \
-	vscm.init mitcomp.pat syncase.sh
+	vscm.init mitcomp.pat scm.init scsh.init
 tfiles = plottest.scm formatst.scm macrotst.scm scmactst.scm \
 	dwindtst.scm structst.scm
 sfiles = $(ffiles) $(lfiles) $(revfiles) $(afiles) $(scfiles) $(efiles) \
@@ -139,7 +186,7 @@ pubdiffs:	temp/slib
 distdiffs:	temp/slib
 	$(makedev) DEST=$(dest) PROD=slib ver=$(ver) distdiffs
 announcediffs:	temp/slib
-	$(makedev) DEST=$(dest) PROD=slib ver=2a1 announcediffs
+	$(makedev) DEST=$(dest) PROD=slib ver=2c0 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
@@ -158,55 +205,23 @@ psdist:	$(dest)slib-psd.tar.gz
 $(dest)slib-psd.tar.gz:	psdtemp/slib
 	$(makedev) DEST=$(dest) PROD=slib ver=-psd tar.gz TEMP=psdtemp/
 
-schelogfiles = copying schelog.doc schelog.scm schelog.texi
-schelogexamples = bible.scm england2.scm holland.scm mapcol.scm \
-	schelogt.scm england.scm games.scm houses.scm puzzle.scm \
-	toys.scm
-
-schelogtemp/slib:
-	-rm -rf schelogtemp
-	mkdir schelogtemp
-	mkdir schelogtemp/slib
-	mkdir schelogtemp/slib/schelog
-	cd schelog; ln $(schelogfiles) ../schelogtemp/slib/schelog
-	mkdir schelogtemp/slib/schelog/examples
-	cd schelog/examples; ln $(schelogexamples) \
-	../../schelogtemp/slib/schelog/examples
-
-schelogdist:	schelog-dist
-schelog-dist:	$(dest)slib-schelog.tar.gz
-$(dest)slib-schelog.tar.gz:	schelogtemp/slib
-	$(makedev) DEST=$(dest) PROD=slib ver=-schelog tar.gz TEMP=schelogtemp/
-
-schelog-info:	$(infodir)/schelog.info
-$(infodir)/schelog.info:	schelog/schelog.texi
-	makeinfo schelog/schelog.texi -o $(infodir)/schelog.info
-
-schelog-infoz:	$(infodir)/schelog.info.gz
-$(infodir)/schelog.info.gz:	$(infodir)/schelog.info
-	-rm $(infodir)/schelog.info*.gz
-	gzip $(infodir)/schelog.info*
-
-schelog.dvi:	$(dvidir)schelog.dvi
-$(dvidir)schelog.dvi:	$(srcdir)schelog/schelog.texi $(dvidir)schelog.fn
-#	cd $(dvidir);texi2dvi $(srcdir)schelog/schelog.texi
-	-(cd $(dvidir);texindex schelog.??)
-	cd $(dvidir);tex $(srcdir)schelog/schelog.texi
-$(dvidir)schelog.fn:
-	cd $(dvidir);tex $(srcdir)schelog/schelog.texi
-schelog-xdvi:	$(dvidir)schelog.dvi
-	xdvi $(dvidir)schelog.dvi
-
 new:
+	echo `date` \ Aubrey Jaffer \ \<`whoami`@`hostname`\>> change
+	echo>> change
+	echo \	\* require.scm \(*SLIB-VERSION*\): Bumped from $(VERSION) to $(ver).>>change
+	echo>> change
+	cat ChangeLog >> change
+	mv -f change ChangeLog
 	$(CHPAT) slib$(VERSION) slib$(ver) ANNOUNCE FAQ ../scm/ANNOUNCE \
 		../jacal/ANNOUNCE ../wb/README ../wb/ANNOUNCE \
-		/c/scm/dist/install.bat /c/scm/dist/makefile \
 		../public_html/README.html ../dist/README \
 		../public_html/SLIB.html ../public_html/JACAL.html \
 		../public_html/SCM.html ../public_html/Hobbit.html \
-		/c/scm/dist/mkdisk.bat \
-		../scm/README ../scm/scm.texi
-	$(CHPAT) $(VERSION) $(ver) README slib.texi require.scm Makefile
+		../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
 
 tagfiles = slib.texi $(mfiles) $(sfiles) $(bfiles) $(tfiles)
 # README and $(ifiles) cause semgentation faults in ETAGS for Emacs version 19.
@@ -217,6 +232,9 @@ test:	$(sfiles)
 rights:
 	scm -ladmin -e"(admin:check-all)" $(sfiles) $(tfiles) \
 		$(bfiles) $(ifiles)
+report:
+	scmlit -e"(slib:report #t)"
+	scm -e"(slib:report #t)"
 clean:
 	-rm -f *~ *.bak *.orig *.rej core a.out *.o \#*
 	-rm -rf *temp