Commit a381162b authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

ASDF 1.628: another pass at fixing COMPONENT-RELATIVE-PATHNAME.

Try to play well with LOGICAL-PATHNAMEs.
Introduce utility MERGE-PATHNAMES* that tries to do the Right Thing(tm).
parent d2460719
This diff is collapsed.
...@@ -41,8 +41,12 @@ is bound, write a message and exit on an error. If ...@@ -41,8 +41,12 @@ is bound, write a message and exit on an error. If
(handler-bind (handler-bind
((error (lambda (c) ((error (lambda (c)
(format *error-output* "~a" c) (format *error-output* "~a" c)
(if (ignore-errors (funcall (find-symbol "GETENV" :asdf) "DEBUG_ASDF_TEST")) (cond
(break) ((ignore-errors (funcall (find-symbol "GETENV" :asdf) "DEBUG_ASDF_TEST"))
(leave-lisp "~&Script failed~%" 1))))) (break))
(t
#+sbcl (sb-debug:backtrace 69)
#+clozure (ccl:print-call-history :count 69 :start-frame-number 1)
(leave-lisp "~&Script failed~%" 1))))))
(funcall thunk) (funcall thunk)
(leave-lisp "~&Script succeeded~%" 0))) (leave-lisp "~&Script succeeded~%" 0)))
;;; -*- Lisp -*- ;;; -*- Lisp -*-
(asdf:defsystem test1 (asdf:defsystem test1
:components ((:file "file2" :in-order-to ((compile-op (load-op "file1")))) :components ((:file "file2" :in-order-to ((compile-op (load-op "file1"))))
(:file "file1"))) (:file "file1")))
#| #|
1) from clean, check that all fasl files build and that some function 1) from clean, check that all fasl files build and that some function
......
...@@ -4,8 +4,12 @@ ...@@ -4,8 +4,12 @@
(quit-on-error (quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*)) (setf asdf:*central-registry* '(*default-pathname-defaults*))
(format t "blah ~S~%" asdf:*central-registry*)
(describe (asdf:find-system 'test1))
(trace asdf:operate asdf:perform asdf::merge-component-relative-pathname
asdf:component-name asdf:component-pathname)
(asdf:operate 'asdf:load-op 'test1) (asdf:operate 'asdf:load-op 'test1)
(format t "blah~%")
;; test that it compiled ;; test that it compiled
(let* ((file1 (asdf:compile-file-pathname* "file1")) (let* ((file1 (asdf:compile-file-pathname* "file1"))
(file2 (asdf:compile-file-pathname* "file2")) (file2 (asdf:compile-file-pathname* "file2"))
......
...@@ -4,5 +4,3 @@ ...@@ -4,5 +4,3 @@
:components ((:file "file2" :in-order-to ((compile-op (load-op "file1")))) :components ((:file "file2" :in-order-to ((compile-op (load-op "file1"))))
(:file "file1")) (:file "file1"))
:depends-on (version 'test2a "1.1")) :depends-on (version 'test2a "1.1"))
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
(asdf:defsystem :wild-module (asdf:defsystem :wild-module
:version "0.0" :version "0.0"
:components ((:wild-module "systems" :pathname "*.asd"))) :components ((:wild-module "systems" :pathname #p"*.asd")))
...@@ -4,7 +4,5 @@ ...@@ -4,7 +4,5 @@
(quit-on-error (quit-on-error
(load-asdf) (load-asdf)
(load "../wild-modules") (load "../wild-modules")
(setf asdf:*central-registry* '(*default-pathname-defaults*)) (setf asdf:*central-registry* '(*default-pathname-defaults*))
(asdf:operate 'asdf:load-op 'wild-module) (asdf:operate 'asdf:load-op 'wild-module))
)
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment