Changeset 14170


Ignore:
Timestamp:
10/08/12 18:06:57 (9 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

    r13902 r14170  
    11;;;; -*- Mode: LISP -*-
    2 (in-package :asdf)
    32
    4 (defsystem :abcl-asdf
     3(asdf:defsystem :abcl-asdf
    54  :author "Mark Evenson"
    65  :version "0.8.0"
     
    1918            :depends-on (packages))))
    2019
    21 (defsystem :abcl-asdf-test
     20(asdf:defsystem :abcl-asdf-test
    2221  :author "Mark Evenson"
    2322  :depends-on (abcl-asdf)
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r14169 r14170  
    422422      (asdf:ensure-parsed-mvn mvn)
    423423    (resolve-dependencies (format nil "~A:~A:~A" asdf::group-id asdf::artifact-id asdf::version))))
     424
     425;;; Currently the last file listed in ASDF
     426(provide 'abcl-asdf)
  • trunk/abcl/contrib/jss/jss.asd

    r13937 r14170  
    11;;;; -*- Mode: LISP -*-
    2 (in-package :asdf)
    3 
    4 (defsystem :jss
     2(asdf:defsystem :jss
    53  :author "Alan Ruttenberg, Mark Evenson"
    64  :version "3.0.3"
  • trunk/abcl/contrib/mvn/jna.asd

    r13952 r14170  
    33;;;; Need to have jna.jar present for CFFI to have a chance of working.
    44;;; XXX jna-3.4.0 seems much more capable, but doesn't have a resolvable pom.xml from Maven central
    5 (require :asdf)
    65(asdf:defsystem :jna
    76    :version "3.0.9"
    8     :defsystem-depends-on (abcl-asdf) ;;; XXX not working in the bowels of ASDF
     7    :defsystem-depends-on (abcl-asdf)
    98    :components ((:mvn "com.sun.jna/jna/3.0.9")))
  • trunk/abcl/src/org/armedbear/lisp/require.lisp

    r13303 r14170  
    3939(defun module-provide-system (module)
    4040  (let ((*readtable* (copy-readtable nil)))
    41     (handler-case
    42         (load-system-file (string-downcase (string module)))
     41    (handler-case
     42        (progn
     43          (load-system-file (string-downcase (string module)))
     44          (provide module))
    4345      (t (e)
    4446        (unless (and (typep e 'error)
     
    5860             (unless (listp pathnames) (setf pathnames (list pathnames)))
    5961             (dolist (x pathnames)
    60                (load x)))
     62               (load x))
     63             (provide module-name))
    6164            (t
    62              (unless (some (lambda (p) (funcall p module-name))
     65             (if (some (lambda (p) (funcall p module-name))
    6366                           (append (list #'module-provide-system)
    6467                                 sys::*module-provider-functions*))
    65                (error "Don't know how to ~S ~A." 'require module-name))))
     68                 (provide module-name) ;; Shouldn't hurt
     69                 (error "Don't know how to ~S ~A." 'require module-name))))
    6670      (set-difference *modules* saved-modules))))
    6771
Note: See TracChangeset for help on using the changeset viewer.