Changeset 12898

Timestamp:

Sep 29, 2009, 10:28:09 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

Conditionalize SYSTEM-NAMESTRING for Clozure CL. Use SYSTEM-NAMESTRING
instead of NAMESTRING in several pertinent places. (see ticket:452)

Location:

trunk/source/tools/asdf-install

Files:

• installer.lisp (modified) (3 diffs)
• port.lisp (modified) (2 diffs)

trunk/source/tools/asdf-install/installer.lisp

@@ -291 +291 @@
 (defun tar-arguments (source packagename)
   #-(or :win32 :mswindows :scl)
-  (list "-C" (namestring (truename source))
-        "-xzvf" (namestring (truename packagename)))
+  (list "-C" (system-namestring (truename source))
+        "-xzvf" (system-namestring (truename packagename)))
   #+(or :win32 :mswindows)
   (list "-l"
         "-c"
         (format nil "\"tar -C \\\"`cygpath '~A'`\\\" -xzvf \\\"`cygpath '~A'`\\\"\""
-                (namestring (truename source))
-                (namestring (truename packagename))))
+                (system-namestring (truename source))
+                (system-namestring (truename packagename))))
   #+scl
   (list "-C" (ext:unix-namestring (truename source))
@@ -329 +329 @@
            source)))
     ;(princ tar)
+    (break)
     (loop for sysfile in (append
                           (directory
@@ -493 +494 @@
       #-(or :win32 :mswindows)
       (delete-file asd)
-      (let ((dir (#-scl namestring #+scl ext:unix-namestring (truename dir))))
+      (let ((dir (#-scl system-namestring #+scl ext:unix-namestring (truename dir))))
         (when dir
           (asdf:run-shell-command "rm -r '~A'" dir)))))

trunk/source/tools/asdf-install/port.lisp

@@ -34 +34 @@
 #-:digitool
 (defun system-namestring (pathname)
+  #+:openmcl
+  (ccl:native-translated-namestring (truename pathname))
+  #-:openmcl
   (namestring (truename pathname)))
 
@@ -253 +256 @@
 
 (defun symlink-files (old new)
-  (let* ((old (#-scl namestring #+scl ext:unix-namestring old))
-         (new (#-scl namestring #+scl ext:unix-namestring new #+scl nil))
+  (let* ((old (#-scl system-namestring #+scl ext:unix-namestring old))
+         (new (#-scl system-namestring #+scl ext:unix-namestring new #+scl nil))
          ;; 20070811 - thanks to Juan Jose Garcia-Ripoll for pointing
          ;; that ~a would wreck havoc if the working directory had a space