[install] Include ASDF as part of this library if the installed Lisp …

…does not have a high enough version.
j3pic · Jun 5, 2018 · 7afc423 · 7afc423
1 parent 7f96089
commit 7afc423
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/test/asdf.lisp → asdf.lisp b/test/asdf.lisp → asdf.lisp
diff --git a/lisp-binary.asd b/lisp-binary.asd
@@ -10,7 +10,7 @@
                                     (when m (princ "." s)))))
                           (null "1.0"))))))
   (unless (string>= asdf-version "3.1.5")
-    (error "LISP-BINARY requires ASDF 3.1.5 or better. You have ~a" asdf-version)))
+    (pushnew :lisp-binary-upgrade-asdf *features*)))
 
 (asdf:defsystem :lisp-binary
   :author ("Jeremy Phelps")
@@ -21,6 +21,7 @@
 			   :cffi)
   :components
   ((:file "binary" :depends-on ("utils" "float" "integer" "simple-bit-stream" "reverse-stream"))
+   #+lisp-binary-upgrade-asdf (:file "asdf")
    (:file "simple-bit-stream" :depends-on ("integer"))
    (:file "reverse-stream" :depends-on ("integer"))
    (:file "integer" :depends-on ("utils"))

diff --git a/test/run-tests.lisp b/test/run-tests.lisp
@@ -1,8 +1,6 @@
 (format t "~%>>>>>>>>>>> Test program loading~%")
 (load "init.lisp")
 (format t "~%>>>>>>>>>>>>> Loaded init file~%")
-(load "asdf.lisp")
-(format t "~%>>>>>>>>>>>>> Loaded ASDF~%")
 (ql:quickload :lisp-binary)
 (format t "~%>>>>>>>> LISP-BINARY library successfully loaded~%")
 (load "basic-test.lisp")