Re: ASDF-INSTALL for [ MCL ]

james anderson <[email protected]> Fri, 23 Jan 2004 01:27:12 +0100

Newsgroups	gmane.lisp.cclan.general
Message-ID	<[email protected]>

hello again;

now that the issue with tar is clear, i've taken another pass through 
this.
a diff is enclosed. i hope i've gotten the eol-mode reset right so that 
the files are usable at your end. i've also enclosed a copy of the 
digitool.lisp, as there were a lot of changes.


- augmented the dependency for "installer" to ensure that "digitool" is 
loaded.
- one of the (read-header-line) for (read-line) substitutions had 
gotten lost
- verify-gpg-signature/string has a print statement in it. i've left 
the print statement in install-package.
- a couple of instances where system-namestring has gotten lost
- an example of the tar output looks like

html-template-0.1.2
html-template-0.1.2/doc
html-template-0.1.2/doc/index.html
html-template-0.1.2/CHANGELOG
html-template-0.1.2/INSTALLATION
html-template-0.1.2/api.lisp
html-template-0.1.2/errors.lisp
html-template-0.1.2/html-template.asd
html-template-0.1.2/html-template.system
html-template-0.1.2/load.lisp
html-template-0.1.2/packages.lisp
html-template-0.1.2/specials.lisp
html-template-0.1.2/template.lisp
html-template-0.1.2/test.lisp
html-template-0.1.2/util.lisp

thus (position-if #'(lambda (c) (find c #(#\/ #\Return #\Linefeed))) 
tar) is needed in install-package

...

diff-20040122.txt (text/plain, 6.3 KB)

