From 7dbfa52a559fc72e375c4f8007283ba25a13a57a Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Sat, 30 Jun 2007 22:27:46 +0200 Subject: Make the code run on NearlyFreeSpeech.NET again. darcs-hash:fd4f3a2def741297181f05ac5b51f43299eac22b --- run.lisp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'run.lisp') 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 -- cgit v1.2.3