From 70c30b8ef93d2f5362848cde3ce4fdd3ecb94ea4 Mon Sep 17 00:00:00 2001 From: jjgarcia Date: Fri, 30 May 2008 23:55:54 +0000 Subject: [PATCH] In compile-file, ensure that :output-file is appended the proper file extension --- src/CHANGELOG | 3 +++ src/cmp/cmpmain.lsp | 3 ++- src/lsp/config.lsp.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 1497e39b9..f0bfdcb46 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -234,6 +234,9 @@ ECL 0.9k: - Garbage collection statistics was broken for libraries other than the one shipped with ECL. + - When COMPILE-FILE is provided a value of :OUTPUT-FILE, the file extension + ".fas" was not automatically appended. + * Optimization and performance: - TYPEP now can be optimized if the type argument is a constant. diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp index 1acde5164..62f164450 100644 --- a/src/cmp/cmpmain.lsp +++ b/src/cmp/cmpmain.lsp @@ -500,7 +500,8 @@ static cl_object VV[VM]; (setq *compile-file-truename* (truename *compile-file-pathname*)) (when (eq output-file 'T) - (setf output-file (compile-file-pathname *compile-file-truename* :type (if system-p :object :fasl)))) + (setf output-file *compile-file-truename*)) + (setf output-file (compile-file-pathname output-file :type (if system-p :object :fasl))) #+PDE (setq sys:*source-pathname* *compile-file-truename*) diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in index 808289b7e..57599431c 100644 --- a/src/lsp/config.lsp.in +++ b/src/lsp/config.lsp.in @@ -46,7 +46,7 @@ Returns, as a string, the location of the machine on which ECL runs." (defun lisp-implementation-version () "Args:() Returns the version of your ECL as a string." - "@PACKAGE_VERSION@ (CVS 2008-05-30 23:00)") + "@PACKAGE_VERSION@ (CVS 2008-05-31 01:49)") (defun machine-type () "Args: ()