[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[STUMP] [PATCH] CLISP build: don't load the bundled asdf.lisp if asdf is
From: |
Ben Spencer |
Subject: |
[STUMP] [PATCH] CLISP build: don't load the bundled asdf.lisp if asdf is already present. |
Date: |
Sun, 29 Nov 2009 22:32:49 +0000 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
This fixes the build process for clisp setups which automatically load asdf.
---
Makefile.in | 2 +-
make-image.lisp.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 79272f1..c7c122a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@ sbcl_BUILDOPTS=--load ./make-image.lisp
openmcl_BUILDOPTS=--load ./make-image.lisp
ecl_BUILDOPTS=-norc -shell ./make-image.lisp
-clisp_INFOOPTS=-K full -on-error exit -x "(load \"asdf.lisp\") (load
\"stumpwm.asd\") (load \"@PPCRE_PATH@/cl-ppcre.asd\") (asdf:operate
'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\"))
(stumpwm::generate-manual) (ext:exit)"
+clisp_INFOOPTS=-K full -on-error exit -x "(require 'asdf '(\"asdf.lisp\"))
(load \"stumpwm.asd\") (load \"@PPCRE_PATH@/cl-ppcre.asd\") (asdf:operate
'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\"))
(stumpwm::generate-manual) (ext:exit)"
sbcl_INFOOPTS=--eval "(progn (require 'asdf) (require 'stumpwm) (load
\"manual.lisp\"))" --eval "(progn (stumpwm::generate-manual) (sb-ext:quit))"
openmcl_INFOOPTS=--eval "(require 'asdf) (require 'stumpwm) (load
(compile-file \"manual.lisp\")) (stumpwm::generate-manual) (quit)"
ecl_INFOOPTS=-eval "(progn (require 'asdf) (load
\"@PPCRE_PATH@/cl-ppcre.asd\") (require 'stumpwm) (load \"manual.lisp\"))"
-eval "(progn (stumpwm::generate-manual) (ext:quit))"
diff --git a/make-image.lisp.in b/make-image.lisp.in
index b14f44b..9f0d882 100644
--- a/make-image.lisp.in
+++ b/make-image.lisp.in
@@ -18,7 +18,7 @@
;; Is there a better way to use asdf.lisp than including it with stumpwm?
#+clisp
(progn
- (load "asdf.lisp")
+ (require 'asdf '("asdf.lisp"))
(load "stumpwm.asd")
(load "@PPCRE_PATH@/cl-ppcre.asd"))
#+clisp
--
1.6.5.3
- [STUMP] [PATCH] CLISP build: don't load the bundled asdf.lisp if asdf is already present.,
Ben Spencer <=