Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv14107 Modified Files: README.html cxml.asd Log Message: - use trivial-gray-streams - replaced dep-* files, since most of them were identical Date: Sat Nov 26 22:48:16 2005 Author: dlichteblau Index: cxml/README.html diff -u cxml/README.html:1.5 cxml/README.html:1.6 --- cxml/README.html:1.5 Sat Jun 25 15:56:50 2005 +++ cxml/README.html Sat Nov 26 22:48:15 2005 @@ -86,6 +86,10 @@ <a name="changes"/> <h2>Recent Changes</h2> + <p class="nomargin"><tt>rel-2005-xx-yy</tt></p> + <ul class="nomargin"> + <li>Use trivial-gray-streams.</li> + </ul> <p class="nomargin"><tt>rel-2005-06-25</tt></p> <ul class="nomargin"> <li>Port to OpenMCL (thanks to Rudi Schlatte).</li> Index: cxml/cxml.asd diff -u cxml/cxml.asd:1.5 cxml/cxml.asd:1.6 --- cxml/cxml.asd:1.5 Sat Jun 25 15:56:50 2005 +++ cxml/cxml.asd Sat Nov 26 22:48:16 2005 @@ -5,10 +5,6 @@ (:use :asdf :cl)) (in-package :cxml-system) -;; XXX das sollte natuerlich erst beim laden stattfinden -#+cmu -(require :gray-streams) - (defclass closure-source-file (cl-source-file) ()) #+sbcl @@ -18,7 +14,7 @@ (let (#+sbcl (*compile-print* nil)) (call-next-method)))) -#-(or rune-is-character rune-is-octet) +#-(or rune-is-character rune-is-integer) (progn (format t "~&;;; Checking for wide character support...") (force-output) @@ -28,7 +24,7 @@ :rune-is-character)) (unless (and (< x char-code-limit) (code-char x)) (format t " no, reverting to octet strings.~%") - (return :rune-is-octet))) + (return :rune-is-integer))) *features*)) #-rune-is-character @@ -37,38 +33,26 @@ #+rune-is-character (format t "~&;;; Building cxml with CHARACTER RUNES~%") -(defsystem runes +(defsystem :cxml-runes :default-component-class closure-source-file :pathname (merge-pathnames "runes/" (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "package") - (:file dependent - :pathname - #+CLISP "dep-clisp" - #+(AND :CMU (NOT :PTHREAD)) "dep-cmucl" - #+sbcl "dep-sbcl" - #+(AND :CMU :PTHREAD) "dep-cmucl-dtc" - #+(and allegro-version>= (version>= 5.0)) "dep-acl5" - #+(and allegro-version>= (not (version>= 5.0))) "dep-acl" - #+openmcl "dep-openmcl" - #+lispworks "dep-lw" - #-(or sbcl CLISP CMU allegro openmcl lispworks) - #.(error "unsupported lisp implementation!") - :depends-on ("package")) + (:file "definline" :depends-on ("package")) (:file runes :pathname #-rune-is-character "runes" #+rune-is-character "characters" - :depends-on ("package" dependent)) - (:file "syntax" :depends-on ("package" dependent runes)) + :depends-on ("package" "definline")) + (:file "syntax" :depends-on ("package" "definline" runes)) (:file "encodings" :depends-on ("package")) (:file "encodings-data" :depends-on ("package" "encodings")) (:file "xstream" - :depends-on ("package" dependent "syntax" "encodings-data")))) + :depends-on ("package" "definline" "syntax" "encodings-data")))) -(asdf:defsystem :xml +(asdf:defsystem :cxml-xml :default-component-class closure-source-file :pathname (merge-pathnames "xml/" @@ -86,9 +70,9 @@ (:file "recoder" :depends-on ("xml-parse")) (:file "catalog" :depends-on ("xml-parse")) (:file "sax-proxy" :depends-on ("xml-parse"))) - :depends-on (:runes :puri)) + :depends-on (:cxml-runes :puri :trivial-gray-streams)) -(asdf:defsystem :dom +(asdf:defsystem :cxml-dom :default-component-class closure-source-file :pathname (merge-pathnames "dom/" @@ -99,7 +83,7 @@ (:file "dom-builder" :depends-on ("dom-impl")) (:file "unparse" :depends-on ("package")) (:file "dom-sax" :depends-on ("package"))) - :depends-on (:xml)) + :depends-on (:cxml-xml)) (asdf:defsystem :cxml-test :default-component-class closure-source-file @@ -107,6 +91,6 @@ "test/" (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "domtest") (:file "xmlconf")) - :depends-on (:xml :dom)) + :depends-on (:cxml-xml :cxml-dom)) -(asdf:defsystem :cxml :components () :depends-on (:dom :cxml-test)) +(asdf:defsystem :cxml :components () :depends-on (:cxml-dom :cxml-test))