From 7f4ed3cd4152206d8e5855d8baa933a1d931636c Mon Sep 17 00:00:00 2001 From: David Lichteblau Date: Sun, 13 Jun 2010 15:32:52 +0200 Subject: [PATCH] Attempt to port to ASDF2 -- tested only on ASDF1 though --- cxml.asd | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/cxml.asd b/cxml.asd index fa834ff..edbbcb1 100644 --- a/cxml.asd +++ b/cxml.asd @@ -47,9 +47,10 @@ (asdf:defsystem :cxml-xml :default-component-class closure-source-file - :pathname (merge-pathnames - "xml/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "xml/" + #-asdf2 (merge-pathnames + "xml/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "package") (:file "util" :depends-on ("package")) @@ -92,9 +93,10 @@ (asdf:defsystem :cxml-dom :default-component-class closure-source-file - :pathname (merge-pathnames - "dom/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "dom/" + #-asdf2 (merge-pathnames + "dom/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "package") (:file rune-impl :pathname "dom-impl" :depends-on ("package")) @@ -108,9 +110,10 @@ (asdf:defsystem :cxml-klacks :default-component-class closure-source-file - :pathname (merge-pathnames - "klacks/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "klacks/" + #-asdf2 (merge-pathnames + "klacks/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :serial t :components ((:file "package") @@ -121,9 +124,10 @@ (asdf:defsystem :cxml-test :default-component-class closure-source-file - :pathname (merge-pathnames - "test/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "test/" + #-asdf2 (merge-pathnames + "test/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "domtest") (:file "xmlconf")) :depends-on (:cxml-xml :cxml-klacks :cxml-dom)) -- 2.11.4.GIT