Changeset 12

Timestamp:

02/14/06 17:57:14 (3 years ago)

Author:

banderson

Message:

rest of changes/hacks for CL-XML to work with SBCL 0.9.8

Location:

branches/sbcl-0.9.x-testing

Files:

• cl-xml.asd (added)
• code/base/parameters.lisp (modified) (1 diff)
• library/de/setf/utility/conditions.lisp (modified) (2 diffs)
• library/define-system.lisp (modified) (2 diffs)
• load.lisp (modified) (1 diff)
• sysdcl.lisp (modified) (3 diffs)

branches/sbcl-0.9.x-testing/code/base/parameters.lisp

@@ -78 +78 @@
 (defVar *xml-base* nil
   "binds the base uri to serve as the context when resoving identifiers to URLs.
-   parsers bind it to each entity's url to enable rrealtive url references.")
+   parsers bind it to each entity's url to enable relative url references.")
 
 (defVar *xml-verbose* nil

branches/sbcl-0.9.x-testing/library/de/setf/utility/conditions.lisp

@@ -24 +24 @@
 ;; patch restrictive condition implementations
 
+#+(and sbcl sb-package-locks)
+(sb-ext:unlock-package :cl)
+
 (let ((def (fdefinition 'SIMPLE-CONDITION-FORMAT-ARGUMENTS)))
   (unless (typep def 'generic-function)
@@ -47 +50 @@
         (:method ((condition t)) (funcall def condition))))))
 
+#+(and sbcl sb-package-locks)
+(sb-ext:lock-package :cl)
 
 ;;

branches/sbcl-0.9.x-testing/library/define-system.lisp

@@ -19 +19 @@
   (pathname-type (compile-file-pathname (make-pathname :name "source" :type *physical-source-type*))))
 
-#+sbcl
-(setq sb-fasl:*fasl-file-type* "sbcfsl")
 
 (defMacro define-system ((name &key description) (&rest operations) &body files)
@@ -99 +97 @@
    #'(lambda (filename src bin probed-src probed-bin)
        (if probed-src
-         (defsys-message *trace-output*
-           "~%; ~s~@[ (@ ~/print-universal-time/)~] -> ~s (~:[missing~;~1:*@ ~/print-universal-time/~])..."
-           probed-src (file-write-date probed-src) bin (when probed-bin (file-write-date probed-bin)))
-         (warn "file missing: ~s (= ~s)." filename src)))
+           (defsys-message *trace-output*
+               "~%; ~s~@[ (@ ~/print-universal-time/)~] -> ~s (~:[missing~;~1:*@ ~/print-universal-time/~])..."
+             probed-src (file-write-date probed-src) bin (when probed-bin (file-write-date probed-bin)))
+           (warn "file missing: ~s (= ~s)." filename src)))
    filename))
 

branches/sbcl-0.9.x-testing/load.lisp

@@ -3 +3 @@
 (in-package :CL-USER)
 
-;;; load configuration without CL-HTTP and with name symbols:
+;; FIXME: sbcl/clc only right now  BSA
+(let ((path "/usr/share/common-lisp/source/cl-xml/"))
 
-#+CL-HTTP
-(cerror "continue load."
-        "this is intended to load a configuration without CL-HTTP, yet CL-HTTP is present.")
+;; (or (when *load-truename*
+;;                (directory-namestring *load-truename*) )
+;;              *default-pathname-defaults*)))
 
