From 32ba05739caea4c3b926f72b12a2b7a4d5e8f01e Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Mon, 6 Jul 2015 21:32:18 -0400 Subject: [PATCH] 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 --- .gitmodules | 3 +++ ext/cl-launch | 1 + tools/asdf-tools | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 160000 ext/cl-launch diff --git a/.gitmodules b/.gitmodules index dc650844..0fee3d7e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/ext/cl-launch b/ext/cl-launch new file mode 160000 index 00000000..4a4ec3d8 --- /dev/null +++ b/ext/cl-launch @@ -0,0 +1 @@ +Subproject commit 4a4ec3d8643a04dfcdc742284d0c965bc40adb37 diff --git a/tools/asdf-tools b/tools/asdf-tools index 48f6366a..794f01e4 100755 --- a/tools/asdf-tools +++ b/tools/asdf-tools @@ -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 -- GitLab