diff --git a/lisp/asdf.ros b/lisp/asdf.ros index 5cdf79a..33acde6 100644 --- a/lisp/asdf.ros +++ b/lisp/asdf.ros @@ -11,7 +11,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@" (ql:quickload '(:plump) :silent t))) (defpackage :ros.script.asdf.3672011844 - (:use :cl :ros.util :roswell.locations :roswell.install)) + (:use :cl :roswell.util :roswell.locations :roswell.install)) (in-package :ros.script.asdf.3672011844) (defun asdf-get-version () diff --git a/lisp/delete.ros b/lisp/delete.ros index 5316440..42c1cff 100644 --- a/lisp/delete.ros +++ b/lisp/delete.ros @@ -11,7 +11,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@" (ql:quickload :uiop :silent t))) (defpackage :ros.script.delete.3672011943 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.delete.3672011943) (defun delete-dump (params) diff --git a/lisp/dump.ros b/lisp/dump.ros index c96f402..6224e27 100644 --- a/lisp/dump.ros +++ b/lisp/dump.ros @@ -11,7 +11,7 @@ exec ros -- $0 "$@" #+quicklisp(ql:quickload :uiop :silent t))) (defpackage :ros.script.dump.3672012101 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.dump.3672012101) (defun dump-dir () @@ -242,8 +242,8 @@ exec ros -- $0 "$@" (setf ros:*argv* (eval (read-from-string - "(loop :for i :from 0 :below (ext:argc) - :collect (ext:argv i))"))) + "(loop for i from 0 below (ext:argc) + collect (ext:argv i))"))) (print ros:*argv*) (ros:run ',cmds))))) ;; (uiop:run-program (format nil "rm -r ~a" tmp)) diff --git a/lisp/help.ros b/lisp/help.ros index fa74cb3..d62cb05 100644 --- a/lisp/help.ros +++ b/lisp/help.ros @@ -8,7 +8,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@" (ros:include "util")) (defpackage :ros.script.help.3668211011 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.help.3668211011) (defvar *options* diff --git a/lisp/init.ros b/lisp/init.ros index 6d323b9..334de17 100644 --- a/lisp/init.ros +++ b/lisp/init.ros @@ -9,7 +9,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@" (ros:include "util")) (defpackage :ros.script.init.3672012201 - (:use :cl :ros :ros.util)) + (:use :cl :ros :roswell.util)) (in-package :ros.script.init.3672012201) (defun main (&optional name &rest r) diff --git a/lisp/install+7zip.lisp b/lisp/install+7zip.lisp index 4d7280c..f2c65c5 100644 --- a/lisp/install+7zip.lisp +++ b/lisp/install+7zip.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.7zip+ - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.7zip+) #-win32 (progn diff --git a/lisp/install+ffcall.lisp b/lisp/install+ffcall.lisp index d7bdd70..747b6d3 100644 --- a/lisp/install+ffcall.lisp +++ b/lisp/install+ffcall.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.ffcall+ - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.ffcall+) (defvar *ffcall-version* "1.10") diff --git a/lisp/install+msys2.lisp b/lisp/install+msys2.lisp index 29c5bb5..d31c40f 100644 --- a/lisp/install+msys2.lisp +++ b/lisp/install+msys2.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.msys2+ - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.msys2+) #-win32 (progn diff --git a/lisp/install+sigsegv.lisp b/lisp/install+sigsegv.lisp index c19a665..42386ef 100644 --- a/lisp/install+sigsegv.lisp +++ b/lisp/install+sigsegv.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.sigsegv+ - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.sigsegv+) (defvar *sigsegv-version* "2.10") diff --git a/lisp/install-abcl-bin.lisp b/lisp/install-abcl-bin.lisp index bc071d1..becb052 100644 --- a/lisp/install-abcl-bin.lisp +++ b/lisp/install-abcl-bin.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.abcl-bin - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.abcl-bin) (defvar *abcl-bin-get-version-cache* nil) diff --git a/lisp/install-allegro.lisp b/lisp/install-allegro.lisp index 823c42b..4717d97 100644 --- a/lisp/install-allegro.lisp +++ b/lisp/install-allegro.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.allegro - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.allegro) (ros:quicklisp :environment nil) diff --git a/lisp/install-ccl-bin.lisp b/lisp/install-ccl-bin.lisp index f67e4b1..93dc247 100644 --- a/lisp/install-ccl-bin.lisp +++ b/lisp/install-ccl-bin.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.ccl-bin - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.ccl-bin) (defun ccl-bin-get-version () diff --git a/lisp/install-clisp.lisp b/lisp/install-clisp.lisp index c22a341..7ea6a7e 100644 --- a/lisp/install-clisp.lisp +++ b/lisp/install-clisp.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.clisp - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.clisp) (defun clisp-get-version () diff --git a/lisp/install-cmu-bin.lisp b/lisp/install-cmu-bin.lisp index d08746a..456dc89 100644 --- a/lisp/install-cmu-bin.lisp +++ b/lisp/install-cmu-bin.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.cmu-bin - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.cmu-bin) (defun cmu-bin-get-version () diff --git a/lisp/install-ecl.lisp b/lisp/install-ecl.lisp index afc3dd4..6fc0900 100644 --- a/lisp/install-ecl.lisp +++ b/lisp/install-ecl.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.ecl - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.ecl) (defvar *ecl-options* diff --git a/lisp/install-quicklisp.lisp b/lisp/install-quicklisp.lisp index b87a127..dc98877 100644 --- a/lisp/install-quicklisp.lisp +++ b/lisp/install-quicklisp.lisp @@ -1,6 +1,6 @@ (ros:include "util-install") (defpackage :roswell.install.quicklisp - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.quicklisp) (defun quicklisp-help (argv) diff --git a/lisp/install-sbcl-bin.lisp b/lisp/install-sbcl-bin.lisp index 15c4f57..955cca8 100644 --- a/lisp/install-sbcl-bin.lisp +++ b/lisp/install-sbcl-bin.lisp @@ -1,6 +1,6 @@ (ros:include "util-install") (defpackage :roswell.install.sbcl-bin - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.sbcl-bin) ;; sbcl-bin is specially treated. Installation are mainly done by src/cmd-install-sbcl-bin.c. diff --git a/lisp/install-sbcl.lisp b/lisp/install-sbcl.lisp index ac1b996..d7c90b2 100644 --- a/lisp/install-sbcl.lisp +++ b/lisp/install-sbcl.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.install.sbcl - (:use :cl :roswell.install :ros.util :roswell.locations)) + (:use :cl :roswell.install :roswell.util :roswell.locations)) (in-package :roswell.install.sbcl) #| diff --git a/lisp/install-slime.lisp b/lisp/install-slime.lisp index 0a00efc..8aba34a 100644 --- a/lisp/install-slime.lisp +++ b/lisp/install-slime.lisp @@ -4,7 +4,7 @@ (ql:quickload '(:plump) :silent t)) (defpackage :roswell.install.slime - (:use :cl :roswell.install :roswell.locations :ros.util)) + (:use :cl :roswell.install :roswell.locations :roswell.util)) (in-package :roswell.install.slime) (defun slime-help (argv) diff --git a/lisp/list-dump.lisp b/lisp/list-dump.lisp index a9efce2..9ecdb8f 100644 --- a/lisp/list-dump.lisp +++ b/lisp/list-dump.lisp @@ -1,5 +1,5 @@ (defpackage :roswell.list.dump - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :roswell.list.dump) (defun dump (&rest params) diff --git a/lisp/list-installed.lisp b/lisp/list-installed.lisp index 1794739..be90c40 100644 --- a/lisp/list-installed.lisp +++ b/lisp/list-installed.lisp @@ -1,5 +1,5 @@ (defpackage :roswell.list.installed - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :roswell.list.installed) (defun installed (&rest r) diff --git a/lisp/list-versions.lisp b/lisp/list-versions.lisp index 2bdd513..7cce58d 100644 --- a/lisp/list-versions.lisp +++ b/lisp/list-versions.lisp @@ -1,5 +1,5 @@ (defpackage :roswell.list.versions - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :roswell.list.versions) (defun versions (&rest params) diff --git a/lisp/list.ros b/lisp/list.ros index 4b4c2cc..39dc52c 100644 --- a/lisp/list.ros +++ b/lisp/list.ros @@ -9,7 +9,7 @@ exec ros +Q -m roswell -L sbcl-bin -- $0 "$@" (ros:include "system")) (defpackage :ros.script.list.3672012243 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.list.3672012243) (system "list-versions") diff --git a/lisp/patch-quicklisp.lisp b/lisp/patch-quicklisp.lisp index cc8a9fa..b3e56b8 100644 --- a/lisp/patch-quicklisp.lisp +++ b/lisp/patch-quicklisp.lisp @@ -1,5 +1,5 @@ (ros:include "util") -(in-package :ros.util) +(in-package :roswell.util) (defun fetch-via-roswell (url file &key (follow-redirects t) quietly (maximum-redirects 10)) "Request URL and write the body of the response to FILE." (declare (ignorable follow-redirects quietly maximum-redirects)) @@ -28,7 +28,7 @@ (format nil "impls/~A/windows/7za/9.20/7za.exe" (ros:roswell '("roswell-internal-use" "uname" "-m") :string T)) - (ros.util:homedir)))) + (roswell.util:homedir)))) (defmethod install ((release release)) (let ((archive (ensure-local-archive-file release)) (output diff --git a/lisp/run-msys.lisp b/lisp/run-msys.lisp index e7510e9..35a1528 100644 --- a/lisp/run-msys.lisp +++ b/lisp/run-msys.lisp @@ -1,6 +1,6 @@ (ros:include "util-install-quicklisp") (defpackage :roswell.run.msys - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :roswell.run.msys) (defvar *msys2-arch*) diff --git a/lisp/run.ros b/lisp/run.ros index bd2556e..e751f4a 100644 --- a/lisp/run.ros +++ b/lisp/run.ros @@ -8,7 +8,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@" (ros:include "util")) (defpackage :ros.script.run.3668210999 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.run.3668210999) (defun main (system script verbose &rest rest) diff --git a/lisp/setup.ros b/lisp/setup.ros index 4ba33cd..9a51878 100644 --- a/lisp/setup.ros +++ b/lisp/setup.ros @@ -8,7 +8,7 @@ exec ros -Q -L sbcl-bin -- $0 "$@" (ros:include "util")) (defpackage :ros.script.setup.3672012282 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.setup.3672012282) (defun split-spaces (line) diff --git a/lisp/system.lisp b/lisp/system.lisp index b8bf8a9..08f6ac8 100644 --- a/lisp/system.lisp +++ b/lisp/system.lisp @@ -1,10 +1,7 @@ -(cl:in-package :cl-user) +(in-package :roswell.util) -#-asdf -(require :asdf) - -(ros:include "util") -(in-package :ros.util) +(ros:ensure-asdf) +(ros:include "util" "system") (defmacro system (file &key depends-on (prefix ":roswell")) (let ((pos (or (position #\- file) diff --git a/lisp/template.ros b/lisp/template.ros index df7d380..65b54a8 100644 --- a/lisp/template.ros +++ b/lisp/template.ros @@ -10,7 +10,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@" (ql:quickload '(:cl-base64 :chipz) :silent t)) (defpackage :ros.script.template.3670908195 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.template.3670908195) (defvar *subcommands* '(("rm" . template-rm) diff --git a/lisp/use.ros b/lisp/use.ros index c1c082e..537a29c 100644 --- a/lisp/use.ros +++ b/lisp/use.ros @@ -9,7 +9,7 @@ exec ros +R -Q -L sbcl-bin -m roswell -- $0 "$@" (ros:include "util-use")) (defpackage :ros.script.use.3672012320 - (:use :cl :ros.util)) + (:use :cl :roswell.util)) (in-package :ros.script.use.3672012320) (defun main (&rest argv) diff --git a/lisp/util-install.lisp b/lisp/util-install.lisp index f722fec..ea2fa90 100644 --- a/lisp/util-install.lisp +++ b/lisp/util-install.lisp @@ -1,6 +1,6 @@ (ros:include '("locations" "util") "util-install") (defpackage :roswell.install - (:use :cl :ros.util :roswell.locations) + (:use :cl :roswell.util :roswell.locations) (:export :*build-hook* :install-impl :read-call :*ros-path* :install-system-script :install-impl-if-probed :install-script-if-probed :install-system-if-probed :mingw-namestring :install-github :*checkout-default* diff --git a/lisp/util-swank.lisp b/lisp/util-swank.lisp index 045f27c..deb9cca 100644 --- a/lisp/util-swank.lisp +++ b/lisp/util-swank.lisp @@ -1,6 +1,6 @@ (ros:include "util") (defpackage :roswell.util.swank - (:use :cl :ros.util) + (:use :cl :roswell.util) (:export :swank)) (in-package :roswell.util.swank) diff --git a/lisp/util-use.lisp b/lisp/util-use.lisp index 99b9b6d..3251961 100644 --- a/lisp/util-use.lisp +++ b/lisp/util-use.lisp @@ -1,7 +1,7 @@ (ros:include "util" "util-use") (defpackage :roswell.util.use - (:use :cl :ros.util) + (:use :cl :roswell.util) (:export :use)) (in-package :roswell.util.use) diff --git a/lisp/util.lisp b/lisp/util.lisp index d0b119b..c4c6d25 100644 --- a/lisp/util.lisp +++ b/lisp/util.lisp @@ -1,17 +1,11 @@ -(cl:in-package :cl-user) -(when (cl:find-package :ros.util) - (pushnew :ros.util *features*)) - -(defpackage :ros.util +(ros:include () "util") +(defpackage :roswell.util (:use :cl) (:import-from :ros :opt) (:export :uname :uname-m :homedir :config :impl :which :list% :config-env :parse-version-spec :download :expand :sh :chdir :system :module :core-extention :clone-github :opt :read-call :set-opt :copy-dir)) - -(in-package :ros.util) - -(ros:include () "util") +(in-package :roswell.util) (defun read-call (func &rest params) (ignore-errors (apply (let (*read-eval*) (read-from-string func)) params)))