Loading asdf.lisp +4 −2 Original line number Original line Diff line number Diff line Loading @@ -187,7 +187,7 @@ ;;;; ;;;; (defparameter *asdf-version* (defparameter *asdf-version* ;; the 1+ hair is to ensure that we don't do an inadvertent find and replace ;; the 1+ hair is to ensure that we don't do an inadvertent find and replace (subseq "VERSION:1.604" (1+ (length "VERSION")))) (subseq "VERSION:1.605" (1+ (length "VERSION")))) (defun asdf-version () (defun asdf-version () *asdf-version*) *asdf-version*) Loading Loading @@ -2259,7 +2259,9 @@ with a different configuration, so the configuration would be re-read then." (defun compile-file-pathname* (input-file &rest keys) (defun compile-file-pathname* (input-file &rest keys) (apply-output-translations (apply-output-translations (apply #'compile-file-pathname input-file keys))) (apply #'compile-file-pathname (truenamize (merge-pathnames (make-pathname :type "lisp") input-file)) keys))) ;;;; ----------------------------------------------------------------- ;;;; ----------------------------------------------------------------- ;;;; Windows shortcut support. Based on: ;;;; Windows shortcut support. Based on: Loading test/compile-asdf.lisp +5 −4 Original line number Original line Diff line number Diff line (in-package #:common-lisp-user) (in-package #:common-lisp-user) (load "test/script-support.lisp") (load (merge-pathnames "script-support" *load-pathname*)) (cond ((probe-file "asdf.lisp") (cond ((probe-file *asdf-lisp*) (ensure-directories-exist *asdf-fasl*) (multiple-value-bind (result warnings-p errors-p) (multiple-value-bind (result warnings-p errors-p) ;; style warnings shouldn't abort the compilation [2010/02/03:rpg] ;; style warnings shouldn't abort the compilation [2010/02/03:rpg] (handler-bind ((style-warning (handler-bind ((style-warning #'(lambda (w) #'(lambda (w) (princ w *error-output*) (princ w *error-output*) (muffle-warning w)))) (muffle-warning w)))) (compile-file "asdf.lisp")) (compile-file *asdf-lisp* :output-file *asdf-fasl*)) (declare (ignore result)) (declare (ignore result)) (cond (warnings-p (cond (warnings-p ;;; ECL gives warnings that it shouldn't! ;;; ECL gives warnings that it shouldn't! Loading @@ -22,4 +24,3 @@ (leave-lisp "ASDF compiled cleanly" 0))))) (leave-lisp "ASDF compiled cleanly" 0))))) (t (t (leave-lisp "Testsuite failed: unable to find ASDF source" 3))) (leave-lisp "Testsuite failed: unable to find ASDF source" 3))) test/script-support.lisp +4 −0 Original line number Original line Diff line number Diff line (in-package #:common-lisp-user) (in-package #:common-lisp-user) (defvar *asdf-lisp* (truename (merge-pathnames "../asdf.lisp" *load-truename*))) (defvar *asdf-fasl* (compile-file-pathname (merge-pathnames "tmp/" *asdf-lisp*))) (defun load-asdf () (load *asdf-fasl*)) #+allegro #+allegro (setf excl:*warn-on-nested-reader-conditionals* nil) (setf excl:*warn-on-nested-reader-conditionals* nil) Loading test/test-force.script +2 −2 Original line number Original line Diff line number Diff line ;;; -*- Lisp -*- ;;; -*- Lisp -*- (load "script-support") (load "script-support") (load (compile-file-pathname "../asdf")) (load-asdf) (quit-on-error (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) (setf asdf:*central-registry* '(*default-pathname-defaults*)) (asdf:operate 'asdf:load-op 'test-force) (asdf:operate 'asdf:load-op 'test-force) (let* ((file1 (asdf:compile-file-pathname* (truename "file1.lisp"))) (let* ((file1 (asdf:compile-file-pathname* "file1")) (file1-date (file-write-date file1))) (file1-date (file-write-date file1))) (assert file1) (assert file1) Loading test/test-module-pathnames.script +1 −1 Original line number Original line Diff line number Diff line ;;; -*- Lisp -*- ;;; -*- Lisp -*- (load "script-support") (load "script-support") (load (compile-file-pathname "../asdf")) (load-asdf) (quit-on-error (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) (setf asdf:*central-registry* '(*default-pathname-defaults*)) Loading Loading
asdf.lisp +4 −2 Original line number Original line Diff line number Diff line Loading @@ -187,7 +187,7 @@ ;;;; ;;;; (defparameter *asdf-version* (defparameter *asdf-version* ;; the 1+ hair is to ensure that we don't do an inadvertent find and replace ;; the 1+ hair is to ensure that we don't do an inadvertent find and replace (subseq "VERSION:1.604" (1+ (length "VERSION")))) (subseq "VERSION:1.605" (1+ (length "VERSION")))) (defun asdf-version () (defun asdf-version () *asdf-version*) *asdf-version*) Loading Loading @@ -2259,7 +2259,9 @@ with a different configuration, so the configuration would be re-read then." (defun compile-file-pathname* (input-file &rest keys) (defun compile-file-pathname* (input-file &rest keys) (apply-output-translations (apply-output-translations (apply #'compile-file-pathname input-file keys))) (apply #'compile-file-pathname (truenamize (merge-pathnames (make-pathname :type "lisp") input-file)) keys))) ;;;; ----------------------------------------------------------------- ;;;; ----------------------------------------------------------------- ;;;; Windows shortcut support. Based on: ;;;; Windows shortcut support. Based on: Loading
test/compile-asdf.lisp +5 −4 Original line number Original line Diff line number Diff line (in-package #:common-lisp-user) (in-package #:common-lisp-user) (load "test/script-support.lisp") (load (merge-pathnames "script-support" *load-pathname*)) (cond ((probe-file "asdf.lisp") (cond ((probe-file *asdf-lisp*) (ensure-directories-exist *asdf-fasl*) (multiple-value-bind (result warnings-p errors-p) (multiple-value-bind (result warnings-p errors-p) ;; style warnings shouldn't abort the compilation [2010/02/03:rpg] ;; style warnings shouldn't abort the compilation [2010/02/03:rpg] (handler-bind ((style-warning (handler-bind ((style-warning #'(lambda (w) #'(lambda (w) (princ w *error-output*) (princ w *error-output*) (muffle-warning w)))) (muffle-warning w)))) (compile-file "asdf.lisp")) (compile-file *asdf-lisp* :output-file *asdf-fasl*)) (declare (ignore result)) (declare (ignore result)) (cond (warnings-p (cond (warnings-p ;;; ECL gives warnings that it shouldn't! ;;; ECL gives warnings that it shouldn't! Loading @@ -22,4 +24,3 @@ (leave-lisp "ASDF compiled cleanly" 0))))) (leave-lisp "ASDF compiled cleanly" 0))))) (t (t (leave-lisp "Testsuite failed: unable to find ASDF source" 3))) (leave-lisp "Testsuite failed: unable to find ASDF source" 3)))
test/script-support.lisp +4 −0 Original line number Original line Diff line number Diff line (in-package #:common-lisp-user) (in-package #:common-lisp-user) (defvar *asdf-lisp* (truename (merge-pathnames "../asdf.lisp" *load-truename*))) (defvar *asdf-fasl* (compile-file-pathname (merge-pathnames "tmp/" *asdf-lisp*))) (defun load-asdf () (load *asdf-fasl*)) #+allegro #+allegro (setf excl:*warn-on-nested-reader-conditionals* nil) (setf excl:*warn-on-nested-reader-conditionals* nil) Loading
test/test-force.script +2 −2 Original line number Original line Diff line number Diff line ;;; -*- Lisp -*- ;;; -*- Lisp -*- (load "script-support") (load "script-support") (load (compile-file-pathname "../asdf")) (load-asdf) (quit-on-error (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) (setf asdf:*central-registry* '(*default-pathname-defaults*)) (asdf:operate 'asdf:load-op 'test-force) (asdf:operate 'asdf:load-op 'test-force) (let* ((file1 (asdf:compile-file-pathname* (truename "file1.lisp"))) (let* ((file1 (asdf:compile-file-pathname* "file1")) (file1-date (file-write-date file1))) (file1-date (file-write-date file1))) (assert file1) (assert file1) Loading
test/test-module-pathnames.script +1 −1 Original line number Original line Diff line number Diff line ;;; -*- Lisp -*- ;;; -*- Lisp -*- (load "script-support") (load "script-support") (load (compile-file-pathname "../asdf")) (load-asdf) (quit-on-error (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) (setf asdf:*central-registry* '(*default-pathname-defaults*)) Loading