OSCL/CXML
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix asd file for ASDF 3.3

Browse Source 
Follow convention for secondary system names.

Fix to find the DTD pathname the correct ASDF 2+ way.
This commit is contained in:
Francois-Rene Rideau
2017-03-28 09:47:03 -04:00
committed by Pierre R. Mai
parent 9365c4b93c
commit 6bdee6e7dc
2 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
cxml.asd
View File

@ -2,11 +2,6 @@
(:use :asdf :cl)) (:use :asdf :cl))
(in-package :cxml-system) (in-package :cxml-system)
(defclass dummy-cxml-component () ())
(defmethod asdf:component-name ((c dummy-cxml-component))
:cxml)
(progn (progn
(format t "~&;;; Checking for wide character support...") (format t "~&;;; Checking for wide character support...")
(force-output) (force-output)
@ -45,12 +40,9 @@
(let (#+sbcl (*compile-print* nil)) (let (#+sbcl (*compile-print* nil))
(call-next-method)))) (call-next-method))))
(asdf:defsystem :cxml-xml (defsystem "cxml/xml"
:default-component-class closure-source-file :default-component-class closure-source-file
:pathname #+asdf2 "xml/" :pathname "xml/"
#-asdf2 (merge-pathnames
"xml/"
(make-pathname :name nil :type nil :defaults *load-truename*))
:components :components
((:file "package") ((:file "package")
(:file "util" :depends-on ("package")) (:file "util" :depends-on ("package"))
@ -91,12 +83,9 @@
:closure-common-system)))) :closure-common-system))))
(call-next-method))) (call-next-method)))
(asdf:defsystem :cxml-dom (defsystem "cxml/dom"
:default-component-class closure-source-file :default-component-class closure-source-file
:pathname #+asdf2 "dom/" :pathname "dom/"
#-asdf2 (merge-pathnames
"dom/"
(make-pathname :name nil :type nil :defaults *load-truename*))
:components :components
((:file "package") ((:file "package")
(:file rune-impl :pathname "dom-impl" :depends-on ("package")) (:file rune-impl :pathname "dom-impl" :depends-on ("package"))
@ -106,31 +95,24 @@
#+rune-is-integer #+rune-is-integer
(utf8dom-file utf8-builder :pathname "dom-builder" :depends-on (utf8-impl)) (utf8dom-file utf8-builder :pathname "dom-builder" :depends-on (utf8-impl))
(:file "dom-sax" :depends-on ("package"))) (:file "dom-sax" :depends-on ("package")))
:depends-on (:cxml-xml)) :depends-on ("cxml/xml"))
(asdf:defsystem :cxml-klacks (defsystem "cxml/klacks"
:default-component-class closure-source-file :default-component-class closure-source-file
:pathname #+asdf2 "klacks/" :pathname "klacks/"
#-asdf2 (merge-pathnames
"klacks/"
(make-pathname :name nil :type nil :defaults *load-truename*))
:serial t :serial t
:components :components
((:file "package") ((:file "package")
(:file "klacks") (:file "klacks")
(:file "klacks-impl") (:file "klacks-impl")
(:file "tap-source")) (:file "tap-source"))
:depends-on (:cxml-xml)) :depends-on ("cxml/xml"))
(asdf:defsystem :cxml-test (defsystem "cxml/test"
:default-component-class closure-source-file :default-component-class closure-source-file
:pathname #+asdf2 "test/" :pathname "test/"
#-asdf2 (merge-pathnames :components ((:file "domtest") (:file "xmlconf"))
"test/" :depends-on ("cxml/xml" "cxml/klacks" "cxml/dom"))
(make-pathname :name nil :type nil :defaults *load-truename*))
:components ((:file "domtest") (:file "xmlconf"))
:depends-on (:cxml-xml :cxml-klacks :cxml-dom))
(asdf:defsystem :cxml (defsystem "cxml"
:components () :depends-on ("cxml/dom" "cxml/klacks" #-allegro "cxml/test"))
:depends-on (:cxml-dom :cxml-klacks #-allegro :cxml-test))

14
xml/catalog.lisp
View File

@ -226,14 +226,12 @@
(warn "ignoring catalog error: ~A" c)))) (warn "ignoring catalog error: ~A" c))))
(defparameter *catalog-dtd* (defparameter *catalog-dtd*
(let* ((cxml (let ((dtd (asdf:system-relative-pathname :cxml "catalog.dtd")))
(slot-value (asdf:find-system :cxml) 'asdf::relative-pathname)) (with-open-file (s dtd :element-type '(unsigned-byte 8))
(dtd (merge-pathnames "catalog.dtd" cxml))) (let ((bytes
(with-open-file (s dtd :element-type '(unsigned-byte 8)) (make-array (file-length s) :element-type '(unsigned-byte 8))))
(let ((bytes (read-sequence bytes s)
(make-array (file-length s) :element-type '(unsigned-byte 8)))) bytes))))
(read-sequence bytes s)
bytes))))
(defun parse-catalog-file/strict (uri) (defun parse-catalog-file/strict (uri)
(let* ((*catalog* nil) (let* ((*catalog* nil)