From 7f897f194c3b88e928f009577cfc48767886cb2c Mon Sep 17 00:00:00 2001 From: Takeru Ohta Date: Fri, 6 Jan 2012 09:52:11 +0900 Subject: [PATCH] =?UTF-8?q?dic=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=86=8D=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README | 2 +- dawg.asd | 2 +- load-hashmap.lisp | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README b/README index ea868f5..0c33648 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ [バージョン] -・0.3.1 +・0.3.2 [依存パッケージ] diff --git a/dawg.asd b/dawg.asd index ecd1feb..404a60a 100644 --- a/dawg.asd +++ b/dawg.asd @@ -3,7 +3,7 @@ (defsystem dawg :name "dawg" :author "Takeru Ohta" - :version "0.3.1" + :version "0.3.2" :serial t :components ((:file "load-hashmap") diff --git a/load-hashmap.lisp b/load-hashmap.lisp index f5c7451..73f2cad 100644 --- a/load-hashmap.lisp +++ b/load-hashmap.lisp @@ -1,11 +1,10 @@ -(eval-when (:load-toplevel :compile-toplevel :execute) - (defun root-path () - (directory-namestring (or *compile-file-pathname* *load-pathname* #P"./"))) - (defun load-local-system (package &optional (package-directory (root-path))) +(eval-when (:compile-toplevel) + (defun load-local-system (package &optional (package-directory #P"./")) (let #.`((asdf:*central-registry* (directory package-directory)) ;; or #+ASDF2 ,@(when #.#1=(find-symbol "*DEFAULT-SOURCE-REGISTRIES*" :asdf) `((,#1# nil)))) (asdf:load-system package)))) -(load-local-system :dict-0.2.0 #P"lib/dict-0.2.0/") +(load-local-system :dict-0.2.0 + #.(merge-pathnames #P"lib/dict-0.2.0/" *compile-file-pathname*))