diff --git a/coleslaw.asd b/coleslaw.asd index 99d3374..bf87208 100644 --- a/coleslaw.asd +++ b/coleslaw.asd @@ -1,17 +1,16 @@ (defsystem #:coleslaw :name "coleslaw-core" :description "Flexible Lisp Blogware" - :version "0.5" + :version "0.6" :license "BSD" :author "Brit Butler " :pathname "src/" - :depends-on (:alexandria :closure-template :3bmd :3bmd-ext-code-blocks - :local-time :trivial-shell :cl-fad) + :depends-on (:closure-template :3bmd :3bmd-ext-code-blocks + :alexandria :local-time :trivial-shell :cl-fad) :serial t :components ((:file "packages") - (:file "config") (:file "util") - (:file "plugins") + (:file "config") (:file "themes") (:file "coleslaw") (:file "feeds") diff --git a/src/config.lisp b/src/config.lisp index 49721f1..d85928f 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -15,6 +15,17 @@ (defparameter *config* nil "A variable to store the blog configuration and plugin settings.") +(defun load-plugins (plugins) + "Resolve the path of each symbol in PLUGINS and call LOAD on the +resulting pathnames. It is expected that the matching *.lisp files +are in the plugins folder in coleslaw's source directory." + (let ((files (mapcar (lambda (sym) + (app-path "plugins/~a" (string-downcase (symbol-name sym)))) + plugins))) + (map nil (lambda (file) + (compile-file file) + (load file)) files))) + (defun load-config (&optional (dir (user-homedir-pathname))) "Load the coleslaw configuration from DIR/.coleslawrc. DIR is ~ by default." (with-open-file (in (merge-pathnames ".coleslawrc" dir)) diff --git a/src/plugins.lisp b/src/plugins.lisp deleted file mode 100644 index 52655cf..0000000 --- a/src/plugins.lisp +++ /dev/null @@ -1,12 +0,0 @@ -(in-package :coleslaw) - -(defun load-plugins (plugins) - "Resolve the path of each symbol in PLUGINS and call LOAD on the -resulting pathnames. It is expected that the matching *.lisp files -are in the plugins folder in coleslaw's source directory." - (let ((files (mapcar (lambda (sym) - (app-path "plugins/~a" (string-downcase (symbol-name sym)))) - plugins))) - (map nil (lambda (file) - (compile-file file) - (load file)) files)))