[armedbear-cvs] r13035 - in branches/0.23.x/abcl: . contrib/asdf-install

[Mark Evenson]

Author: mevenson
Date: Sat Nov 20 10:30:10 2010
New Revision: 13035

Log:
[ticket #108][svn r13027] Fix download problems with ASDF-INSTALL.


Modified:
   branches/0.23.x/abcl/CHANGES
   branches/0.23.x/abcl/contrib/asdf-install/installer.lisp
   branches/0.23.x/abcl/contrib/asdf-install/port.lisp
   branches/0.23.x/abcl/contrib/asdf-install/variables.lisp

Modified: branches/0.23.x/abcl/CHANGES
==============================================================================
--- branches/0.23.x/abcl/CHANGES	(original)
+++ branches/0.23.x/abcl/CHANGES	Sat Nov 20 10:30:10 2010
@@ -16,6 +16,8 @@
 Fixes
 -----
 
+* [ticket #108][svn r13027] Fix download problems with ASDF-INSTALL
+
 * [ticket #110][svn r13024,r13026] Fix #\+ in JAR pathnames does not work
 
 * [svn r12995-12997] Changes to generated byte code to prevent JRockit JVM

Modified: branches/0.23.x/abcl/contrib/asdf-install/installer.lisp
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/installer.lisp	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/installer.lisp	Sat Nov 20 10:30:10 2010
@@ -302,7 +302,7 @@
 
 (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)
   (list "-l"
@@ -311,7 +311,7 @@
 		(namestring (truename source))
 		(namestring (truename packagename))))
   #+scl
-  (list "-C" (ext:unix-namestring (truename source))
+  (list "-C"    (ext:unix-namestring (truename source))
 	"-xzvf" (ext:unix-namestring (truename packagename))))
 
 (defun extract-using-tar (to-dir tarball)
@@ -333,7 +333,7 @@
   (let* ((tar (extract source packagename))
          ;; 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))
 	 (pos-slash (or (position #\/ tar)
@@ -344,7 +344,6 @@
 	   (make-pathname :directory
 			  `(:relative ,(subseq tar pos-begin pos-slash)))
 	   source)))
-    ;(princ tar)
     (loop for sysfile in (append
                           (directory
 		           (make-pathname :defaults *default-pathname-defaults*

Modified: branches/0.23.x/abcl/contrib/asdf-install/port.lisp
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/port.lisp	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/port.lisp	Sat Nov 20 10:30:10 2010
@@ -144,7 +144,7 @@
   #+:abcl
   (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)))
 
 
 #+:sbcl
@@ -322,6 +322,8 @@
    '(:external-format :latin1)
    #+:scl
    '(:external-format :iso-8859-1)
+   #+abcl
+   '(:external-format :iso-8859-1)
    #+(or :clisp :digitool (and :lispworks :win32))
    '(:element-type (unsigned-byte 8))))
 

Modified: branches/0.23.x/abcl/contrib/asdf-install/variables.lisp
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/variables.lisp	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/variables.lisp	Sat Nov 20 10:30:10 2010
@@ -52,8 +52,8 @@
   "A list of places to look for shell commands.")
 
 (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")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)