-(load (merge-pathnames (make-pathname :name "define-system" :directory '(:relative "library"))
-                       *load-pathname*))
-
-(register-system-definition :xparser (merge-pathnames (make-pathname :name "sysdcl") *load-pathname*))
-
-(pushnew :xml-symbols *features*)
-(setf *features* (remove :nameset-tokenizer *features*))
-(execute-system-operations :xparser '(:compile :load))
-
-(format *trace-output* "~%cl xml loaded:~%~s" *features*)
-
-;(execute-system-operations :xtests '( :load))
-
-:EOF
+;;  (format t "~%~%path: ~a~%~%" path)
+  (format t "~%~%path: ~a~%~%" (merge-pathnames (make-pathname :name "sysdcl") path))
+  
+  (register-system-definition :xparser 
+                              (merge-pathnames 
+                               (make-pathname :name "sysdcl")
+                               path))
+  (execute-system-operations :xparser '(:compile :load))
+  
+  (register-system-definition :xpath 
+                              (merge-pathnames 
+                               (make-pathname :name "sysdcl")
+                               path))
+  (execute-system-operations :xpath '(:compile :load)))

branches/sbcl-0.9.x-testing/sysdcl.lisp

@@ -86 +86 @@
            #+cormanlisp #p"d:\\Source\\Lisp\\XML-0-918\\sysdcl.lisp"
            #+lispWorks (truename (lw:current-pathname))
-           #+sbcl (or *load-truename* *load-pathname*)
-           )
+           #+(and sbcl (not asdf)) (or *compile-file-pathname* *load-pathname* *default-pathname-defaults*)
+           #+(and sbcl asdf) (format nil "~acl-xml/" clc::*source-root*))
          (bin-target nil)
          (root-target (make-pathname :name :wild :type :wild :version :newest
@@ -101 +101 @@
                          :version :newest
                          :defaults
-                         #+digitool "xml:root;bin;digifasl;**;*.*.*"
-                         #+(and mcl m68k) "xml:root;bin;digim68kfasl;**;*.*.*"
-                         #+(and allegro allegro-version>= (not (version>= 6 0))) "xml:root;bin;acl5fasl;**;*.*.*"
-                         #+(and allegro allegro-version>= (version>= 6 0)) "xml:root;bin;acl6fasl;**;*.*.*"
-                         #+(and lispworks (not mac)) "xml:root;bin;lwfasl;**;*.*.*"
-                         #+(and lispworks mac) "xml:root;bin;lwppcfasl;**;*.*.*"
-                         #+cormanlisp "xml:root;bin;corfasl;**;*.*.*"
-                         #+openmcl "xml:root;bin;omclfasl;**;*.*.*"
-                         #+cmu "xml:root;bin;cmuclfasl;**;*.*.*"
-                         #+sbcl "xml:root;bin;sbclfasl;**;*.*.*"
+;;                       #-asdf
+;;                       (progn
+                           #+digitool "xml:root;bin;digifasl;**;*.*.*"
+                           #+(and mcl m68k) "xml:root;bin;digim68kfasl;**;*.*.*"
+                           #+(and allegro allegro-version>= (not (version>= 6 0))) "xml:root;bin;acl5fasl;**;*.*.*"
+                           #+(and allegro allegro-version>= (version>= 6 0)) "xml:root;bin;acl6fasl;**;*.*.*"
+                           #+lispworks "xml:root;bin;lwfasl;**;*.*.*"
+                           #+cormanlisp "xml:root;bin;corfasl;**;*.*.*"
+                           #+openmcl "xml:root;bin;omclfasl;**;*.*.*"
+                           #+cmu "xml:root;bin;cmuclfasl;**;*.*.*"
+                           #+sbcl "xml:root;bin;sbclfasl;**;*.*.*"
+;;                         )
+;;                       #+asdf
+;;                       (progn
+;;                         (if (find-package :clc)
+;;                             (format nil "~acl-xml/bin/" clc::*fasl-root*)
+;;                             "xml:root;bin;sbclfasl;**;*.*.*")) ;; FIXME for non clc
                          ))
     (when *load-verbose*
@@ -194 +201 @@
 
 #+sbcl
-(progn
-  (require :gray-streams)
-  (setq *inline-expansion-limit* 2)
-  )
-
-#+ccl-5-0-and-0-918
-(setq CCL::*CHECK-SLOT-TYPE* nil)
+(setq *inline-expansion-limit* 2)
+
+#|#+ccl ; 0.918 in 5.0b
+(setq CCL::*CHECK-SLOT-TYPE* nil)|#
+
 ;; the atn-bnf parser must be loaded in order to translate grammars,
 ;; for regular expressions, and for validation. this is reflected in it presence