Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv7473

Modified Files: system.lisp Log Message: Make GSHARP-DEFSYSTEM define systems for both mk-defsystem and asdf if both are present in the image in question

Date: Mon Feb 16 13:50:59 2004 Author: crhodes

Index: gsharp/system.lisp diff -u gsharp/system.lisp:1.2 gsharp/system.lisp:1.3 --- gsharp/system.lisp:1.2 Mon Feb 16 11:08:00 2004 +++ gsharp/system.lisp Mon Feb 16 13:50:59 2004 @@ -3,22 +3,22 @@ (defparameter *gsharp-directory* (directory-namestring *load-truename*))

(defmacro gsharp-defsystem ((module &key depends-on) &rest components) - `(defsystem ,module - :source-pathname *gsharp-directory* - ,@(and depends-on `(:depends-on ,depends-on)) - :components (:serial ,@components))) - -#+asdf -(defmacro gsharp-defsystem ((module &key depends-on) &rest components) - `(asdf:defsystem ,module - ,@(and depends-on `(:depends-on ,depends-on)) - :serial t - :components (,@(loop for c in components - for p = (merge-pathnames - (parse-namestring c) - (make-pathname :type "lisp" - :defaults *gsharp-directory*)) - collect `(:file ,(pathname-name p) :pathname ,p))))) + `(progn + #+mk-defsystem + (mk:defsystem ,module + :source-pathname *gsharp-directory* + ,@(and depends-on `(:depends-on ,depends-on)) + :components (:serial ,@components)) + #+asdf + (asdf:defsystem ,module + ,@(and depends-on `(:depends-on ,depends-on)) + :serial t + :components (,@(loop for c in components + for p = (merge-pathnames + (parse-namestring c) + (make-pathname :type "lisp" + :defaults *gsharp-directory*)) + collect `(:file ,(pathname-name p) :pathname ,p))))))

(gsharp-defsystem (:gsharp) "packages"