summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Benkard <code@mail.matthias.benkard.de>2007-06-30 22:27:46 +0200
committerMatthias Benkard <code@mail.matthias.benkard.de>2007-06-30 22:27:46 +0200
commit7dbfa52a559fc72e375c4f8007283ba25a13a57a (patch)
tree32b05704976b7bbc182d926656f18ea5dfe41f69
parent967c3b8d2b7558a1390dab8715630c4d697bcaae (diff)
Make the code run on NearlyFreeSpeech.NET again.
darcs-hash:fd4f3a2def741297181f05ac5b51f43299eac22b
-rwxr-xr-xrun.lisp18
1 files changed, 11 insertions, 7 deletions
diff --git a/run.lisp b/run.lisp
index 1730bfa..c77cab7 100755
--- a/run.lisp
+++ b/run.lisp
@@ -29,7 +29,6 @@
;;; been written for purposes of debugging, development and
;;; documentation.
-
(defclass load-source-simple-op (asdf:operation) ())
(defmethod asdf:perform ((o load-source-simple-op) (c asdf:component))
nil)
@@ -38,16 +37,21 @@
(load (asdf:component-pathname c))))
-;;; The following does not generally work in a CGI setting because of
-;;; security restrictions. Then again, loading all the dependencies
-;;; individually rather than using a core image would certainly be too
-;;; slow for any serious CGI usage, anyway, so what the heck.
+#+clisp
(unless (asdf:find-system :mulk-journal nil)
(let ((*package* (find-package :asdf)))
- (load "mulk-journal.asd")))
+ (load (merge-pathnames "mulk-journal.asd"
+ system::*current-source-file*))))
-(asdf:oos 'load-source-simple-op '#:mulk-journal)
+;;; The following does not generally work in a CGI setting because of
+;;; security restrictions. Then again, loading all the dependencies
+;;; individually rather than using a core image would certainly be too
+;;; slow for any serious CGI usage, anyway, so what the heck. Loading
+;;; our own files (no dependencies) using a manually loaded system
+;;; definition (see above) works, which suffices for our needs.
+(unless (find-package '#:mulk.journal)
+ (asdf:oos 'load-source-simple-op '#:mulk-journal))
#+clisp