diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interp/ChangeLog | 14 | ||||
| -rw-r--r-- | src/interp/Makefile.in | 108 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 37 | ||||
| -rw-r--r-- | src/interp/apply.boot | 1 | ||||
| -rw-r--r-- | src/interp/axext_l.lisp | 1 | ||||
| -rw-r--r-- | src/interp/foam_l.lisp | 4 | ||||
| -rw-r--r-- | src/interp/lisplib.boot | 2 |
7 files changed, 70 insertions, 97 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 872ee67c..09c52220 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,17 @@ +2007-11-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (util.$(FASLEXT)): Move down. + (bookvol5.$(FASLEXT)): Likewise. + (<<depsys>>): Don't extract. + (makeint.lisp): Don't depend on $(DEPSYS). + (all-interpsys): Don't dependen on all-depsys. + (all-axiomsys): Likewise. Now depend on all-interpsys. + (apply.$(FASLEXT)): New rule. + (lisplib.$(FASLEXT)): Likewise. + (spad.$(FASLEXT)): Likewise. + (axext_l.$(FASLEXT)): Likewise. + (foam_l.$(FASLEXT)): Likewise. + 2007-11-24 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (patches.$(FASLEXT)): New rule. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 3a2c5e02..0653e16f 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -192,11 +192,11 @@ remove-stamp: .PHONY: build-images build-images: remove-stamp all-interpsys -all-interpsys: all-depsys +all-interpsys: makeint.lisp $(mkinstalldirs) $(AUTO) $(MAKE) $(SAVESYS) -all-axiomsys: all-depsys +all-axiomsys: all-interpsys $(MAKE) $(AXIOMSYS) all-depsys: $(DEPSYS) @@ -227,7 +227,7 @@ clean-local: mostlyclean-local distclean-local: clean-local -makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \ +makeint.lisp: ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \ nocompil.$(FASLEXT) \ sys-driver.$(FASLEXT) \ ${OUTINTERP} obey.$(FASLEXT) \ @@ -269,87 +269,6 @@ ${SAVESYS}: makeint.lisp --load-directory=. makeint.lisp @ echo 6 ${SAVESYS} created $(mkinstalldirs) $(axiom_target_bindir) -${DEPSYS}: vmlisp.$(FASLEXT) \ - hash.$(FASLEXT) \ - bits.$(FASLEXT) \ - ggreater.$(FASLEXT) \ - union.$(FASLEXT) \ - boot-pkg.$(FASLEXT) \ - sys-constants.$(FASLEXT) \ - sys-globals.$(FASLEXT) \ - sys-driver.$(FASLEXT) \ - diagnostics.$(FASLEXT) \ - sys-macros.$(FASLEXT) \ - macros.$(FASLEXT) \ - nlib.$(FASLEXT) \ - comp.$(FASLEXT) \ - ${DEP} \ - nocompil.$(FASLEXT) \ - bookvol5.$(FASLEXT)\ - util.$(FASLEXT) \ - postpar.$(FASLEXT) \ - parse.$(FASLEXT) \ - parsing.$(FASLEXT) \ - metalex.$(FASLEXT) \ - bootlex.$(FASLEXT) \ - newaux.$(FASLEXT) \ - preparse.$(FASLEXT) \ - postprop.$(FASLEXT)\ - def.$(FASLEXT) \ - fnewmeta.$(FASLEXT) \ - g-error.$(FASLEXT) \ - g-boot.$(FASLEXT) \ - c-util.$(FASLEXT) \ - g-util.$(FASLEXT) \ - clam.$(FASLEXT) \ - slam.$(FASLEXT) - @ echo 3 making ${DEPSYS} - @ rm -f makedep.lisp - @ $(mkinstalldirs) $(axiom_build_bindir) - @ echo '(|importModule| "sys-driver")' >> makedep.lisp - @ echo '(|importModule| "vmlisp")' >> makedep.lisp - @ echo '(|importModule| "bits")' >> makedep.lisp - @ echo '(|importModule| "hash")' >> makedep.lisp - @ echo '(|importModule| "ggreater")' >> makedep.lisp - @ echo '(|importModule| "union")' >> makedep.lisp - @ echo '(|importModule| "nocompil")' >> makedep.lisp - @ echo '(|importModule| "macros")' >> makedep.lisp - @ echo '(|importModule| "nlib")' >> makedep.lisp - @ echo '(|importModule| "bookvol5")' >> makedep.lisp - @ echo '(|importModule| "util")' >> makedep.lisp - @ echo '(in-package "BOOT")' >> 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 - @ echo '(|importModule| "metalex")' >> makedep.lisp - @ echo '(|importModule| "parsing")' >> makedep.lisp - @ echo '(|importModule| "fnewmeta")' >> makedep.lisp - @ echo '(|importModule| "preparse")' >> makedep.lisp - @ echo '(|importModule| "comp")' >> makedep.lisp - @ echo '(|importModule| "def")' >> makedep.lisp - @ echo '(|importModule| "bootlex")' >> makedep.lisp - @ echo '(|importModule| "postprop")' >> makedep.lisp - @ echo '(|importModule| "postpar")' >> makedep.lisp - @ echo '(|importModule| "clam")' >> makedep.lisp - @ echo '(|importModule| "slam")' >> makedep.lisp - @ echo '(|importModule| "g-error")' >> makedep.lisp - @ echo '(|importModule| "g-boot")' >> makedep.lisp - @ echo '(|importModule| "c-util")' >> makedep.lisp - @ echo '(|importModule| "g-util")' >> makedep.lisp - ../lisp/base-lisp$(EXEEXT) -- --make --output=$@ \ - --load-directory=. makedep.lisp - @ echo 4 ${DEPSYS} created - - -util.$(FASLEXT): util.lisp parsing.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - -bookvol5.$(FASLEXT): bookvol5.lisp boot-pkg.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - -nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< .PHONY: all-axiomsys all-axiomsys: ${AXIOMSYS} @@ -582,6 +501,9 @@ wi2.$(FASLEXT): wi2.boot macros.$(FASLEXT) wi1.$(FASLEXT): wi1.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +apply.$(FASLEXT): apply.boot compiler.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + compiler.$(FASLEXT): compiler.boot category.$(FASLEXT) c-util.$(FASLEXT) \ modemap.$(FASLEXT) pathname.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -636,6 +558,9 @@ simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT) newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + xruncomp.$(FASLEXT): xruncomp.boot c-util.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -793,6 +718,9 @@ spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT) debug.$(FASLEXT): debug.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +spad.$(FASLEXT): spad.lisp bootlex.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + monitor.$(FASLEXT): monitor.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -883,6 +811,12 @@ msg.$(FASLEXT): msg.boot sys-macros.$(FASLEXT) astr.$(FASLEXT) nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +util.$(FASLEXT): util.lisp parsing.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +bookvol5.$(FASLEXT): bookvol5.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + fname.$(FASLEXT): fname.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -913,6 +847,12 @@ union.$(FASLEXT): union.lisp vmlisp.$(FASLEXT) ggreater.$(FASLEXT): ggreater.lisp vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +axext_l.$(FASLEXT): axext_l.lisp foam_l.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +foam_l.$(FASLEXT): foam_l.lisp vmlisp.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index 98dac678..3cd53b96 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -725,15 +725,6 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ <<save depsys image>> @ echo 4 ${DEPSYS} created - -util.$(FASLEXT): util.lisp parsing.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - -bookvol5.$(FASLEXT): bookvol5.lisp boot-pkg.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - -nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @ \section{Building SAVESYS and AXIOMSYS} @@ -750,7 +741,7 @@ should not be set here just because we happen to save an GCL-based image. Doing otherwise causes havoc. <<savesys>>= -makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \ +makeint.lisp: ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \ nocompil.$(FASLEXT) \ sys-driver.$(FASLEXT) \ ${OUTINTERP} obey.$(FASLEXT) \ @@ -912,11 +903,11 @@ remove-stamp: .PHONY: build-images build-images: remove-stamp all-interpsys -all-interpsys: all-depsys +all-interpsys: makeint.lisp $(mkinstalldirs) $(AUTO) $(MAKE) $(SAVESYS) -all-axiomsys: all-depsys +all-axiomsys: all-interpsys $(MAKE) $(AXIOMSYS) all-depsys: $(DEPSYS) @@ -932,7 +923,6 @@ clean-local: mostlyclean-local distclean-local: clean-local <<savesys>> -<<depsys>> <<axiomsys>> <<databases>> @@ -1143,6 +1133,9 @@ wi2.$(FASLEXT): wi2.boot macros.$(FASLEXT) wi1.$(FASLEXT): wi1.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +apply.$(FASLEXT): apply.boot compiler.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + compiler.$(FASLEXT): compiler.boot category.$(FASLEXT) c-util.$(FASLEXT) \ modemap.$(FASLEXT) pathname.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1197,6 +1190,9 @@ simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT) newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + xruncomp.$(FASLEXT): xruncomp.boot c-util.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -1354,6 +1350,9 @@ spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT) debug.$(FASLEXT): debug.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +spad.$(FASLEXT): spad.lisp bootlex.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + monitor.$(FASLEXT): monitor.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -1444,6 +1443,12 @@ msg.$(FASLEXT): msg.boot sys-macros.$(FASLEXT) astr.$(FASLEXT) nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +util.$(FASLEXT): util.lisp parsing.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +bookvol5.$(FASLEXT): bookvol5.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + fname.$(FASLEXT): fname.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -1474,6 +1479,12 @@ union.$(FASLEXT): union.lisp vmlisp.$(FASLEXT) ggreater.$(FASLEXT): ggreater.lisp vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +axext_l.$(FASLEXT): axext_l.lisp foam_l.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +foam_l.$(FASLEXT): foam_l.lisp vmlisp.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/apply.boot b/src/interp/apply.boot index c02e4646..3da4dd8e 100644 --- a/src/interp/apply.boot +++ b/src/interp/apply.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"compiler" )package "BOOT" oldCompilerAutoloadOnceTrigger() == nil diff --git a/src/interp/axext_l.lisp b/src/interp/axext_l.lisp index 27bad9cc..a37d2c6e 100644 --- a/src/interp/axext_l.lisp +++ b/src/interp/axext_l.lisp @@ -35,6 +35,7 @@ ;; File containing primitives needed by exextend in order to interop with axiom ;; This file could do with some declares +(import-module "foam_l") (in-package "FOAM-USER") ;; tacky but means we can run programs diff --git a/src/interp/foam_l.lisp b/src/interp/foam_l.lisp index 57e0f5bd..4a61f1e4 100644 --- a/src/interp/foam_l.lisp +++ b/src/interp/foam_l.lisp @@ -72,6 +72,10 @@ #-:common-lisp (:use "LISP") (:use "FOAM")) +#+:gcl (in-package "BOOT") +#+:gcl (in-package "AxiomCore") +(import-module "vmlisp") + (in-package "FOAM") (export '( diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 47e4b666..69caf0d0 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -30,6 +30,8 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"nlib" +import '"c-util" )package "BOOT" --% Standard Library Creation Functions |