Commit 57ba7573 authored by Eric Timmons's avatar Eric Timmons
Browse files

Try fixing ABCL one more time

parent 9f7855d4

.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ include: 
test abcl:

  image: clfoundation/abcl

  extends: .test

  allow_failure: true



test ccl:

  image: clfoundation/ccl

src/inferred-component-system.lisp

+9 −2
Original line number Diff line number Diff line
@@ -168,12 +168,19 @@ the explicit children, then find and create the implicit components." 
  (let ((explicit-children (call-next-method))

        (implicit-children nil)

        (component-pathname (asdf:component-pathname parent)))



    ;; ABCL, ECL, and {SBCL, CCL} appear to have all different ways of parsing

    ;; wildcards in DIRECTORY. On SBCL and CCL, *WILD-FILE-FOR-DIRECTORY* gives

    ;; both files and sub directories. On ECL, *WILD-FILE-FOR-DIRECTORY* gives

    ;; only files. On ABCL, *WILD-DIRECTORY* gives files in sub-directories.

    (dolist (item (remove-duplicates

                   (append (uiop:directory* (merge-pathnames uiop:*wild-file-for-directory*

                                                             component-pathname))

                           (unless (uiop:featurep :abcl)

                             (uiop:directory* (merge-pathnames uiop:*wild-directory*

                                                             component-pathname)))

                                                               component-pathname))))

                   :test #'uiop:pathname-equal))



      (if (uiop:file-pathname-p item)

          (let* ((file-name (file-namestring item))

                 (wrapper (pathname-to-wrapper parent file-name))