Changeset 13027 for trunk/abcl/contrib/asdf-install

Timestamp:

11/19/10 11:24:10 (11 years ago)

Author:

Mark Evenson

Message:

Fix ASDF-INSTALL fails to download (ticket #110).

Use an 8-bit encoding (:iso-8559-1) in the streams for the package
download to prevent attempts to recode if ABCL is running under a
multi-bit encoding locale (i.e. UTF-8).

Ensure that we use 'gtar' under Solaris.

Location:

trunk/abcl/contrib/asdf-install

Files:

• installer.lisp (modified) (4 diffs)
• port.lisp (modified) (2 diffs)
• variables.lisp (modified) (1 diff)

trunk/abcl/contrib/asdf-install/installer.lisp

@@ -303 +303 @@
 (defun tar-arguments (source packagename)
   #-(or :win32 :mswindows :scl)
-  (list "-C" (namestring (truename source))
+  (list "-C"    (namestring (truename source))
   "-xzvf" (namestring (truename packagename)))
   #+(or :win32 :mswindows)
@@ -312 +312 @@
     (namestring (truename packagename))))
   #+scl
-  (list "-C" (ext:unix-namestring (truename source))
+  (list "-C"    (ext:unix-namestring (truename source))
   "-xzvf" (ext:unix-namestring (truename packagename))))
 
@@ -334 +334 @@
          ;; Some tar programs (OSX) list entries with preceeding "x "
          ;; as in "x entry/file.asd"
-         (pos-begin (if (= (search "x " tar) 0)
+         (pos-begin (if (string= (subseq tar 0 2) "x ")
                         2
                         0))
@@ -345 +345 @@
         `(:relative ,(subseq tar pos-begin pos-slash)))
      source)))
-    ;(princ tar)
     (loop for sysfile in (append
                           (directory

trunk/abcl/contrib/asdf-install/port.lisp

@@ -145 +145 @@
   (let ((socket 
          (ext:make-socket (url-host url) (url-port url))))
-    (ext:get-socket-stream socket)))
+    (ext:get-socket-stream socket :external-format :iso-8859-1)))
 
 
@@ -322 +322 @@
    '(:external-format :latin1)
    #+:scl
+   '(:external-format :iso-8859-1)
+   #+abcl
    '(:external-format :iso-8859-1)
    #+(or :clisp :digitool (and :lispworks :win32))

trunk/abcl/contrib/asdf-install/variables.lisp

@@ -53 +53 @@
 
 (defvar *gnu-tar-program*
-  #-(or :netbsd :freebsd :solaris) "tar"
-  #+(or :netbsd :freebsd :solaris) "gtar"
+  #-(or :netbsd :freebsd :solaris :sunos) "tar"
+  #+(or :netbsd :freebsd :solaris :sunos) "gtar"
   "Path to the GNU tar program")