Commit 32ba0573 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

ext: include cl-launch as dependency of cl-scripting

Also ensure cl-launch/dispatch can be loaded without having to
	make -C ext/cl-launch/ reinstall_here
parent 039e7025
......@@ -34,3 +34,6 @@
[submodule "ext/cl-scripting"]
path = ext/cl-scripting
url = https://github.com/fare/cl-scripting.git
[submodule "ext/cl-launch"]
path = ext/cl-launch
url = https://gitlab.common-lisp.net/xcvb/cl-launch.git
Subproject commit 4a4ec3d8643a04dfcdc742284d0c965bc40adb37
......@@ -14,6 +14,16 @@
;;; ASDF3 is loaded, now use it!
(eval-when (:compile-toplevel :load-toplevel :execute)
;; For bootstrap purposes, avoid having to extract cl-launch.asd into ext/cl-launch/
(let ((cl-launch-dir (uiop:subpathname (uiop:current-lisp-file-pathname) "../ext/cl-launch/")))
(when (uiop:probe-file* (uiop:subpathname cl-launch-dir "dispatch.lisp"))
(asdf:register-preloaded-system
:cl-launch/dispatch
:class :package-inferred-system
:source-file nil
:pathname cl-launch-dir
:components '((cl-source-file "lisp" :pathname "dispatch.lisp")))))
;; Load either with or without quicklisp
#-quicklisp
(asdf:load-system :asdf-tools :verbose nil)
#+quicklisp
......
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