[armedbear-cvs] r11765 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Apr 19 04:29:57 2009
New Revision: 11765

Log:
Use pathname "calculations" to determine the output file name
for the ZIP archive which is to become the .ABCL file.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Sun Apr 19 04:29:57 2009
@@ -459,8 +459,13 @@
         (rename-file temp-file output-file)
 
         (when *compile-file-zip*
-          (let ((zipfile (concatenate 'string (namestring output-file) ".zip"))
-                (pathnames ()))
+          (let* ((type ;; Don't use ".zip", it'll result in an extension
+                       ;;  with a dot, which is rejected by NAMESTRING
+                  (%format nil "~A~A" (pathname-type output-file) "-zip"))
+                 (zipfile (namestring
+                           (merge-pathnames (make-pathname :type type)
+                                            output-file)))
+                 (pathnames ()))
             (dotimes (i *class-number*)
               (let* ((file-namestring (%format nil "~A-~D.cls"
                                                (substitute #\_ #\. (pathname-name output-file))