Changeset 13903

Timestamp:

04/01/12 19:15:39 (9 years ago)

Author:

Mark Evenson

Message:

abcl-asdf: Final touches on 0.8.0.

Location:

trunk/abcl/contrib/abcl-asdf

Files:

• abcl-asdf.lisp (modified) (3 diffs)
• packages.lisp (modified) (1 diff)

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

@@ -24 +24 @@
 ;;; We intercept compilation to ensure that load-op will succeed
 (defmethod perform ((op compile-op) (c mvn))
-  (maybe-parse-mvn c)
+  (ensure-parsed-mvn c)
   (abcl-asdf:resolve c))
      
 (defmethod perform ((operation load-op) (c mvn))
-  (maybe-parse-mvn c)
+  (ensure-parsed-mvn c)
   (java:add-to-classpath 
    (abcl-asdf:as-classpath 
@@ -35 +35 @@
 ;;; A Maven URI has the form "mvn:group-id/artifact-id/version"
 ;;;
+;;; Sometimes people write "group-id:artifact-id:version" to refer to
+;;; Maven artifacts.  One can use ABCL-ASDF:RESOLVE directly for
+;;; serialized references to artifacts of this form.
+;;;
 ;;; Currently we "stuff" the group-id/artifact-id into the 'name' and
 ;;; use the component 'version' for the version.  Parts of ASDF 
 ;;; *reallY* want ASDF:VERSION to be a triple of intergers, and never
 ;;; anything more, so that is part of the motivation behind this effort.
-;;; ??? rename me to ENSURE-MVN-PARSE ??
-(defun maybe-parse-mvn (component)
+(defparameter *mvn-repositories* nil
+  "A list of all Maven repositories encountered in the lifetime of this instance of the implementation.")
+
+(defun ensure-parsed-mvn (component)
   (with-slots (name group-id artifact-id
-               version schema path) 
+               version schema path repository) 
       component
     (when (null asdf::artifact-id) 
@@ -64 +70 @@
                       name version)))
         (setf schema "mvn")
+        (pushnew repository *mvn-repositories*)
         ;;; Always normalized path "on the way out" to contain group-id/artifact-id/version
         (setf path (format nil "~A/~A/~A" group-id artifact-id version))))))

trunk/abcl/contrib/abcl-asdf/packages.lisp

@@ -13 +13 @@
 
    #:init
+
+;;; ASDF
+;;;   #:iri #:mvn
+;;;   #:ensure-parsed-mvn
 
 ;;; "Internal" API