Changeset 13804

Timestamp:

01/25/12 11:32:09 (11 years ago)

Author:

Mark Evenson

Message:

Fix for maven-3.0.4.

Part of the process of cleaning up ABCL-ASDF to work with more Maven
versions.

Seems to be failing for OS X Maven 3.0.4, so need to do a round of testing.

Add system definition of ABCL-ASDF-TEST which becomes the behavior for
invoking ASDF:TEST-SYSTEM on ABCL-ASDF. Really update to version
"0.5.0".

Correct misspellings.

TODO: figure out a list of repos to iteratively search.

TODO: overload the system defintion version mechanism to allow
non-integer values, or just use the IRI class?

TODO: be more verbose on searching/downloading Maven artifacts as it
can be quite slow for large amounts of artifacts.

Location:

trunk/abcl/contrib/abcl-asdf

Files:

• README.markdown (modified) (1 diff)
• abcl-asdf.asd (modified) (2 diffs)
• maven-embedder.lisp (modified) (2 diffs)
• packages.lisp (modified) (1 diff)
• tests/example.lisp (modified) (1 diff)
• tests/maven.lisp (modified) (1 diff)

trunk/abcl/contrib/abcl-asdf/README.markdown

@@ -134 +134 @@
 
 
-#### Colophone
+#### Colophon
 
     Mark <evenson.not.org@gmail.com>
     
     Created: 2011-01-01
-    Revised: 2012-01-22
+    Revised: 2012-01-24
     

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

@@ -4 +4 @@
 (defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "0.4.1"
+  :version "0.5.0"
   :depends-on (jss)
   :components 
@@ -18 +18 @@
                     :depends-on ("abcl-asdf" "asdf-jar")))
             :depends-on (packages))))
+
+
+(eval-when (:compile-toplevel :load-toplevel)
+  (load "~/quicklisp/setup")
+  (apply (intern (symbol-name 'quickload) 'quicklisp) "rt"))
+
+(defsystem :abcl-asdf-test
+  :author "Mark Evenson"
+  :depends-on (abcl-asdf quicklisp rt)
+  :components
+  ((:module tests :components
+            (#+nil (:file "example")
+                   (:file "maven")))))
+
+
+(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf))))
+   "Invoke tests with (asdf:test-system 'abcl-asdf)."
+   (asdf:load-system 'abcl-asdf-test)
+
+   (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
+

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

@@ -85 +85 @@
   (setf *init* t))
 
+(defparameter *http-wagon-implementations*
+  `("org.apache.maven.wagon.providers.http.HttpWagon" ;; introduced as default with maven-3.0.3
+    "org.apache.maven.wagon.providers.http.LightweightHttpWagon"))
+
 (defun make-wagon-provider ()
   (unless *init* (init))
@@ -92 +96 @@
    (lambda (role-hint)
      (if (string-equal "http" role-hint)
-       (java:jnew "org.apache.maven.wagon.providers.http.LightweightHttpWagon")
+         (some (lambda (provider) (java:jnew provider)) *http-wagon-implementations*)
        java:+null+))
    "release"

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

@@ -17 +17 @@
    #:*inhibit-add-to-classpath*))
 
+(defpackage #:abcl-asdf-test
+  (:use :cl :rt)
+  (:export #:run))

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

@@ -2 +2 @@
 
 (deftest LOG4J.2
-    (asdf:load-system "log4j")
-    (let ((logger (#"getLogger" 'log4j.Logger (symbol-name (gensym)))))
-      (#"trace" logger "Kilroy wuz here."))
+    (progn
+      (asdf:load-system "log4j")
+      (let ((logger (#"getLogger" 'log4j.Logger (symbol-name (gensym)))))
+        (#"trace" logger "Kilroy wuz here.")))
   t)
 

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

@@ -7 +7 @@
 
 ; TODO figure out what sort of test framework we can hook in.  Probably ABCL-RT
+
+(in-package :abcl-asdf-test)
+
+(deftest LOG4J.1
+    (let ((result (abcl-asdf:resolve-dependencies "log4j" "log4j")))
+      (and result
+           (format *standard-output* "~&~A~%" result)
+           (type-p result 'cons)))
+  t)
+
+
+(deftest ABCL.1
+    (let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
+      (and result
+           (format *standard-output* "~&~A~%" result)
+           (type-p result 'cons)))
+  t)
+
+
+