Only in /Development/Source/Library/LISP/asdf: .DS_Store
diff /Development/Source/Library/LISP/asdf/asdf-install.asd /Development/Source/asdf/asdf-install/asdf-install.asd
37c37
< 	       (:file "installer" :depends-on ("port" #+:digitool "digitool"))))
---
> 	       (:file "installer" :depends-on ("port"))))
Only in /Development/Source/Library/LISP/asdf: defpackage.cfsl
Only in /Development/Source/Library/LISP/asdf: diff-20040122.txt
Only in /Development/Source/Library/LISP/asdf: digitool.0.lisp
Only in /Development/Source/Library/LISP/asdf: digitool.cfsl
diff /Development/Source/Library/LISP/asdf/digitool.lisp /Development/Source/asdf/asdf-install/digitool.lisp
1c1
< ;;; -*- package: asdf-install; -*-
---
> ;;; 2004-01-18 [email protected] additions for MCL
4,8d3
< ;;;
< ;;; 2004-01-18 [email protected] additions for MCL
< ;;; 2008-01-22 added exit-code checks to call-system
< 
< (in-package :asdf-install)
12,13d6
<       (setenv-fn 0)
<       (unsetenv-fn 0)
25,28c18
<         (setf err (ccl::require-trap traps::_FSFindFolder
<                                      (ccl::require-trap-constant traps::$kOnAppropriateDisk)
<                                      (ccl::require-trap-constant traps::$kFrameworksFolderType)
<                                      t folder))
---
>         (setf err (#_FSFindFolder #$kOnAppropriateDisk #$kFrameworksFolderType t folder))
31c21
<           (setf baseURL (ccl::require-trap traps::_CFURLCreateFromFSRef (ccl::%null-ptr) folder)))
---
>           (setf baseURL (#_CFURLCreateFromFSRef (ccl::%null-ptr) folder)))
33c23
<           (setf err (ccl::require-trap-constant traps::$coreFoundationUnknownErr))))
---
>           (setf err #$coreFoundationUnknownErr)))
36c26
<         (setf bundleURL (ccl::require-trap traps::_CFURLCreateCopyAppendingPathComponent (ccl::%null-ptr) baseURL framework nil))
---
>         (setf bundleURL (#_CFURLCreateCopyAppendingPathComponent (ccl::%null-ptr) baseURL framework nil))
38c28
<           (setf err (ccl::require-trap-constant traps::$coreFoundationUnknownErr))))
---
>           (setf err #$coreFoundationUnknownErr)))
41c31
<         (setf bundle (ccl::require-trap traps::_CFBundleCreate (ccl::%null-ptr) bundleURL))
---
>         (setf bundle (#_CFBundleCreate (ccl::%null-ptr) bundleURL))
43c33
<           (setf err (ccl::require-trap-constant traps::$coreFoundationUnknownErr))))
---
>           (setf err #$coreFoundationUnknownErr)))
46,47c36,37
<         (if (not (ccl::require-trap traps::_CFBundleLoadExecutable bundle))
<           (setf err (ccl::require-trap-constant traps::$coreFoundationUnknownErr))))
---
>         (if (not (#_CFBundleLoadExecutable bundle))
>           (setf err #$coreFoundationUnknownErr)))
50c40
<         (ccl::require-trap traps::_CFRelease bundle)
---
>         (#_CFRelease bundle)
54c44
<         (ccl::require-trap traps::_CFRelease bundleURL))
---
>         (#_CFRelease bundleURL))
56c46
<         (ccl::require-trap traps::_CFRelease baseURL))
---
>         (#_CFRelease baseURL))
61c51
<                         (let* ((addr (ccl::require-trap traps::_CFBundleGetFunctionPointerForName bundle c-name)))
---
>                         (let* ((addr (#_CFBundleGetFunctionPointerForName bundle c-name)))
68,69d57
<                (setf setenv-fn (get-addr "setenv"))
<                (setf unsetenv-fn (get-addr "unsetenv"))
74c62
<              (ccl::require-trap traps::_CFRelease bundle)
---
>              (#_CFRelease bundle)
88,102d75
< 
<   (defun ccl::setenv (variable-name variable-value)
<     (ccl::with-cstrs ((c-variable-name variable-name)
<                       (c-variable-value variable-value))
<       (ccl::ppc-ff-call setenv-fn
<                         :address c-variable-name
<                         :address c-variable-value
<                         :signed-fullword 1
<                         :signed-fullword)))
< 
<   (defun ccl::unsetenv (variable-name)
<     (ccl::with-cstrs ((c-variable-name variable-name))
<       (ccl::ppc-ff-call unsetenv-fn
<                         :address c-variable-name
<                         :void)))
153,154c126
<              (fp (popen command))
<              (exit-code 0))
---
>              (fp (popen command)))
166c138
<             (setf exit-code (pclose fp))
---
>             (pclose fp)
168,170c140
<           (if (zerop exit-code)
<             (values result 0)
<             (values nil exit-code result)))))
---
>           result)))
230c200
<         (minusp length)))))
---
>         (minusp length)))))
\ No newline at end of file
Common subdirectories: /Development/Source/Library/LISP/asdf/doc and /Development/Source/asdf/asdf-install/doc
Only in /Development/Source/Library/LISP/asdf: installer.cfsl
diff /Development/Source/Library/LISP/asdf/installer.lisp /Development/Source/asdf/asdf-install/installer.lisp
179c179
<        (loop for line = (read-header-line)
---
>        (loop for line = (read-line stream nil nil)
337,338c337,338
<                                          (list "-C" (system-namestring source)
<                                                "-xzvf" (system-namestring packagename)))
---
>                                          (list "-C" (namestring (truename source))
>                                                "-xzvf" (namestring (truename packagename))))
346c346,348
< 	 (pos-slash (position-if #'(lambda (c) (find c #(#\/ #\Return #\Linefeed))) tar))
---
> 	 (pos-slash (or (position #\/ tar)
>                         (position #\Return tar)
>                         (position #\Linefeed tar)))
353,355c355,357
<     (loop for asd in (print (directory
< 		      (print (make-pathname :defaults (print *default-pathname-defaults*)
<                                      :name :wild :type "asd"))))
---
>     (loop for asd in (directory
> 		      (make-pathname :defaults (print *default-pathname-defaults*)
>                                      :name :wild :type "asd"))
442c444
<       (asdf:run-shell-command "rm -r '~A'" (system-namestring dir)))))
---
>       (asdf:run-shell-command "rm -r '~A'" (namestring (truename dir))))))
Only in /Development/Source/Library/LISP/asdf: port.cfsl
diff /Development/Source/Library/LISP/asdf/port.lisp /Development/Source/asdf/asdf-install/port.lisp
1,3d0
< ;;; -*- package: asdf-install; -*-
< ;;;
< 
317c314
<   (ccl::call-system (format nil "~A~{ '~A'~} 2>&1" program args)))
---
>   (ccl::call-system (format nil "~A~{ '~A'~}" program args)))

digitool.lisp (application/applefile, 526 B) - not displayed

digitool.lisp (application/octet-stream, 10.4 KB) - not displayed