Skip to content

Move side init recursive load to a named directory #1410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cxxxr merged 1 commit into from
Jun 24, 2024
Merged

Move side init recursive load to a named directory #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/internal-packages.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,11 @@
:*auto-format*
:register-formatter
:register-formatters
:format-buffer))
:format-buffer)
;; site-init.lisp
(:export
:*inits-directory-name*
:load-site-init))
#+sbcl
(sb-ext:lock-package :lem-core)

Expand Down
26 changes: 16 additions & 10 deletions src/site-init.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

(defvar *site-init-name* "lem-site-init")
(defvar *site-init-comment ";; don't edit !!!")
(defvar *inits-directory-name* "lisp")

(defun site-init-path ()
(let ((path (merge-pathnames (format nil "~A.asd"
Expand All @@ -15,12 +16,12 @@
`(asdf:defsystem ,*site-init-name*)))
path))

(defun raw-init-files ()
(directory (merge-pathnames "inits/*.lisp" (lem-home))))

(defun site-init-list-inits ()
(loop for i in (sort (mapcar #'pathname-name
(directory (merge-pathnames "inits/*.lisp"
(lem-home))))
#'string<)
collect (list :file (format nil "inits/~A" i))))
(loop for i in (sort (mapcar #'pathname-name (raw-init-files)) #'string<)
collect (list :file (format nil "inits/~A" i))))

(defun site-init ()
(with-open-file (i (site-init-path))
Expand All @@ -46,11 +47,16 @@

(defun load-site-init (&key force)
(let* ((asdf:*central-registry*
(union (mapcar #'pathname
(mapcar #'directory-namestring
(directory
(merge-pathnames "**/*.asd"
(lem-home)))))
(union (remove-duplicates
(mapcar #'pathname
(mapcar #'directory-namestring
(directory
(merge-pathnames
"**/*.asd"
(pathname (str:concat
(directory-namestring (lem-home))
*inits-directory-name*
(string (uiop:directory-separator-for-host)))))))))
asdf:*central-registry*
:test #'equal))
(system-name *site-init-name*)
Expand Down