aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/ChangeLog17
-rw-r--r--src/interp/Makefile.in158
-rw-r--r--src/interp/Makefile.pamphlet160
-rw-r--r--src/interp/bookvol5.pamphlet49
-rw-r--r--src/interp/br-search.boot.pamphlet9
-rw-r--r--src/interp/construc.lisp.pamphlet10
-rw-r--r--src/interp/daase.lisp.pamphlet18
-rw-r--r--src/interp/i-toplev.boot.pamphlet2
-rw-r--r--src/interp/patches.lisp.pamphlet2
-rw-r--r--src/interp/pathname.boot.pamphlet3
-rw-r--r--src/interp/util.lisp.pamphlet40
11 files changed, 224 insertions, 244 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 5764493d..0611d6a8 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,22 @@
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * br-search.boot.pamphlet: Replace uses of $SPAROOT with
+ systemRootDirectory.
+ * construc.lisp.pamphlet: Likewise.
+ * daase.lisp.pamphlet: Likewise.
+ * i-toplev.boot.pamphlet: Likewise.
+ * patches.lisp.pamphlet: Likewise.
+ * pathname.boot.pamphlet: Likewise.
+ * util.lisp.pamphlet: Likewise.
+ * bookvol5.pamphlet: Remove $spadroot throughout.
+ (initroot): Remove.
+ (reroot): Lose argument.
+ * Makefile.pamphlet (makeint.lisp): Depend on
+ sys-driver.$(FASLEXT). Explicitly load it.
+ Miscellaneous cleanup.
+
+2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* bookvol5.pamphlet (initroot): Use |systemRootDirectory| instead
of environment variable AXIOM.
(|loadExposureGroupData|): Likewise.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index f7a4099e..709c2768 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -275,7 +275,8 @@ clean-local: mostlyclean-local
distclean-local: clean-local
makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
- nocompil.lisp \
+ nocompil.$(FASLEXT) \
+ sys-driver.$(FASLEXT) \
${OUTINTERP} obey.$(FASLEXT) \
database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
${NAGBROBJS} ${TRANOBJS} \
@@ -288,16 +289,17 @@ makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
$(mkinstalldirs) $(axiom_target_datadir)/msgs
$(INSTALL_DATA) $(axiom_src_docdir)/msgs/s2-us.msgs \
$(axiom_target_datadir)/msgs
+ @ echo '(|importModule| "sys-driver")' >> makeint.lisp
@ echo '(|importModule| "vmlisp")' >> makeint.lisp
@ echo '(|importModule| "hash")' >> makeint.lisp
@ echo '(gbc t)' >> makeint.lisp
- @ echo '(load "nocompil.lisp")' >> makeint.lisp
+ @ echo '(|importModule| "nocompil")' >> makeint.lisp
@ echo '(|importModule| "bookvol5")' >> makeint.lisp
@ echo '(|importModule| "util")' >> makeint.lisp
@ echo '(in-package "BOOT")' >> makeint.lisp
@ touch ${TIMESTAMP}
@ echo '${YEARWEEK}' >> makeint.lisp
- @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))) "${AXIOM}")' >> makeint.lisp
+ @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))))' >> makeint.lisp
@ echo '(boot::set-restart-hook)' >> makeint.lisp
@ echo '(in-package "BOOT")' >> makeint.lisp
@ echo '(load "../algebra/warm.data")' >> makeint.lisp
@@ -380,7 +382,7 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \
@ echo '(|importModule| "bookvol5")' >> makedep.lisp
@ echo '(|importModule| "util")' >> makedep.lisp
@ echo '(in-package "BOOT")' >> makedep.lisp
- @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${AXIOM}")' >> makedep.lisp
+ @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))))' >> makedep.lisp
@ echo '(in-package "AxiomCore")' >> makedep.lisp
@ echo '(|importModule| "newaux")' >> makedep.lisp
@ echo '(|importModule| "parse")' >> makedep.lisp
@@ -588,71 +590,71 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
as.clisp: as.boot
@ echo 417 making $@ from $<
- @ echo '(progn (old-boot::boot "as.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "as.boot")' | ${DEPSYS}
ax.clisp: ax.boot
@ echo 463 making $@ $<
- @ echo '(progn (old-boot::boot "ax.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "ax.boot")' | ${DEPSYS}
bc-misc.clisp: bc-misc.boot
@ echo 428 making $@ from $<
- @ echo '(progn (old-boot::boot "bc-misc.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "bc-misc.boot")' | ${DEPSYS}
bc-solve.clisp: bc-solve.boot
@ echo 432 making $@ from $<
- @ echo '(progn (old-boot::boot "bc-solve.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "bc-solve.boot")' | ${DEPSYS}
br-con.clisp: br-con.boot
@ echo 467 making $@ from $<
- @ echo '(progn (old-boot::boot "br-con.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-con.boot")' | ${DEPSYS}
br-data.clisp: br-data.boot
@ echo 483 making $@ from $<
- @ echo '(progn (old-boot::boot "br-data.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-data.boot")' | ${DEPSYS}
br-op1.clisp: br-op1.boot
@ echo 475 making $@ from $<
- @ echo '(progn (old-boot::boot "br-op1.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-op1.boot")' | ${DEPSYS}
br-op2.clisp: br-op2.boot
@ echo 479 making $@ from $<
- @ echo '(progn (old-boot::boot "br-op2.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-op2.boot")' | ${DEPSYS}
br-saturn.clisp: br-saturn.boot
@ echo 491 making $@ from $<
- @ echo '(progn (old-boot::boot "br-saturn.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-saturn.boot")' | ${DEPSYS}
br-search.clisp: br-search.boot
@ echo 471 making $@ from $<
- @ echo '(progn (old-boot::boot "br-search.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-search.boot")' | ${DEPSYS}
br-util.clisp: br-util.boot
@ echo 487 making $@ from $<
- @ echo '(progn (old-boot::boot "br-util.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-util.boot")' | ${DEPSYS}
category.clisp: category.boot
@ echo 212 making $@ from $<
- @ echo '(progn (old-boot::boot "category.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "category.boot")' | ${DEPSYS}
cattable.clisp: cattable.boot
@ echo 215 making $@ from $<
- @ echo '(progn (old-boot::boot "cattable.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "cattable.boot")' | ${DEPSYS}
c-doc.clisp: c-doc.boot
@ echo 219 making $@ from $<
- @ echo '(progn (old-boot::boot "c-doc.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "c-doc.boot")' | ${DEPSYS}
clammed.clisp: clammed.boot
@ echo 226 making $@ from $<
- @ echo '(progn (old-boot::boot "clammed.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "clammed.boot")' | ${DEPSYS}
compat.clisp: compat.boot
@ echo 229 making $@ from $<
- @ echo '(progn (old-boot::boot "compat.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "compat.boot")' | ${DEPSYS}
compiler.clisp: compiler.boot
@ echo 233 making $@ from $<
- @ echo '(progn (old-boot::boot "compiler.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS}
c-util.${LISP}: $(srcdir)/c-util.boot.pamphlet
@ echo 146 making c-util.${LISP} from $(srcdir)/c-util.boot.pamphlet
@@ -666,15 +668,15 @@ c-util.clisp: c-util.boot
database.clisp: database.boot
@ echo 243 making $@ from $<
- @ echo '(progn (old-boot::boot "database.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "database.boot")' | ${DEPSYS}
define.clisp: define.boot
@ echo 247 making $@ from $<
- @ echo '(progn (old-boot::boot "define.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "define.boot")' | ${DEPSYS}
format.clisp: format.boot
@ echo 250 making $@ from $<
- @ echo '(progn (old-boot::boot "format.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "format.boot")' | ${DEPSYS}
fortcall.clisp: fortcall.boot
@ echo 55 making $@ from $<
@@ -683,63 +685,63 @@ fortcall.clisp: fortcall.boot
functor.clisp: functor.boot
@ echo 254 making $@ from $<
- @ echo '(progn (old-boot::boot "functor.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "functor.boot")' | ${DEPSYS}
g-cndata.clisp: g-cndata.boot
@ echo 261 making $@ from $<
- @ echo '(progn (old-boot::boot "g-cndata.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "g-cndata.boot")' | ${DEPSYS}
g-opt.clisp: g-opt.boot
@ echo 267 making $@ from $<
- @ echo '(progn (old-boot::boot "g-opt.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "g-opt.boot")' | ${DEPSYS}
g-timer.clisp: g-timer.boot
@ echo 270 making $@ from $<
- @ echo '(progn (old-boot::boot "g-timer.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "g-timer.boot")' | ${DEPSYS}
htcheck.clisp: htcheck.boot
@ echo 455 making $@ from $<
- @ echo '(progn (old-boot::boot "htcheck.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "htcheck.boot")' | ${DEPSYS}
ht-root.clisp: ht-root.boot
@ echo 451 making $@ from $<
- @ echo '(progn (old-boot::boot "ht-root.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "ht-root.boot")' | ${DEPSYS}
htsetvar.clisp: htsetvar.boot
@ echo 444 making $@ from $<
- @ echo '(progn (old-boot::boot "htsetvar.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "htsetvar.boot")' | ${DEPSYS}
ht-util.clisp: ht-util.boot
@ echo 440 making $@ from $<
- @ echo '(progn (old-boot::boot "ht-util.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "ht-util.boot")' | ${DEPSYS}
hypertex.clisp: hypertex.boot
@ echo 277 making $@ from $<
- @ echo '(progn (old-boot::boot "hypertex.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "hypertex.boot")' | ${DEPSYS}
i-analy.clisp: i-analy.boot
@ echo 280 making $@ from $<
- @ echo '(progn (old-boot::boot "i-analy.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-analy.boot")' | ${DEPSYS}
i-code.clisp: i-code.boot
@ echo 283 making $@ from $<
- @ echo '(progn (old-boot::boot "i-code.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-code.boot")' | ${DEPSYS}
i-coerce.clisp: i-coerce.boot
@ echo 286 making $@ from $<
- @ echo '(progn (old-boot::boot "i-coerce.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-coerce.boot")' | ${DEPSYS}
i-coerfn.clisp: i-coerfn.boot
@ echo 289 making $@ from $<
- @ echo '(progn (old-boot::boot "i-coerfn.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-coerfn.boot")' | ${DEPSYS}
i-eval.clisp: i-eval.boot
@ echo 292 making $@ from $<
- @ echo '(progn (old-boot::boot "i-eval.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-eval.boot")' | ${DEPSYS}
i-funsel.clisp: i-funsel.boot
@ echo 295 making $@ from $<
- @ echo '(progn (old-boot::boot "i-funsel.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-funsel.boot")' | ${DEPSYS}
bookvol5.lisp: $(srcdir)/bookvol5.pamphlet
@ echo 298 making $@ from $<
@@ -747,173 +749,173 @@ bookvol5.lisp: $(srcdir)/bookvol5.pamphlet
i-intern.clisp: i-intern.boot
@ echo 301 making $@ from $<
- @ echo '(progn (old-boot::boot "i-intern.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-intern.boot")' | ${DEPSYS}
i-map.clisp: i-map.boot
@ echo 304 making $@ from $<
- @ echo '(progn (old-boot::boot "i-map.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-map.boot")' | ${DEPSYS}
info.clisp: info.boot
@ echo 329 making $@ from $<
- @ echo '(progn (old-boot::boot "info.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "info.boot")' | ${DEPSYS}
i-resolv.clisp: i-resolv.boot
@ echo 310 making $@ from $<
- @ echo '(progn (old-boot::boot "i-resolv.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-resolv.boot")' | ${DEPSYS}
i-spec1.clisp: i-spec1.boot
@ echo 313 making $@ from $<
- @ echo '(progn (old-boot::boot "i-spec1.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-spec1.boot")' | ${DEPSYS}
i-spec2.clisp: i-spec2.boot
@ echo 316 making $@ from i-spec2.boot
- @ echo '(progn (old-boot::boot "i-spec2.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-spec2.boot")' | ${DEPSYS}
i-syscmd.clisp: i-syscmd.boot
@ echo 319 making $@ from $<
- @ echo '(progn (old-boot::boot "i-syscmd.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-syscmd.boot")' | ${DEPSYS}
iterator.clisp: iterator.boot
@ echo 333 making $@ from $<
- @ echo '(progn (old-boot::boot "iterator.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "iterator.boot")' | ${DEPSYS}
i-toplev.clisp: i-toplev.boot
@ echo 322 making $@ from $<
- @ echo '(progn (old-boot::boot "i-toplev.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-toplev.boot")' | ${DEPSYS}
i-util.clisp: i-util.boot
@ echo 325 making $@ from $<
- @ echo '(progn (old-boot::boot "i-util.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-util.boot")' | ${DEPSYS}
lisplib.clisp: lisplib.boot
@ echo 336 making $@ from $<
- @ echo '(progn (old-boot::boot "lisplib.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "lisplib.boot")' | ${DEPSYS}
match.clisp: match.boot
@ echo 339 making $@ from $<
- @ echo '(progn (old-boot::boot "match.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "match.boot")' | ${DEPSYS}
modemap.clisp: modemap.boot
@ echo 343 making $@ from $<
- @ echo '(progn (old-boot::boot "modemap.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "modemap.boot")' | ${DEPSYS}
msgdb.clisp: msgdb.boot
@ echo 346 making $@ from $<
- @ echo '(progn (old-boot::boot "msgdb.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "msgdb.boot")' | ${DEPSYS}
nag-c02.clisp: nag-c02.boot
@ echo 152 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-c02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-c02.boot")' | ${DEPSYS}
nag-c05.clisp: nag-c05.boot
@ echo 156 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-c05.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-c05.boot")' | ${DEPSYS}
nag-c06.clisp: nag-c06.boot
@ echo 160 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-c06.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-c06.boot")' | ${DEPSYS}
nag-d01.clisp: nag-d01.boot
@ echo 164 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-d01.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-d01.boot")' | ${DEPSYS}
nag-d02.clisp: nag-d02.boot
@ echo 168 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-d02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-d02.boot")' | ${DEPSYS}
nag-d03.clisp: nag-d03.boot
@ echo 172 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-d03.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-d03.boot")' | ${DEPSYS}
nag-e01.clisp: nag-e01.boot
@ echo 176 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-e01.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-e01.boot")' | ${DEPSYS}
nag-e02.clisp: nag-e02.boot
@ echo 184 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-e02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-e02.boot")' | ${DEPSYS}
nag-e04.clisp: nag-e04.boot
@ echo 188 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-e04.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-e04.boot")' | ${DEPSYS}
nag-f01.clisp: nag-f01.boot
@ echo 192 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f01.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f01.boot")' | ${DEPSYS}
nag-f02.clisp: nag-f02.boot
@ echo 196 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f02.boot")' | ${DEPSYS}
nag-f04.clisp: nag-f04.boot
@ echo 200 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f04.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f04.boot")' | ${DEPSYS}
nag-f07.clisp: nag-f07.boot
@ echo 204 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f07.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f07.boot")' | ${DEPSYS}
nag-s.clisp: nag-s.boot
@ echo 208 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-s.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-s.boot")' | ${DEPSYS}
newfort.clisp: newfort.boot
@ echo 349 making $@ from $<
- @ echo '(progn (old-boot::boot "newfort.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "newfort.boot")' | ${DEPSYS}
nruncomp.clisp: nruncomp.boot
@ echo 353 making $@ from $<
- @ echo '(progn (old-boot::boot "nruncomp.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nruncomp.boot")' | ${DEPSYS}
nrunfast.clisp: nrunfast.boot
@ echo 356 making $@ from $<
- @ echo '(progn (old-boot::boot "nrunfast.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nrunfast.boot")' | ${DEPSYS}
nrungo.clisp: nrungo.boot
@ echo 359 making $@ from $<
- @ echo '(progn (old-boot::boot "nrungo.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nrungo.boot")' | ${DEPSYS}
nruntime.clisp: nruntime.boot
@ echo 362 making $@ from $<
- @ echo '(progn (old-boot::boot "nruntime.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nruntime.boot")' | ${DEPSYS}
nrunopt.clisp: nrunopt.boot
@ echo 365 making $@ from $<
- @ echo '(progn (old-boot::boot "nrunopt.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nrunopt.boot")' | ${DEPSYS}
profile.clisp: profile.boot
@ echo 237 making $@ from $<
- @ echo '(progn (old-boot::boot "profile.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "profile.boot")' | ${DEPSYS}
record.clisp: record.boot
@ echo 447 making $@ $<
- @ echo '(progn (old-boot::boot "record.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "record.boot")' | ${DEPSYS}
rulesets.clisp: rulesets.boot
@ echo 388 making $@ from $<
- @ echo '(progn (old-boot::boot "rulesets.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "rulesets.boot")' | ${DEPSYS}
server.clisp: server.boot
@ echo 391 making $@ from $<
- @ echo '(progn (old-boot::boot "server.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "server.boot")' | ${DEPSYS}
setvart.clisp: setvart.boot
@ echo 398 making $@ from $<
- @ echo '(progn (old-boot::boot "setvart.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "setvart.boot")' | ${DEPSYS}
../algebra/warm.data: $(srcdir)/Makefile.pamphlet
@ echo 2 building warm.data
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 23651987..fd929778 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1012,7 +1012,7 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \
@ echo '(|importModule| "bookvol5")' >> makedep.lisp
@ echo '(|importModule| "util")' >> makedep.lisp
@ echo '(in-package "BOOT")' >> makedep.lisp
- @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${AXIOM}")' >> makedep.lisp
+ @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))))' >> makedep.lisp
@ echo '(in-package "AxiomCore")' >> makedep.lisp
@ echo '(|importModule| "newaux")' >> makedep.lisp
@ echo '(|importModule| "parse")' >> makedep.lisp
@@ -1068,7 +1068,8 @@ Doing otherwise causes havoc.
<<savesys>>=
makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
- nocompil.lisp \
+ nocompil.$(FASLEXT) \
+ sys-driver.$(FASLEXT) \
${OUTINTERP} obey.$(FASLEXT) \
database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
${NAGBROBJS} ${TRANOBJS} \
@@ -1081,16 +1082,17 @@ makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
$(mkinstalldirs) $(axiom_target_datadir)/msgs
$(INSTALL_DATA) $(axiom_src_docdir)/msgs/s2-us.msgs \
$(axiom_target_datadir)/msgs
+ @ echo '(|importModule| "sys-driver")' >> makeint.lisp
@ echo '(|importModule| "vmlisp")' >> makeint.lisp
@ echo '(|importModule| "hash")' >> makeint.lisp
@ echo '(gbc t)' >> makeint.lisp
- @ echo '(load "nocompil.lisp")' >> makeint.lisp
+ @ echo '(|importModule| "nocompil")' >> makeint.lisp
@ echo '(|importModule| "bookvol5")' >> makeint.lisp
@ echo '(|importModule| "util")' >> makeint.lisp
@ echo '(in-package "BOOT")' >> makeint.lisp
@ touch ${TIMESTAMP}
@ echo '${YEARWEEK}' >> makeint.lisp
- @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))) "${AXIOM}")' >> makeint.lisp
+ @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))))' >> makeint.lisp
@ echo '(boot::set-restart-hook)' >> makeint.lisp
@ echo '(in-package "BOOT")' >> makeint.lisp
@ echo '(load "../algebra/warm.data")' >> makeint.lisp
@@ -1178,7 +1180,7 @@ c-util.clisp: c-util.boot
<<nag-c02.clisp>>=
nag-c02.clisp: nag-c02.boot
@ echo 152 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-c02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-c02.boot")' | ${DEPSYS}
@
@@ -1187,7 +1189,7 @@ nag-c02.clisp: nag-c02.boot
<<nag-c05.clisp>>=
nag-c05.clisp: nag-c05.boot
@ echo 156 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-c05.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-c05.boot")' | ${DEPSYS}
@
@@ -1196,7 +1198,7 @@ nag-c05.clisp: nag-c05.boot
<<nag-c06.clisp>>=
nag-c06.clisp: nag-c06.boot
@ echo 160 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-c06.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-c06.boot")' | ${DEPSYS}
@
@@ -1205,7 +1207,7 @@ nag-c06.clisp: nag-c06.boot
<<nag-d01.clisp>>=
nag-d01.clisp: nag-d01.boot
@ echo 164 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-d01.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-d01.boot")' | ${DEPSYS}
@
@@ -1214,7 +1216,7 @@ nag-d01.clisp: nag-d01.boot
<<nag-d02.clisp>>=
nag-d02.clisp: nag-d02.boot
@ echo 168 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-d02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-d02.boot")' | ${DEPSYS}
@
@@ -1223,7 +1225,7 @@ nag-d02.clisp: nag-d02.boot
<<nag-d03.clisp>>=
nag-d03.clisp: nag-d03.boot
@ echo 172 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-d03.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-d03.boot")' | ${DEPSYS}
@
@@ -1232,7 +1234,7 @@ nag-d03.clisp: nag-d03.boot
<<nag-e01.clisp>>=
nag-e01.clisp: nag-e01.boot
@ echo 176 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-e01.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-e01.boot")' | ${DEPSYS}
@
@@ -1241,7 +1243,7 @@ nag-e01.clisp: nag-e01.boot
<<nag-e02.clisp>>=
nag-e02.clisp: nag-e02.boot
@ echo 184 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-e02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-e02.boot")' | ${DEPSYS}
@
@@ -1250,7 +1252,7 @@ nag-e02.clisp: nag-e02.boot
<<nag-e04.clisp>>=
nag-e04.clisp: nag-e04.boot
@ echo 188 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-e04.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-e04.boot")' | ${DEPSYS}
@
@@ -1259,7 +1261,7 @@ nag-e04.clisp: nag-e04.boot
<<nag-f01.clisp>>=
nag-f01.clisp: nag-f01.boot
@ echo 192 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f01.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f01.boot")' | ${DEPSYS}
@
@@ -1268,7 +1270,7 @@ nag-f01.clisp: nag-f01.boot
<<nag-f02.clisp>>=
nag-f02.clisp: nag-f02.boot
@ echo 196 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f02.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f02.boot")' | ${DEPSYS}
@
@@ -1277,7 +1279,7 @@ nag-f02.clisp: nag-f02.boot
<<nag-f04.clisp>>=
nag-f04.clisp: nag-f04.boot
@ echo 200 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f04.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f04.boot")' | ${DEPSYS}
@
@@ -1286,7 +1288,7 @@ nag-f04.clisp: nag-f04.boot
<<nag-f07.clisp>>=
nag-f07.clisp: nag-f07.boot
@ echo 204 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-f07.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-f07.boot")' | ${DEPSYS}
@
@@ -1295,7 +1297,7 @@ nag-f07.clisp: nag-f07.boot
<<nag-s.clisp>>=
nag-s.clisp: nag-s.boot
@ echo 208 making $@ from $<
- @ echo '(progn (boot::reroot "${AXIOM}") (old-boot::boot "nag-s.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nag-s.boot")' | ${DEPSYS}
@
@@ -1304,7 +1306,7 @@ nag-s.clisp: nag-s.boot
<<category.clisp>>=
category.clisp: category.boot
@ echo 212 making $@ from $<
- @ echo '(progn (old-boot::boot "category.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "category.boot")' | ${DEPSYS}
@
\subsection{cattable.boot \cite{59}}
@@ -1312,7 +1314,7 @@ category.clisp: category.boot
<<cattable.clisp>>=
cattable.clisp: cattable.boot
@ echo 215 making $@ from $<
- @ echo '(progn (old-boot::boot "cattable.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "cattable.boot")' | ${DEPSYS}
@
\subsection{c-doc.boot \cite{60}}
@@ -1320,7 +1322,7 @@ cattable.clisp: cattable.boot
<<c-doc.clisp>>=
c-doc.clisp: c-doc.boot
@ echo 219 making $@ from $<
- @ echo '(progn (old-boot::boot "c-doc.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "c-doc.boot")' | ${DEPSYS}
@
@@ -1329,7 +1331,7 @@ c-doc.clisp: c-doc.boot
<<clammed.clisp>>=
clammed.clisp: clammed.boot
@ echo 226 making $@ from $<
- @ echo '(progn (old-boot::boot "clammed.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "clammed.boot")' | ${DEPSYS}
@
\subsection{compat.boot \cite{63}}
@@ -1337,7 +1339,7 @@ clammed.clisp: clammed.boot
<<compat.clisp>>=
compat.clisp: compat.boot
@ echo 229 making $@ from $<
- @ echo '(progn (old-boot::boot "compat.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "compat.boot")' | ${DEPSYS}
@
\subsection{compiler.boot \cite{64}}
@@ -1345,7 +1347,7 @@ compat.clisp: compat.boot
<<compiler.clisp>>=
compiler.clisp: compiler.boot
@ echo 233 making $@ from $<
- @ echo '(progn (old-boot::boot "compiler.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS}
@
\subsection{profile.boot \cite{65}}
@@ -1353,7 +1355,7 @@ compiler.clisp: compiler.boot
<<profile.clisp>>=
profile.clisp: profile.boot
@ echo 237 making $@ from $<
- @ echo '(progn (old-boot::boot "profile.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "profile.boot")' | ${DEPSYS}
@
\subsection{database.boot \cite{67}}
@@ -1361,7 +1363,7 @@ profile.clisp: profile.boot
<<database.clisp>>=
database.clisp: database.boot
@ echo 243 making $@ from $<
- @ echo '(progn (old-boot::boot "database.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "database.boot")' | ${DEPSYS}
@
\subsection{define.boot}
@@ -1369,7 +1371,7 @@ database.clisp: database.boot
<<define.clisp>>=
define.clisp: define.boot
@ echo 247 making $@ from $<
- @ echo '(progn (old-boot::boot "define.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "define.boot")' | ${DEPSYS}
@
\subsection{format.boot}
@@ -1377,7 +1379,7 @@ define.clisp: define.boot
<<format.clisp>>=
format.clisp: format.boot
@ echo 250 making $@ from $<
- @ echo '(progn (old-boot::boot "format.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "format.boot")' | ${DEPSYS}
@
\subsection{functor.boot}
@@ -1385,7 +1387,7 @@ format.clisp: format.boot
<<functor.clisp>>=
functor.clisp: functor.boot
@ echo 254 making $@ from $<
- @ echo '(progn (old-boot::boot "functor.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "functor.boot")' | ${DEPSYS}
@
\subsection{g-cndata.boot}
@@ -1393,7 +1395,7 @@ functor.clisp: functor.boot
<<g-cndata.clisp>>=
g-cndata.clisp: g-cndata.boot
@ echo 261 making $@ from $<
- @ echo '(progn (old-boot::boot "g-cndata.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "g-cndata.boot")' | ${DEPSYS}
@
\subsection{g-opt.boot}
@@ -1401,7 +1403,7 @@ g-cndata.clisp: g-cndata.boot
<<g-opt.clisp>>=
g-opt.clisp: g-opt.boot
@ echo 267 making $@ from $<
- @ echo '(progn (old-boot::boot "g-opt.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "g-opt.boot")' | ${DEPSYS}
@
\subsection{g-timer.boot}
@@ -1409,7 +1411,7 @@ g-opt.clisp: g-opt.boot
<<g-timer.clisp>>=
g-timer.clisp: g-timer.boot
@ echo 270 making $@ from $<
- @ echo '(progn (old-boot::boot "g-timer.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "g-timer.boot")' | ${DEPSYS}
@
@@ -1418,7 +1420,7 @@ g-timer.clisp: g-timer.boot
<<hypertex.clisp>>=
hypertex.clisp: hypertex.boot
@ echo 277 making $@ from $<
- @ echo '(progn (old-boot::boot "hypertex.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "hypertex.boot")' | ${DEPSYS}
@
\subsection{i-analy.boot}
@@ -1426,7 +1428,7 @@ hypertex.clisp: hypertex.boot
<<i-analy.clisp>>=
i-analy.clisp: i-analy.boot
@ echo 280 making $@ from $<
- @ echo '(progn (old-boot::boot "i-analy.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-analy.boot")' | ${DEPSYS}
@
\subsection{i-code.boot}
@@ -1434,7 +1436,7 @@ i-analy.clisp: i-analy.boot
<<i-code.clisp>>=
i-code.clisp: i-code.boot
@ echo 283 making $@ from $<
- @ echo '(progn (old-boot::boot "i-code.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-code.boot")' | ${DEPSYS}
@
\subsection{i-coerce.boot}
@@ -1442,7 +1444,7 @@ i-code.clisp: i-code.boot
<<i-coerce.clisp>>=
i-coerce.clisp: i-coerce.boot
@ echo 286 making $@ from $<
- @ echo '(progn (old-boot::boot "i-coerce.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-coerce.boot")' | ${DEPSYS}
@
\subsection{i-coerfn.boot}
@@ -1450,7 +1452,7 @@ i-coerce.clisp: i-coerce.boot
<<i-coerfn.clisp>>=
i-coerfn.clisp: i-coerfn.boot
@ echo 289 making $@ from $<
- @ echo '(progn (old-boot::boot "i-coerfn.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-coerfn.boot")' | ${DEPSYS}
@
\subsection{i-eval.boot}
@@ -1458,7 +1460,7 @@ i-coerfn.clisp: i-coerfn.boot
<<i-eval.clisp>>=
i-eval.clisp: i-eval.boot
@ echo 292 making $@ from $<
- @ echo '(progn (old-boot::boot "i-eval.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-eval.boot")' | ${DEPSYS}
@
\subsection{i-funsel.boot}
@@ -1466,7 +1468,7 @@ i-eval.clisp: i-eval.boot
<<i-funsel.clisp>>=
i-funsel.clisp: i-funsel.boot
@ echo 295 making $@ from $<
- @ echo '(progn (old-boot::boot "i-funsel.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-funsel.boot")' | ${DEPSYS}
@
\subsection{bookvol5.lsp}
@@ -1483,7 +1485,7 @@ bookvol5.lisp: $(srcdir)/bookvol5.pamphlet
<<i-intern.clisp>>=
i-intern.clisp: i-intern.boot
@ echo 301 making $@ from $<
- @ echo '(progn (old-boot::boot "i-intern.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-intern.boot")' | ${DEPSYS}
@
\subsection{i-map.boot}
@@ -1491,7 +1493,7 @@ i-intern.clisp: i-intern.boot
<<i-map.clisp>>=
i-map.clisp: i-map.boot
@ echo 304 making $@ from $<
- @ echo '(progn (old-boot::boot "i-map.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-map.boot")' | ${DEPSYS}
@
\subsection{i-resolv.boot}
@@ -1499,7 +1501,7 @@ i-map.clisp: i-map.boot
<<i-resolv.clisp>>=
i-resolv.clisp: i-resolv.boot
@ echo 310 making $@ from $<
- @ echo '(progn (old-boot::boot "i-resolv.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-resolv.boot")' | ${DEPSYS}
@
\subsection{i-spec1.boot}
@@ -1507,7 +1509,7 @@ i-resolv.clisp: i-resolv.boot
<<i-spec1.clisp>>=
i-spec1.clisp: i-spec1.boot
@ echo 313 making $@ from $<
- @ echo '(progn (old-boot::boot "i-spec1.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-spec1.boot")' | ${DEPSYS}
@
\subsection{i-spec2.boot}
@@ -1515,7 +1517,7 @@ i-spec1.clisp: i-spec1.boot
<<i-spec2.clisp>>=
i-spec2.clisp: i-spec2.boot
@ echo 316 making $@ from i-spec2.boot
- @ echo '(progn (old-boot::boot "i-spec2.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-spec2.boot")' | ${DEPSYS}
@
\subsection{i-syscmd.boot}
@@ -1523,7 +1525,7 @@ i-spec2.clisp: i-spec2.boot
<<i-syscmd.clisp>>=
i-syscmd.clisp: i-syscmd.boot
@ echo 319 making $@ from $<
- @ echo '(progn (old-boot::boot "i-syscmd.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-syscmd.boot")' | ${DEPSYS}
@
\subsection{i-toplev.boot}
@@ -1531,7 +1533,7 @@ i-syscmd.clisp: i-syscmd.boot
<<i-toplev.clisp>>=
i-toplev.clisp: i-toplev.boot
@ echo 322 making $@ from $<
- @ echo '(progn (old-boot::boot "i-toplev.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-toplev.boot")' | ${DEPSYS}
@
\subsection{i-util.boot}
@@ -1539,7 +1541,7 @@ i-toplev.clisp: i-toplev.boot
<<i-util.clisp>>=
i-util.clisp: i-util.boot
@ echo 325 making $@ from $<
- @ echo '(progn (old-boot::boot "i-util.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "i-util.boot")' | ${DEPSYS}
@
\subsection{info.boot}
@@ -1547,7 +1549,7 @@ i-util.clisp: i-util.boot
<<info.clisp>>=
info.clisp: info.boot
@ echo 329 making $@ from $<
- @ echo '(progn (old-boot::boot "info.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "info.boot")' | ${DEPSYS}
@
\subsection{iterator.boot}
@@ -1555,7 +1557,7 @@ info.clisp: info.boot
<<iterator.clisp>>=
iterator.clisp: iterator.boot
@ echo 333 making $@ from $<
- @ echo '(progn (old-boot::boot "iterator.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "iterator.boot")' | ${DEPSYS}
@
\subsection{lisplib.boot}
@@ -1563,7 +1565,7 @@ iterator.clisp: iterator.boot
<<lisplib.clisp>>=
lisplib.clisp: lisplib.boot
@ echo 336 making $@ from $<
- @ echo '(progn (old-boot::boot "lisplib.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "lisplib.boot")' | ${DEPSYS}
@
\subsection{match.boot}
@@ -1571,7 +1573,7 @@ lisplib.clisp: lisplib.boot
<<match.clisp>>=
match.clisp: match.boot
@ echo 339 making $@ from $<
- @ echo '(progn (old-boot::boot "match.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "match.boot")' | ${DEPSYS}
@
\subsection{modemap.boot}
@@ -1579,7 +1581,7 @@ match.clisp: match.boot
<<modemap.clisp>>=
modemap.clisp: modemap.boot
@ echo 343 making $@ from $<
- @ echo '(progn (old-boot::boot "modemap.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "modemap.boot")' | ${DEPSYS}
@
\subsection{msgdb.boot}
@@ -1587,7 +1589,7 @@ modemap.clisp: modemap.boot
<<msgdb.clisp>>=
msgdb.clisp: msgdb.boot
@ echo 346 making $@ from $<
- @ echo '(progn (old-boot::boot "msgdb.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "msgdb.boot")' | ${DEPSYS}
@
\subsection{newfort.boot}
@@ -1595,7 +1597,7 @@ msgdb.clisp: msgdb.boot
<<newfort.clisp>>=
newfort.clisp: newfort.boot
@ echo 349 making $@ from $<
- @ echo '(progn (old-boot::boot "newfort.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "newfort.boot")' | ${DEPSYS}
@
\subsection{nruncomp.boot}
@@ -1603,7 +1605,7 @@ newfort.clisp: newfort.boot
<<nruncomp.clisp>>=
nruncomp.clisp: nruncomp.boot
@ echo 353 making $@ from $<
- @ echo '(progn (old-boot::boot "nruncomp.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nruncomp.boot")' | ${DEPSYS}
@
\subsection{nrunfast.boot}
@@ -1611,7 +1613,7 @@ nruncomp.clisp: nruncomp.boot
<<nrunfast.clisp>>=
nrunfast.clisp: nrunfast.boot
@ echo 356 making $@ from $<
- @ echo '(progn (old-boot::boot "nrunfast.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nrunfast.boot")' | ${DEPSYS}
@
\subsection{nrungo.boot}
@@ -1619,7 +1621,7 @@ nrunfast.clisp: nrunfast.boot
<<nrungo.clisp>>=
nrungo.clisp: nrungo.boot
@ echo 359 making $@ from $<
- @ echo '(progn (old-boot::boot "nrungo.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nrungo.boot")' | ${DEPSYS}
@
\subsection{nruntime.boot}
@@ -1627,7 +1629,7 @@ nrungo.clisp: nrungo.boot
<<nruntime.clisp>>=
nruntime.clisp: nruntime.boot
@ echo 362 making $@ from $<
- @ echo '(progn (old-boot::boot "nruntime.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nruntime.boot")' | ${DEPSYS}
@
\subsection{nrunopt.boot}
@@ -1635,7 +1637,7 @@ nruntime.clisp: nruntime.boot
<<nrunopt.clisp>>=
nrunopt.clisp: nrunopt.boot
@ echo 365 making $@ from $<
- @ echo '(progn (old-boot::boot "nrunopt.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "nrunopt.boot")' | ${DEPSYS}
@
@@ -1654,7 +1656,7 @@ to a new platform.
<<pathname.clisp>>=
pathname.clisp: pathname.boot
@ echo 380 making $@ from $<
- @ echo '(progn (old-boot::boot "pathname.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "pathname.boot")' | ${DEPSYS}
@
\subsection{postpar.boot}
@@ -1672,7 +1674,7 @@ to a new platform.
<<rulesets.clisp>>=
rulesets.clisp: rulesets.boot
@ echo 388 making $@ from $<
- @ echo '(progn (old-boot::boot "rulesets.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "rulesets.boot")' | ${DEPSYS}
@
\subsection{server.boot}
@@ -1680,7 +1682,7 @@ rulesets.clisp: rulesets.boot
<<server.clisp>>=
server.clisp: server.boot
@ echo 391 making $@ from $<
- @ echo '(progn (old-boot::boot "server.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "server.boot")' | ${DEPSYS}
@
@@ -1689,7 +1691,7 @@ server.clisp: server.boot
<<setvart.clisp>>=
setvart.clisp: setvart.boot
@ echo 398 making $@ from $<
- @ echo '(progn (old-boot::boot "setvart.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "setvart.boot")' | ${DEPSYS}
@
\subsection{as.boot}
@@ -1697,7 +1699,7 @@ setvart.clisp: setvart.boot
<<as.clisp>>=
as.clisp: as.boot
@ echo 417 making $@ from $<
- @ echo '(progn (old-boot::boot "as.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "as.boot")' | ${DEPSYS}
@
\subsection{bc-misc.boot}
@@ -1705,7 +1707,7 @@ as.clisp: as.boot
<<bc-misc.clisp>>=
bc-misc.clisp: bc-misc.boot
@ echo 428 making $@ from $<
- @ echo '(progn (old-boot::boot "bc-misc.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "bc-misc.boot")' | ${DEPSYS}
@
\subsection{bc-solve.boot}
@@ -1713,7 +1715,7 @@ bc-misc.clisp: bc-misc.boot
<<bc-solve.clisp>>=
bc-solve.clisp: bc-solve.boot
@ echo 432 making $@ from $<
- @ echo '(progn (old-boot::boot "bc-solve.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "bc-solve.boot")' | ${DEPSYS}
@
\subsection{ht-util.boot}
@@ -1721,7 +1723,7 @@ bc-solve.clisp: bc-solve.boot
<<ht-util.clisp>>=
ht-util.clisp: ht-util.boot
@ echo 440 making $@ from $<
- @ echo '(progn (old-boot::boot "ht-util.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "ht-util.boot")' | ${DEPSYS}
@
\subsection{htsetvar.boot}
@@ -1729,7 +1731,7 @@ ht-util.clisp: ht-util.boot
<<htsetvar.clisp>>=
htsetvar.clisp: htsetvar.boot
@ echo 444 making $@ from $<
- @ echo '(progn (old-boot::boot "htsetvar.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "htsetvar.boot")' | ${DEPSYS}
@
\subsection{record.boot}
@@ -1737,7 +1739,7 @@ htsetvar.clisp: htsetvar.boot
<<record.clisp>>=
record.clisp: record.boot
@ echo 447 making $@ $<
- @ echo '(progn (old-boot::boot "record.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "record.boot")' | ${DEPSYS}
@
\subsection{ht-root.boot}
@@ -1745,7 +1747,7 @@ record.clisp: record.boot
<<ht-root.clisp>>=
ht-root.clisp: ht-root.boot
@ echo 451 making $@ from $<
- @ echo '(progn (old-boot::boot "ht-root.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "ht-root.boot")' | ${DEPSYS}
@
\subsection{htcheck.boot}
@@ -1753,7 +1755,7 @@ ht-root.clisp: ht-root.boot
<<htcheck.clisp>>=
htcheck.clisp: htcheck.boot
@ echo 455 making $@ from $<
- @ echo '(progn (old-boot::boot "htcheck.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "htcheck.boot")' | ${DEPSYS}
@
\subsection{ax.boot}
@@ -1761,7 +1763,7 @@ htcheck.clisp: htcheck.boot
<<ax.clisp>>=
ax.clisp: ax.boot
@ echo 463 making $@ $<
- @ echo '(progn (old-boot::boot "ax.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "ax.boot")' | ${DEPSYS}
@
\subsection{br-con.boot}
@@ -1769,7 +1771,7 @@ ax.clisp: ax.boot
<<br-con.clisp>>=
br-con.clisp: br-con.boot
@ echo 467 making $@ from $<
- @ echo '(progn (old-boot::boot "br-con.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-con.boot")' | ${DEPSYS}
@
\subsection{br-search.boot}
@@ -1777,7 +1779,7 @@ br-con.clisp: br-con.boot
<<br-search.clisp>>=
br-search.clisp: br-search.boot
@ echo 471 making $@ from $<
- @ echo '(progn (old-boot::boot "br-search.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-search.boot")' | ${DEPSYS}
@
\subsection{br-op1.boot}
@@ -1785,7 +1787,7 @@ br-search.clisp: br-search.boot
<<br-op1.clisp>>=
br-op1.clisp: br-op1.boot
@ echo 475 making $@ from $<
- @ echo '(progn (old-boot::boot "br-op1.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-op1.boot")' | ${DEPSYS}
@
\subsection{br-op2.boot}
@@ -1793,7 +1795,7 @@ br-op1.clisp: br-op1.boot
<<br-op2.clisp>>=
br-op2.clisp: br-op2.boot
@ echo 479 making $@ from $<
- @ echo '(progn (old-boot::boot "br-op2.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-op2.boot")' | ${DEPSYS}
@
\subsection{br-data.boot}
@@ -1801,7 +1803,7 @@ br-op2.clisp: br-op2.boot
<<br-data.clisp>>=
br-data.clisp: br-data.boot
@ echo 483 making $@ from $<
- @ echo '(progn (old-boot::boot "br-data.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-data.boot")' | ${DEPSYS}
@
\subsection{br-util.boot}
@@ -1809,7 +1811,7 @@ br-data.clisp: br-data.boot
<<br-util.clisp>>=
br-util.clisp: br-util.boot
@ echo 487 making $@ from $<
- @ echo '(progn (old-boot::boot "br-util.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-util.boot")' | ${DEPSYS}
@
\subsection{br-saturn.boot}
@@ -1817,7 +1819,7 @@ br-util.clisp: br-util.boot
<<br-saturn.clisp>>=
br-saturn.clisp: br-saturn.boot
@ echo 491 making $@ from $<
- @ echo '(progn (old-boot::boot "br-saturn.boot"))' | ${DEPSYS}
+ @ echo '(old-boot::boot "br-saturn.boot")' | ${DEPSYS}
@
\section{The databases}
diff --git a/src/interp/bookvol5.pamphlet b/src/interp/bookvol5.pamphlet
index 411fa27f..65bc8671 100644
--- a/src/interp/bookvol5.pamphlet
+++ b/src/interp/bookvol5.pamphlet
@@ -245,9 +245,6 @@ curoutstream & ncIntLoop & \\
\$reportUndo & initvars & diffAlist \\
\$shoeReadLineFunction & SpadInterpretStream & \\
\$spad & ncTopLevel & \\
-\$spadroot & reroot & initroot \\
- & & make-absolute-filename \\
- & & reroot \\
\$SpadServer & restart & \\
\$SpadServerName & initvars & restart \\
\$systemCommandFunction & SpadInterpretStream & \\
@@ -556,18 +553,6 @@ The [[$shoeReadLineFunction]] is set in [[SpadInterpretStream]]
to point to the
[[serverReadLine]]
-\subsection{\$spadroot}
-The [[$spadroot]] variable is the internal name for the [[AXIOM]]
-shell variable.
-
-The [[$spadroot]] variable is set in [[reroot]] to the value of the
-argument. The argument is expected to be a directory name.
-
-The [[$spadroot]] variable is tested in [[initroot]].
-
-The [[$spadroot]] variable is used by the function
-[[make-absolute-filename]]. It concatenates this variable to the
-front of a relative pathname to make it absolute.
\subsection{\$spad}
The [[$spad]] variable is set to [[T]] in [[ncTopLevel]].
@@ -636,8 +621,7 @@ function which is the entry to the Axiom interpreter.
The restart function is the real root of the world. It sets up memory
if we are working in a GCL/akcl version of the system. It sets the
current package to be the ``BOOT'' package which is the standard
-package in which the interpreter runs. It calls initroot \cite{1}
-to set the \$spadroot variable (usually the \$AXIOM variable).
+package in which the interpreter runs.
The [[compiler::*compile-verbose*]] flag has been set to nil globally.
We do not want to know about the microsteps of GCL's compile facility.
@@ -660,7 +644,7 @@ We do not care that tail recursion occurs.
;; Do any command-line processing that may be needed
(|AxiomCore|::|topLevel|)
- (initroot)
+ (reroot)
#+:akcl (system:gbc-time 0)
(when (and $openServerIfTrue (fboundp '|openServer|))
@@ -758,15 +742,7 @@ This function performs those setup commands.
nil)
@
-\subsection{defun initroot}
-Sets up the system to use the {\bf AXIOM} shell variable if we can
-and default to the {\bf \$spadroot} variable (which was the value
-of the {\bf AXIOM} shell variable at build time) if we can't.
-<<defun initroot>>=
-(defun initroot (&optional (newroot (|systemRootDirectory|)))
- (reroot (or newroot $spadroot (error "setenv AXIOM or (setq $spadroot)"))))
-@
\subsection{defun loadExposureGroupData}
<<defun loadExposureGroupData>>=
#+:AKCL
@@ -792,29 +768,19 @@ of the {\bf AXIOM} shell variable at build time) if we can't.
Prefix a filename with the {\bf AXIOM} shell variable.
<<defun make-absolute-filename>>=
(defun make-absolute-filename (name)
- (concatenate 'string $spadroot name))
+ (concatenate 'string (|systemRootDirectory|) name))
@
\subsection{defun reroot}
The reroot function is used to reset the important variables used by
-the system. In particular, these variables are sensitive to the
-{\bf AXIOM} shell variable. That variable is renamed internally to
-be {\bf \$spadroot}. The {\bf reroot} function will change the
-system to use a new root directory and will have the same effect
-as changing the {\bf AXIOM} shell variable and rerunning the system
-from scratch. Note that we have changed from the
+the system. The {\bf reroot} function will change the
+system to use a new root directory. Note that we have changed from the
NAG distribution back to the original form. If you need the NAG
version you can push {\bf :tpd} on the {\bf *features*} variable
-before compiling this file. A correct call looks like:
-\begin{verbatim}
-(in-package "BOOT")
-(reroot "/spad/mnt/${SYS}")
-\end{verbatim}
-where the [[${SYS}]] variable is the same one set at build time.
+before compiling this file.
<<defun reroot>>=
-(defun reroot (dir)
- (setq $spadroot dir)
+(defun reroot ()
(setq $directory-list
(mapcar #'make-absolute-filename $relative-directory-list))
(setq $library-directory-list
@@ -1555,7 +1521,6 @@ DEBUGSYS=${OBJ}/${SYS}/bin/debugsys
<<initvars>>
<<defun init-memory-config>>
-<<defun initroot>>
<<defun loadExposureGroupData>>
diff --git a/src/interp/br-search.boot.pamphlet b/src/interp/br-search.boot.pamphlet
index e232b231..d8e2cbea 100644
--- a/src/interp/br-search.boot.pamphlet
+++ b/src/interp/br-search.boot.pamphlet
@@ -975,19 +975,20 @@ dbGetCommentOrigin line ==
line
grepSource key ==
- key = 'libdb => STRCONC($SPADROOT,'"/algebra/libdb.text")
- key = 'gloss => STRCONC($SPADROOT,'"/algebra/glosskey.text")
+ key = 'libdb => STRCONC(systemRootDirectory(),'"/algebra/libdb.text")
+ key = 'gloss => STRCONC(systemRootDirectory(),'"/algebra/glosskey.text")
key = $localLibdb => $localLibdb
mkGrepTextfile
MEMQ(key, '(_. a c d k o p x)) => 'libdb
'comdb
-mkGrepTextfile s == STRCONC($SPADROOT,"/algebra/", STRINGIMAGE s, '".text")
+mkGrepTextfile s ==
+ STRCONC(systemRootDirectory(),"/algebra/", STRINGIMAGE s, '".text")
mkGrepFile s == --called to generate a path name for a temporary grep file
prefix :=
$standard or $aixTestSaturn => '"/tmp/"
- STRCONC($SPADROOT,'"/algebra/")
+ STRCONC(systemRootDirectory(),'"/algebra/")
suffix := getEnv '"SPADNUM"
STRCONC(prefix, PNAME s,'".txt.", suffix)
diff --git a/src/interp/construc.lisp.pamphlet b/src/interp/construc.lisp.pamphlet
index 947429e7..e97d2501 100644
--- a/src/interp/construc.lisp.pamphlet
+++ b/src/interp/construc.lisp.pamphlet
@@ -142,9 +142,9 @@
(lspname (name) (concatenate 'string (string name) ".NRLIB/code.lsp"))
(fullname (name)
(concatenate 'string
- $spadroot "/../../int/algebra/" (string name) ".NRLIB/index.KAF"))
+ (|systemRootDirectory|) "/../../int/algebra/" (string name) ".NRLIB/index.KAF"))
(fullcode (name)
- (concatenate 'string $spadroot "/../../int/algebra/" (string name) ".NRLIB/code.lsp")))
+ (concatenate 'string (|systemRootDirectory|) "/../../int/algebra/" (string name) ".NRLIB/code.lsp")))
(let (masterindex blanks index newindex (space (* 22 (length innames))))
(setq newindex space)
(system::system (concatenate 'string "rm -r " (libname outname)))
@@ -759,13 +759,12 @@
; it sets up 2 hash tables, opens the database and hashes the index values
(defun constructOpen ()
- (declare (special $spadroot))
"open the constructor database and hash the keys"
(let (constructors pos)
(setq *opalist-hash* (make-hash-table))
(setq *modemap-hash* (make-hash-table))
(setq *construct-stream*
- (open (concatenate 'string $spadroot "/algebra/construct.daase")))
+ (open (concatenate 'string (|systemRootDirectory|) "/algebra/construct.daase")))
(setq pos (read *construct-stream*))
(file-position *construct-stream* pos)
(setq constructors (read *construct-stream*))
@@ -809,11 +808,10 @@
; the list (it should be a list of *SYMBOLS*, not strings, like
; '(pi nni ....) and constructs the contstruct.daase database
(defun constructdb (libs)
- (declare (special $spadroot))
(let (alist opalist modemap opalistpos modemappos index master masterpos pos)
(labels (
(name (x)
- (concatenate 'string $spadroot "/algebra/" (string x) ".NRLIB/index.KAF")))
+ (concatenate 'string (|systemRootDirectory|) "/algebra/" (string x) ".NRLIB/index.KAF")))
(with-open-file (out "construct.daase" :direction :output)
(print " " out)
(finish-output out)
diff --git a/src/interp/daase.lisp.pamphlet b/src/interp/daase.lisp.pamphlet
index 8b40ffed..670197e8 100644
--- a/src/interp/daase.lisp.pamphlet
+++ b/src/interp/daase.lisp.pamphlet
@@ -452,7 +452,6 @@ database.
; )
(defun interpOpen ()
"open the interpreter database and hash the keys"
- (declare (special $spadroot))
(let (constructors pos stamp dbstruct)
(setq *interp-stream* (open (DaaseName "interp.daase" nil)))
(setq stamp (read *interp-stream*))
@@ -508,7 +507,6 @@ database.
(defun browseOpen ()
"open the constructor database and hash the keys"
- (declare (special $spadroot))
(let (constructors pos stamp dbstruct)
(setq *browse-stream* (open (DaaseName "browse.daase" nil)))
(setq stamp (read *browse-stream*))
@@ -538,7 +536,6 @@ database.
(defun categoryOpen ()
"open category.daase and hash the keys"
- (declare (special $spadroot))
(let (pos keys stamp)
(setq *category-stream* (open (DaaseName "category.daase" nil)))
(setq stamp (read *category-stream*))
@@ -556,7 +553,6 @@ database.
(defun operationOpen ()
"read operation database and hash the keys"
- (declare (special $spadroot))
(let (operations pos stamp)
(setq *operation-stream* (open (DaaseName "operation.daase" nil)))
(setq stamp (read *operation-stream*))
@@ -653,7 +649,7 @@ database.
(setf (get constructor 'abbreviationfor) nil)))))
(defun getdatabase (constructor key)
- (declare (special $spadroot) (special *miss*))
+ (declare (special *miss*))
(when (eq *miss* t) (format t "getdatabase call: ~20a ~a~%" constructor key))
(let (data table stream ignore struct)
(declare (ignore ignore))
@@ -794,7 +790,7 @@ database.
(when (and data (string= (directory-namestring data) "")
(string= (pathname-type data) "spad"))
(setq data
- (concatenate 'string $spadroot "/../../src/algebra/" data))))
+ (concatenate 'string (|systemRootDirectory|) "/../../src/algebra/" data))))
(asharp? ; is this asharp code?
(if (consp data)
(setq data (cdr data))
@@ -803,10 +799,10 @@ database.
(if (consp data)
(setq data
(if (string= (directory-namestring (car data)) "")
- (concatenate 'string $spadroot "/algebra/" (car data) ".o")
+ (concatenate 'string (|systemRootDirectory|) "/algebra/" (car data) ".o")
(car data)))
(when (and data (string= (directory-namestring data) ""))
- (setq data (concatenate 'string $spadroot "/algebra/" data ".o")))))))
+ (setq data (concatenate 'string (|systemRootDirectory|) "/algebra/" data ".o")))))))
data))
; )library top level command -- soon to be obsolete
@@ -1283,7 +1279,6 @@ short negative numbers.
(defun compressOpen ()
(let (lst stamp pos)
- (declare (special $spadroot))
(setq *compress-stream*
(open (DaaseName "compress.daase" nil) :direction :input))
(setq stamp (read *compress-stream*))
@@ -1369,7 +1364,7 @@ Here I'll try to outline the interp database write procedure
\begin{verbatim}
(defun write-interpdb ()
"build interp.daase from hash tables"
- (declare (special $spadroot) (special *ancestors-hash*))
+ (declare (special *ancestors-hash*))
(let (opalistpos modemapspos cmodemappos master masterpos obj *print-pretty*
concategory categorypos kind niladic cosig abbrev defaultdomain
ancestors ancestorspos out)
@@ -1554,7 +1549,7 @@ Here I'll try to outline the interp database write procedure
<<*>>=
(defun write-interpdb ()
"build interp.daase from hash tables"
- (declare (special $spadroot) (special *ancestors-hash*))
+ (declare (special *ancestors-hash*))
(let (opalistpos modemapspos cmodemappos master masterpos obj *print-pretty*
concategory categorypos kind niladic cosig abbrev defaultdomain
ancestors ancestorspos out)
@@ -1638,7 +1633,6 @@ time stamp at the top of the file and close the file.
<<*>>=
(defun write-browsedb ()
"make browse.daase from hash tables"
- (declare (special $spadroot))
(let (master masterpos src formpos docpos attpos predpos *print-pretty* out)
(declare (special *print-pretty*))
(print "building browse.daase")
diff --git a/src/interp/i-toplev.boot.pamphlet b/src/interp/i-toplev.boot.pamphlet
index 665c6371..d8021246 100644
--- a/src/interp/i-toplev.boot.pamphlet
+++ b/src/interp/i-toplev.boot.pamphlet
@@ -93,7 +93,7 @@ start(:l) ==
SETQ($IOindex,1)
if $displayStartMsgs then sayKeyedMsg("S2IZ0053",['"history"])
initHist()
- if functionp 'addtopath then addtopath CONCAT($SPADROOT,'"bin")
+ if functionp 'addtopath then addtopath CONCAT(systemRootDirectory(),'"bin")
SETQ($CURRENT_-DIRECTORY,_*DEFAULT_-PATHNAME_-DEFAULTS_*)
if null(l) then
if $displayStartMsgs then
diff --git a/src/interp/patches.lisp.pamphlet b/src/interp/patches.lisp.pamphlet
index a981bff2..25dd354f 100644
--- a/src/interp/patches.lisp.pamphlet
+++ b/src/interp/patches.lisp.pamphlet
@@ -322,8 +322,6 @@ previous definition.
#+:dos
(setq $current-directory (truename "."))
#+:dos
-(setq $spadroot "/spad/mnt/dos")
-#+:dos
(defun user-homedir-pathname ()
(truename "."))
diff --git a/src/interp/pathname.boot.pamphlet b/src/interp/pathname.boot.pamphlet
index 300d2c41..cab703d1 100644
--- a/src/interp/pathname.boot.pamphlet
+++ b/src/interp/pathname.boot.pamphlet
@@ -103,7 +103,8 @@ mergePathnames(a,b) ==
(fm := pathnameDirectory(a)) = ['"*"] => b
a
-isSystemDirectory dir == EVERY(function CHAR_=,$SPADROOT,dir)
+isSystemDirectory dir ==
+ EVERY(function CHAR_=,systemRootDirectory(),dir)
-- the next function is an improved version of the one in DEBUG LISP
diff --git a/src/interp/util.lisp.pamphlet b/src/interp/util.lisp.pamphlet
index b8a81377..e43af5be 100644
--- a/src/interp/util.lisp.pamphlet
+++ b/src/interp/util.lisp.pamphlet
@@ -47,13 +47,13 @@ the necessary functions and macros to compile any file. The
image but it does not have any autoload triggers or databases
loaded.
<<build-depsys>>=
-(defun build-depsys (load-files spad)
+(defun build-depsys (load-files)
#+:CCL
(setq *package* (find-package "BOOT"))
#+:AKCL
(in-package "BOOT")
(mapcar #'load load-files)
- (initroot spad)
+ (reroot)
#+:AKCL
(init-memory-config :cons 1000 :fixnum 400 :symbol 1000 :package 16
:array 800 :string 1000 :cfun 200 :cpages 2000
@@ -90,20 +90,17 @@ loaded.
The {\bf build-interpsys} function takes a list of files to load
into the image ({\bf load-files}). It also takes several lists of files,
one for each subsystem which will be autoloaded. Autoloading is explained
-below. Next it takes a set of shell variables, the most important of
-which is the {\bf spad} variable. This is normally set to be the same
-as the final build location. This function is called in the
-src/interp/Makefile.
+below. This function is called in the src/interp/Makefile.
-This function calls {\bf initroot} to set up pathnames we need. Next
+This function calls {\bf reroot} to set up pathnames we need. Next
it sets up the lisp system memory (at present only for AKCL/GCL). Next
it loads all of the named files, resets a few global state variables,
loads the databases, sets up autoload triggers and clears out hash tables.
After this function is called the image is clean and can be saved.
<<build-interpsys>>=
(defun build-interpsys (load-files
- translate-files nagbr-files asauto-files spad)
- (initroot spad)
+ translate-files nagbr-files asauto-files)
+ (reroot)
#+:AKCL
(init-memory-config :cons 500 :fixnum 200 :symbol 500 :package 8
:array 400 :string 500 :cfun 100 :cpages 1000
@@ -255,7 +252,9 @@ It is called by {\bf mkBootAutoLoad} above to find the necessary
files.
<<boot-load>>=
(defun boot-load (file)
- (let ((name (concat $SPADROOT "/autoload/" (pathname-name file))))
+ (let ((name (concat (|systemRootDirectory|)
+ "/autoload/"
+ (pathname-name file))))
(if |$printLoadMsgs|
(format t " Loading ~A.~%" name))
(load name)))
@@ -490,7 +489,7 @@ Translate a single boot file to common lisp
#+:AKCL
(in-package "BOOT")
(let (*print-level* *print-length* (fn (pathname-name file))
- (bootfile (merge-pathnames file (concat $spadroot "nboot/.boot"))))
+ (bootfile (merge-pathnames file (concat (|systemRootDirectory|) "nboot/.boot"))))
(declare (special *print-level* *print-length*))
(boot bootfile (make-pathname :type "lisp" :defaults bootfile))))
@@ -648,7 +647,9 @@ src/interp/TAGS file.
(system::run-aix-program "fc"
:arguments (list (string function)
(namestring
- (merge-pathnames file (concat $SPADROOT "nboot/.boot"))))
+ (merge-pathnames file
+ (concat (|systemRootDirectory|)
+ "nboot/.boot"))))
:if-output-exists :supersede :output tbootfile)
(boot tbootfile tlispfile)
(if compflag (progn (compile-file tlispfile)
@@ -673,7 +674,8 @@ The filelist should be a file containing names of files to compile.
<<compspadfiles>>=
(defun compspadfiles (filelist ;; should be a file containing files to compile
&optional (*default-pathname-defaults*
- (pathname (concat $SPADROOT "nalgebra/"))))
+ (pathname (concat (|systemRootDirectory|)
+ "nalgebra/"))))
(with-open-file (stream filelist)
(do ((fname (read-line stream nil nil) (read-line stream nil nil)))
((null fname) 'done)
@@ -730,16 +732,16 @@ This is used by the ")cd" system command.
\subsubsection{make-directory}
-Make a directory relative to the {\bf \$spadroot} variable.
+Make a directory relative to the running system root directory.
<<make-directory>>=
(defun make-directory (direc)
(setq direc (namestring direc))
- (if (string= direc "") $SPADROOT
+ (if (string= direc "") (|systemRootDirectory|)
(if (or (memq :unix *features*)
(memq 'unix *features*))
(progn
(if (char/= (char direc 0) #\/)
- (setq direc (concat $SPADROOT "/" direc)))
+ (setq direc (concat (|systemRootDirectory|) "/" direc)))
(if (char/= (char direc (1- (length direc))) #\/)
(setq direc (concat direc "/")))
direc)
@@ -747,7 +749,7 @@ Make a directory relative to the {\bf \$spadroot} variable.
(if (not (or (char= (char direc 0) #\/)
(char= (char direc 0) #\\)
(find #\: direc)))
- (setq direc (concat $SPADROOT "\\" direc)))
+ (setq direc (concat (|systemRootDirectory|) "\\" direc)))
(if (not (or (char= (char direc (1- (length direc))) #\/)
(char= (char direc (1- (length direc))) #\\ )))
(setq direc (concat direc "\\")))
@@ -1276,7 +1278,7 @@ The {\bf findtag} function is a user-level function to figure out
which file contains a given tag. This is sometimes useful if Emacs
is not around or TAGS are not loaded.
<<findtag>>=
-(defun findtag (tag &optional (tagfile (concat $spadroot "/../../src/interp/TAGS")) )
+(defun findtag (tag &optional (tagfile (concat (|systemRootDirectory|) "/../../src/interp/TAGS")) )
;; tag is an identifier
(with-open-file (tagstream tagfile)
(do ((tagline (read-line tagstream nil nil)
@@ -1429,7 +1431,7 @@ function assumes that \\ can only appear as first character of name.
(import-module "parsing")
(in-package "BOOT")
-(export '($spadroot $directory-list $current-directory reroot
+(export '($directory-list $current-directory reroot
make-absolute-filename |$msgDatabaseName| |$defaultMsgDatabaseName|))
<<our-write-date>>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 16:05:17 +0000