diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-09-06 11:03:15 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-09-06 11:03:15 +0000 |
| commit | a5e61a3197d718059d54ff3d77410d97554fb0af (patch) | |
| tree | 9651050106905fcbfe74832c5beb259ff292cc1b /src/lisp | |
| parent | 3836b55f081fe196e8f7beecc674c5c8a1f98b35 (diff) | |
| download | open-axiom-a5e61a3197d718059d54ff3d77410d97554fb0af.tar.gz | |
src/lisp
* core.lisp.pamphlet (|compileLispFile|): Tidy.
src/interp
* Makefile.pamphlet (boot-pkg.lisp): Remove rule.
(diagnostics.boot): Likewise.
(sys-globals.boot): Likewise.
(sys-constants.boot): Likewise.
* Makefile.in: Regenerate.
Diffstat (limited to 'src/lisp')
| -rw-r--r-- | src/lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lisp/core.lisp.pamphlet | 20 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/lisp/ChangeLog b/src/lisp/ChangeLog index a9b92889..9402faaa 100644 --- a/src/lisp/ChangeLog +++ b/src/lisp/ChangeLog @@ -1,5 +1,9 @@ 2007-09-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * core.lisp.pamphlet (|compileLispFile|): Tidy. + +2007-09-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * core.lisp.pamphlet (|compileLispFile|): Don't leave a FASL if source code compilation has FAILURE-P. diff --git a/src/lisp/core.lisp.pamphlet b/src/lisp/core.lisp.pamphlet index c35f28bb..c781417f 100644 --- a/src/lisp/core.lisp.pamphlet +++ b/src/lisp/core.lisp.pamphlet @@ -532,6 +532,13 @@ it would return $0$, meaning that everything is OK. #-:ecl (compile-file-pathname file) #+:ecl (compile-file-pathname file :type :object)) +(defun |currentDirectoryName| nil + (let* ((dir (namestring (truename ""))) + (n (1- (length dir)))) + (if (char= (char dir n) #\/) + (subseq dir 0 n) + dir))) + ;; Compile Lisp source files to target object code. Most of the time ;; this function is called externally to accomplish just that: compile ;; a Lisp file. So, by default, we exit the read-eval-print loop after @@ -549,6 +556,19 @@ it would return $0$, meaning that everything is OK. ;; twice: once as object code, once as FASL. That is surely wrong. There ;; me be ways to build one from the one with less work. (defun |compileLispFile| (file out-file) + ;; When OUT-FILE does not have a specified parent directory, it is + ;; implied that the compiled file is placed in the current directory. + ;; This is a very common convention on traditional systems and + ;; environments. However GCL would insist to pick the parent + ;; directory from FILE, which clearly is bogus. + ;; Consequently, we must convince GCL to do what we expected. + #+gcl (when (and (pathname-directory file) + (not (pathname-directory out-file))) + (setq out-file + (make-pathname :name (pathname-name out-file) + :type (pathname-type out-file) + :directory (list (|currentDirectoryName|))))) + (multiple-value-bind (result warning-p failure-p) #-:ecl (compile-file file :output-file out-file) #+:ecl (multiple-value-prog1 |