Changeset 14170

Timestamp:

10/08/12 18:06:57 (8 years ago)

Author:

Mark Evenson

Message:

Fix the broken require contracts in ABCL-CONTRIB.

CL:REQUIRE now calls PROVIDE with module names when successful (as
opposed to relying in the loaded code to do this explicity).

Location:

trunk/abcl

Files:

• contrib/abcl-asdf/abcl-asdf.asd (modified) (2 diffs)
• contrib/abcl-asdf/maven-embedder.lisp (modified) (1 diff)
• contrib/jss/jss.asd (modified) (1 diff)
• contrib/mvn/jna.asd (modified) (1 diff)
• src/org/armedbear/lisp/require.lisp (modified) (2 diffs)

trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

@@ -1 +1 @@
 ;;;; -*- Mode: LISP -*-
-(in-package :asdf)
 
-(defsystem :abcl-asdf
+(asdf:defsystem :abcl-asdf
   :author "Mark Evenson"
   :version "0.8.0"
@@ -19 +18 @@
             :depends-on (packages))))
 
-(defsystem :abcl-asdf-test
+(asdf:defsystem :abcl-asdf-test
   :author "Mark Evenson"
   :depends-on (abcl-asdf)

trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

@@ -422 +422 @@
       (asdf:ensure-parsed-mvn mvn)
     (resolve-dependencies (format nil "~A:~A:~A" asdf::group-id asdf::artifact-id asdf::version))))
+
+;;; Currently the last file listed in ASDF
+(provide 'abcl-asdf)

trunk/abcl/contrib/jss/jss.asd

@@ -1 +1 @@
 ;;;; -*- Mode: LISP -*-
-(in-package :asdf)
-
-(defsystem :jss
+(asdf:defsystem :jss
   :author "Alan Ruttenberg, Mark Evenson"
   :version "3.0.3" 

trunk/abcl/contrib/mvn/jna.asd

@@ -3 +3 @@
 ;;;; Need to have jna.jar present for CFFI to have a chance of working.
 ;;; XXX jna-3.4.0 seems much more capable, but doesn't have a resolvable pom.xml from Maven central
-(require :asdf)
 (asdf:defsystem :jna 
     :version "3.0.9"
-    :defsystem-depends-on (abcl-asdf) ;;; XXX not working in the bowels of ASDF
+    :defsystem-depends-on (abcl-asdf)
     :components ((:mvn "com.sun.jna/jna/3.0.9")))

trunk/abcl/src/org/armedbear/lisp/require.lisp

@@ -39 +39 @@
 (defun module-provide-system (module) 
   (let ((*readtable* (copy-readtable nil)))
-    (handler-case 
-        (load-system-file (string-downcase (string module)))
+    (handler-case
+        (progn 
+          (load-system-file (string-downcase (string module)))
+          (provide module))
       (t (e) 
         (unless (and (typep e 'error)
@@ -58 +60 @@
              (unless (listp pathnames) (setf pathnames (list pathnames)))
              (dolist (x pathnames)
-               (load x)))
+               (load x))
+             (provide module-name))
             (t
-             (unless (some (lambda (p) (funcall p module-name))
+             (if (some (lambda (p) (funcall p module-name))
                            (append (list #'module-provide-system)
                                  sys::*module-provider-functions*))
-               (error "Don't know how to ~S ~A." 'require module-name))))
+                 (provide module-name) ;; Shouldn't hurt
+                 (error "Don't know how to ~S ~A." 'require module-name))))
       (set-difference *modules* saved-modules))))