Changeset 13804


Ignore:
Timestamp:
01/25/12 11:32:09 (9 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-asdf/README.markdown

    r13794 r13804  
    134134
    135135
    136 #### Colophone
     136#### Colophon
    137137
    138138    Mark <evenson.not.org@gmail.com>
    139139   
    140140    Created: 2011-01-01
    141     Revised: 2012-01-22
     141    Revised: 2012-01-24
    142142   
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

    r13575 r13804  
    44(defsystem :abcl-asdf
    55  :author "Mark Evenson"
    6   :version "0.4.1"
     6  :version "0.5.0"
    77  :depends-on (jss)
    88  :components
     
    1818                    :depends-on ("abcl-asdf" "asdf-jar")))
    1919            :depends-on (packages))))
     20
     21
     22(eval-when (:compile-toplevel :load-toplevel)
     23  (load "~/quicklisp/setup")
     24  (apply (intern (symbol-name 'quickload) 'quicklisp) "rt"))
     25
     26(defsystem :abcl-asdf-test
     27  :author "Mark Evenson"
     28  :depends-on (abcl-asdf quicklisp rt)
     29  :components
     30  ((:module tests :components
     31            (#+nil (:file "example")
     32                   (:file "maven")))))
     33
     34
     35(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf))))
     36   "Invoke tests with (asdf:test-system 'abcl-asdf)."
     37   (asdf:load-system 'abcl-asdf-test)
     38
     39   (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
     40
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r13575 r13804  
    8585  (setf *init* t))
    8686
     87(defparameter *http-wagon-implementations*
     88  `("org.apache.maven.wagon.providers.http.HttpWagon" ;; introduced as default with maven-3.0.3
     89    "org.apache.maven.wagon.providers.http.LightweightHttpWagon"))
     90
    8791(defun make-wagon-provider ()
    8892  (unless *init* (init))
     
    9296   (lambda (role-hint)
    9397     (if (string-equal "http" role-hint)
    94        (java:jnew "org.apache.maven.wagon.providers.http.LightweightHttpWagon")
     98         (some (lambda (provider) (java:jnew provider)) *http-wagon-implementations*)
    9599       java:+null+))
    96100   "release"
  • trunk/abcl/contrib/abcl-asdf/packages.lisp

    r13575 r13804  
    1717   #:*inhibit-add-to-classpath*))
    1818
     19(defpackage #:abcl-asdf-test
     20  (:use :cl :rt)
     21  (:export #:run))
  • trunk/abcl/contrib/abcl-asdf/tests/example.lisp

    r13803 r13804  
    22
    33(deftest LOG4J.2
    4     (asdf:load-system "log4j")
    5     (let ((logger (#"getLogger" 'log4j.Logger (symbol-name (gensym)))))
    6       (#"trace" logger "Kilroy wuz here."))
     4    (progn
     5      (asdf:load-system "log4j")
     6      (let ((logger (#"getLogger" 'log4j.Logger (symbol-name (gensym)))))
     7        (#"trace" logger "Kilroy wuz here.")))
    78  t)
    89
  • trunk/abcl/contrib/abcl-asdf/tests/maven.lisp

    r13771 r13804  
    77
    88; TODO figure out what sort of test framework we can hook in.  Probably ABCL-RT
     9
     10(in-package :abcl-asdf-test)
     11
     12(deftest LOG4J.1
     13    (let ((result (abcl-asdf:resolve-dependencies "log4j" "log4j")))
     14      (and result
     15           (format *standard-output* "~&~A~%" result)
     16           (type-p result 'cons)))
     17  t)
     18
     19
     20(deftest ABCL.1
     21    (let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
     22      (and result
     23           (format *standard-output* "~&~A~%" result)
     24           (type-p result 'cons)))
     25  t)
     26
     27
     28
Note: See TracChangeset for help on using the changeset viewer.