diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/daase.lisp | 2 | ||||
| -rw-r--r-- | src/interp/util.lisp | 22 | ||||
| -rw-r--r-- | src/interp/vmlisp.lisp | 4 |
4 files changed, 16 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 105b6db0..c9fe22ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2008-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/vmlisp.lisp (BPINAME): Define for ECL too. + * interp/util.lisp (*BIN-TYPE*): Remove. Use $faslType throughout. + * interp/daase.lisp (get-current-directory): Tidy conditional + definition. + +2008-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * lisp/core.lisp.in (getOptionValue): Export. * interp/sys-driver.boot (initializeGlobalState): Record value for --system-algebra. diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp index b2b8f8c7..66efc4e4 100644 --- a/src/interp/daase.lisp +++ b/src/interp/daase.lisp @@ -939,7 +939,7 @@ (defun get-current-directory () (namestring (extensions::default-directory))) -#+(or :akcl :gcl :clisp :sbcl) +#-:cmu (defun get-current-directory () (namestring (truename ""))) diff --git a/src/interp/util.lisp b/src/interp/util.lisp index 924198d3..17e6c26c 100644 --- a/src/interp/util.lisp +++ b/src/interp/util.lisp @@ -90,20 +90,10 @@ current-dir (concat (|ensureTrailingSlash| current-dir) direc))))) -;; Various lisps use different ``extensions'' on the filename to indicate -;; that a file has been compiled. We set this variable correctly depending -;; on the system we are using. -(defvar *bin-path* - #+kcl "o" - #+lucid "bbin" - #+symbolics "bin" - #+cmulisp "fasl" - #+:ccl "not done this way at all") - (defun load-directory (dir) (let* ((direc (make-directory dir)) (pattern (make-pathname :directory (pathname-directory direc) - :name :wild :type *bin-path*)) + :name :wild :type |$faslType|)) (files (directory pattern))) (mapcar #'load files))) @@ -140,7 +130,7 @@ ;; the given file and its compiled binary. If the file has changed ;; since it was last compiled this function will recompile it. (defun recompile-file-if-necessary (lfile) - (let* ((bfile (make-pathname :type *bin-path* :defaults lfile)) + (let* ((bfile (make-pathname :type |$faslType| :defaults lfile)) (bdate (our-write-date bfile)) (ldate (our-write-date lfile))) (if (and bdate ldate (> bdate ldate)) nil @@ -204,7 +194,7 @@ (defun retranslate-file-if-necessary (bootfile) (let* ((lfile (make-pathname :type "lisp" :defaults bootfile)) (ldate (our-write-date lfile)) - (binfile (make-pathname :type *bin-path* :defaults bootfile)) + (binfile (make-pathname :type |$faslType| :defaults bootfile)) (bindate (our-write-date binfile)) (bootdate (our-write-date bootfile))) (if (and ldate bootdate (> ldate bootdate)) nil @@ -349,10 +339,10 @@ (defun compile-boot-file (file) "compile and load a boot file" (boot (concat file ".boot") (concat file ".lisp")) -#+:AKCL +#-:ccl (compile-file (concat file ".lisp")) -#+:AKCL - (load (concat file "." *bin-path*)) +#-:ccl + (load (concat file "." |$faslType|)) #+:CCL (load (concat file ".lisp")) ) diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp index 0d3f8522..52c4ed4c 100644 --- a/src/interp/vmlisp.lisp +++ b/src/interp/vmlisp.lisp @@ -1814,7 +1814,7 @@ #+:cmulisp (defun gcmsg (x) (prog1 ext:*gc-verbose* (setq ext:*gc-verbose* x))) -#+ (or :allegro :sbcl :clisp) +#+ (or :allegro :sbcl :clisp :ecl) (defun gcmsg (x)) #+Lucid @@ -1864,7 +1864,7 @@ (intern (symbol-name (symbol-function x)) "BOOT") nil)) -#+(or :SBCL :clisp) +#+(or :SBCL :clisp :ecl) (defun BPINAME (x) (if (symbolp x) x |