diff --git a/lisp/install+msys2.lisp b/lisp/install+msys2.lisp index 9e187cf..d8e9214 100644 --- a/lisp/install+msys2.lisp +++ b/lisp/install+msys2.lisp @@ -1,4 +1,7 @@ -(in-package :ros.install) +(ros:include "util-install-quicklisp") +(defpackage :ros.install.msys2 + (:use :cl :ros.install :ros.util :ros.locations)) +(in-package :ros.install.msys2) #-win32 (progn (warn "msys2 is only required on windows")) diff --git a/lisp/install-abcl-bin.lisp b/lisp/install-abcl-bin.lisp index 1e2fa76..cced92d 100644 --- a/lisp/install-abcl-bin.lisp +++ b/lisp/install-abcl-bin.lisp @@ -1,4 +1,7 @@ -(in-package :ros.install) +(ros:include "util-install-quicklisp") +(defpackage :ros.install.abcl-bin + (:use :cl :ros.install :ros.util :ros.locations)) +(in-package :ros.install.abcl-bin) (defvar *abcl-bin-get-version-cache* nil) diff --git a/lisp/install-allegro.lisp b/lisp/install-allegro.lisp index b0c4c9e..1532467 100644 --- a/lisp/install-allegro.lisp +++ b/lisp/install-allegro.lisp @@ -1,4 +1,7 @@ -(in-package :ros.install) +(ros:include "util-install-quicklisp") +(defpackage :ros.install.allegro + (:use :cl :ros.install :ros.util :ros.locations)) +(in-package :ros.install.allegro) (ros:quicklisp :environment nil) (defun allegro-get-version () diff --git a/lisp/install-clisp.lisp b/lisp/install-clisp.lisp index 577ee17..24117cf 100644 --- a/lisp/install-clisp.lisp +++ b/lisp/install-clisp.lisp @@ -1,4 +1,7 @@ -(in-package :ros.install) +(ros:include "util-install-quicklisp") +(defpackage :ros.install.clisp + (:use :cl :ros.install :ros.util :ros.locations)) +(in-package :ros.install.clisp) (defun clisp-get-version () (let ((file (merge-pathnames "tmp/clisp.html" (homedir)))) diff --git a/lisp/install-cmu-bin.lisp b/lisp/install-cmu-bin.lisp index bc5e4aa..2f17952 100644 --- a/lisp/install-cmu-bin.lisp +++ b/lisp/install-cmu-bin.lisp @@ -1,5 +1,7 @@ -(in-package :ros.install) -(ros:quicklisp :environment nil) +(ros:include "util-install-quicklisp") +(defpackage :ros.install.cmu-bin + (:use :cl :ros.install :ros.util :ros.locations)) +(in-package :ros.install.cmu-bin) (defun cmu-bin-get-version () (let ((file (merge-pathnames "tmp/cmu-bin.html" (homedir)))) diff --git a/lisp/install-quicklisp.lisp b/lisp/install-quicklisp.lisp index 037d150..5901b22 100644 --- a/lisp/install-quicklisp.lisp +++ b/lisp/install-quicklisp.lisp @@ -1,4 +1,7 @@ -(in-package :ros.install) +(ros:include "util-install-quicklisp") +(defpackage :ros.install.quicklisp + (:use :cl :ros.install :ros.util :ros.locations)) +(in-package :ros.install.quicklisp) (defun quicklisp-help (argv) (format *error-output* "no options for quicklisp~%") diff --git a/lisp/install-sbcl-bin.lisp b/lisp/install-sbcl-bin.lisp index 66df2ba..2e1d366 100644 --- a/lisp/install-sbcl-bin.lisp +++ b/lisp/install-sbcl-bin.lisp @@ -1,4 +1,7 @@ -(in-package :ros.install) +(ros:include "util-install-quicklisp") +(defpackage :ros.install.sbcl-bin + (:use :cl :ros.install :ros.util :ros.locations)) +(in-package :ros.install.sbcl-bin) ;; sbcl-bin is specially treated. Installation are mainly done by src/cmd-install-sbcl-bin.c. diff --git a/lisp/util-install.lisp b/lisp/util-install.lisp index 8533ba4..0703482 100644 --- a/lisp/util-install.lisp +++ b/lisp/util-install.lisp @@ -8,7 +8,7 @@ :install-system-script :install-impl-if-probed :install-script-if-probed :install-system-if-probed :mingw-namestring :install-github :*checkout-default* :install :decide-version :decide-download :*install-cmds* :*help-cmds* :*list-cmd* - :setup :date :github-version)) + :start :setup :date :github-version :version :install-script)) (in-package :ros.install)