Loading bundle.lisp +11 −6 Original line number Diff line number Diff line Loading @@ -462,12 +462,17 @@ which is probably not what you want; you probably need to tweak your output tran :if-does-not-exist :create) (format s ";;; Prebuilt~:[~; monolithic~] ASDF definition for system ~A~%" (operation-monolithic-p o) name) (format s ";;; Built for ~A ~A on a ~A/~A ~A~%" ;; this can cause bugs in cases where one of the functions returns a multi-line ;; string (let ((description-string (format nil ";;; Built for ~A ~A on a ~A/~A ~A" (lisp-implementation-type) (lisp-implementation-version) (software-type) (machine-type) (software-version)) (software-version)))) ;; ensure the whole thing is on one line (print (remove-if #'(lambda (x) (member x (list #\newline #\return))) description-string) s) (terpri s)) (let ((*package* (find-package :asdf-user))) (pprint `(defsystem ,name :class prebuilt-system Loading test/deliver-bundle.asd +1 −1 Original line number Diff line number Diff line Loading @@ -6,5 +6,5 @@ (defsystem :deliver-bundle :defsystem-depends-on ("file3-only") :depends-on ("test-asdf/bundle-2") :depends-on ("test1") ; brings in "file1" and "file2" :components ((:file "file4"))) test/test-bundle-asd.script +4 −1 Original line number Diff line number Diff line Loading @@ -6,6 +6,9 @@ ;;; Test for GitLab issue 23 ;;;--------------------------------------------------------------------------- #+(or (and ecl ecl-bytecmp) gcl) (leave-test "bundles not on implemented this implementation" 0) (defparameter *test-system-name* "deliver-bundle") (asdf:initialize-source-registry '(:source-registry Loading Loading @@ -49,7 +52,7 @@ (assert (equalp (getf *defsystem-sexpr* :lib) "deliver-bundle.a")) (assert (not (getf *defsystem-sexpr* :defsystem-depends-on))) (assert (equalp (getf *defsystem-sexpr* :depends-on) (list "test-asdf/bundle-2")) (assert (equalp (getf *defsystem-sexpr* :depends-on) (list "test1")) nil "Dependencies for bundled system are incorrect.") (ignore-errors (delete-file *constructed-asdf-file*)) Loading Loading
bundle.lisp +11 −6 Original line number Diff line number Diff line Loading @@ -462,12 +462,17 @@ which is probably not what you want; you probably need to tweak your output tran :if-does-not-exist :create) (format s ";;; Prebuilt~:[~; monolithic~] ASDF definition for system ~A~%" (operation-monolithic-p o) name) (format s ";;; Built for ~A ~A on a ~A/~A ~A~%" ;; this can cause bugs in cases where one of the functions returns a multi-line ;; string (let ((description-string (format nil ";;; Built for ~A ~A on a ~A/~A ~A" (lisp-implementation-type) (lisp-implementation-version) (software-type) (machine-type) (software-version)) (software-version)))) ;; ensure the whole thing is on one line (print (remove-if #'(lambda (x) (member x (list #\newline #\return))) description-string) s) (terpri s)) (let ((*package* (find-package :asdf-user))) (pprint `(defsystem ,name :class prebuilt-system Loading
test/deliver-bundle.asd +1 −1 Original line number Diff line number Diff line Loading @@ -6,5 +6,5 @@ (defsystem :deliver-bundle :defsystem-depends-on ("file3-only") :depends-on ("test-asdf/bundle-2") :depends-on ("test1") ; brings in "file1" and "file2" :components ((:file "file4")))
test/test-bundle-asd.script +4 −1 Original line number Diff line number Diff line Loading @@ -6,6 +6,9 @@ ;;; Test for GitLab issue 23 ;;;--------------------------------------------------------------------------- #+(or (and ecl ecl-bytecmp) gcl) (leave-test "bundles not on implemented this implementation" 0) (defparameter *test-system-name* "deliver-bundle") (asdf:initialize-source-registry '(:source-registry Loading Loading @@ -49,7 +52,7 @@ (assert (equalp (getf *defsystem-sexpr* :lib) "deliver-bundle.a")) (assert (not (getf *defsystem-sexpr* :defsystem-depends-on))) (assert (equalp (getf *defsystem-sexpr* :depends-on) (list "test-asdf/bundle-2")) (assert (equalp (getf *defsystem-sexpr* :depends-on) (list "test1")) nil "Dependencies for bundled system are incorrect.") (ignore-errors (delete-file *constructed-asdf-file*)) Loading