Merge pull request #180 from guicho271828/coleslaw-conf-uiop

Simplify the setting of COLESLAW-CONF:*BASEDIR*

coleslaw-conf.asd

@@ -1,12 +0,0 @@
-(in-package #:asdf-user)
-
-(defsystem #:coleslaw-conf
-  :name "coleslaw-conf"
-  :description "Configuration variable for Coleslaw, Flexible Lisp Blogware"
-  :version "0.9.7"
-  :license "BSD"
-  :author "Brit Butler <redline6561@gmail.com>"
-  :pathname "src/"
-  :depends-on ()
-  :serial t
-  :components ((:file "coleslaw-conf")))

coleslaw.asd

@@ -7,8 +7,7 @@
   :license "BSD"
   :author "Brit Butler <redline6561@gmail.com>"
   :pathname "src/"
-  :depends-on (:coleslaw-conf
-               :closure-template
+  :depends-on (:closure-template
                :3bmd
                :3bmd-ext-code-blocks
                :alexandria
@@ -17,9 +16,11 @@
                :cl-fad
                :cl-ppcre
                :closer-mop
-               :cl-unicode)
+               :cl-unicode
+               :uiop)
   :serial t
-  :components ((:file "packages")
+  :components ((:file "coleslaw-conf")
+               (:file "packages")
                (:file "util")
                (:file "config")
                (:file "themes")
@@ -30,7 +31,3 @@
                (:file "feeds")
                (:file "coleslaw"))
   :in-order-to ((test-op (test-op coleslaw-test))))
-
-(defmethod perform :before ((op load-op)
-                            (system (eql (find-system :coleslaw))))
-  (uiop:symbol-call "COLESLAW-CONF" 'set-basedir #.*load-truename*))

src/coleslaw-conf.lisp

@@ -1,12 +1,10 @@
 (defpackage #:coleslaw-conf
   (:use #:cl)
-  (:export #:*basedir*
-           #:set-basedir))
+  (:export #:*basedir*))
 
 (in-package #:coleslaw-conf)
 
-(defvar *basedir*)
-
-(defun set-basedir (pathname)
-  (setf coleslaw-conf:*basedir*
-    (make-pathname :name nil :type nil :defaults pathname)))
+(defparameter *basedir*
+  (uiop/pathname:pathname-parent-directory-pathname
+   #.(or *compile-file-truename* *load-truename*))
+  "A pathname pointing to Coleslaw's top level directory.")