From 60c97605ca679a4cd43ea97876d85dce19f5a441 Mon Sep 17 00:00:00 2001 From: SANO Masatoshi Date: Wed, 25 Sep 2019 17:29:26 +0800 Subject: [PATCH] register-local-projects -> local-project-build-hash --- lisp/checkout.ros | 5 +++-- lisp/fmt.ros | 2 +- lisp/util-install.lisp | 4 ++-- lisp/util.lisp | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/checkout.ros b/lisp/checkout.ros index a878e6b..f95e756 100644 --- a/lisp/checkout.ros +++ b/lisp/checkout.ros @@ -15,8 +15,9 @@ exec ros +A -Q -m roswell -N roswell -- $0 "$@" (defun main (&rest argv) #+quicklisp (ignore-errors - (ql:register-local-projects) - (ql:quickload '(:ql-checkout) :silent t) + (unless (find-package :ql-checkout/config) + (funcall 'roswell.util:local-project-build-hash :rebuild t) + (ql:quickload '(:ql-checkout) :silent t)) (set (read-from-string "ql-checkout/config:*checkoutdir*") (first roswell:*local-project-directories*))) (cond ((not (find-package :ql-checkout)) diff --git a/lisp/fmt.ros b/lisp/fmt.ros index 5324b94..32e9c1e 100644 --- a/lisp/fmt.ros +++ b/lisp/fmt.ros @@ -9,7 +9,7 @@ exec ros -Q -N roswell -- $0 "$@" (progn (unless (ql:where-is-system :lem) (roswell:roswell '("git" "clone" "https://github.com/cxxxr/lem.git")) - (quicklisp-client:register-local-projects)) + (read-call "roswell.util:local-project-build-hash" :rebuild t)) (ql:quickload '("swank" "lem-base" "lem-lisp-syntax") :silent t))) (defpackage :ros.script.fmt.3707812168 diff --git a/lisp/util-install.lisp b/lisp/util-install.lisp index 5ef0945..79b0df8 100644 --- a/lisp/util-install.lisp +++ b/lisp/util-install.lisp @@ -121,7 +121,7 @@ To differentiate it from the system with the same name in quicklisp, the path sh ${roswell-home}/local-projects/some/repo " - (read-call "quicklisp-client:register-local-projects") + (read-call "roswell.util:local-project-build-hash" :rebuild t) (loop with *ros-path* = (make-pathname :defaults (opt "argv0")) with changed @@ -147,7 +147,7 @@ To differentiate it from the system with the same name in quicklisp, the path sh ;;github registerd system like "fukamachi/sblint" checkout (version (funcall *checkout-default* impl version tag) - (read-call "quicklisp-client:register-local-projects") + (read-call "roswell.util:local-project-build-hash" :rebuild t) (or (let ((project (merge-pathnames (format nil "local-projects/~A/~A/project.lisp" impl version) (roswell.util:checkoutdir)))) (when (probe-file project) diff --git a/lisp/util.lisp b/lisp/util.lisp index bdd0872..2a2a64f 100644 --- a/lisp/util.lisp +++ b/lisp/util.lisp @@ -6,7 +6,8 @@ :uname :uname-m :homedir :config :impl :which :config-env :checkoutdir :parse-version-spec :download :expand :sh :chdir :system :module :core-extention :clone-github :opt :read-call :set-opt :copy-dir - :roswell-installable-searcher :setenv :unsetenv :ensure-asdf :split-sequence)) + :roswell-installable-searcher :setenv :unsetenv :ensure-asdf :split-sequence + :local-project-build-hash)) (in-package :roswell.util) (defun split-sequence (del seq &key end start (test #'eql) &allow-other-keys) @@ -72,7 +73,7 @@ Returns NIL when the package in the symbol prefix is not available." (let (*read-eval*) (read-from-string (format nil "~A::~A" imp name)))) (progn - (read-call "ql:register-local-projects") + (read-call "local-project-build-hash" :rebuild t) (or (and (or (read-call "ql-dist:find-system" imp) (read-call "ql:where-is-system" imp))