Changeset 13807


Ignore:
Timestamp:
01/25/12 13:34:03 (9 years ago)
Author:
Mark Evenson
Message:

Further fix for ABCL-ASDF load time failure.

Start separating out the public api by exporting and documenting symbols.

Location:
trunk/abcl/contrib/abcl-asdf
Files:
3 edited

Legend:

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

    r13806 r13807  
    2121(defsystem :abcl-asdf-test
    2222  :author "Mark Evenson"
    23   :depends-on (abcl abcl-test-lisp)
     23  :depends-on (abcl)
    2424  :components
    2525  ((:module tests :components
     
    2727                   (:file "maven")))))
    2828
     29#+nil FIXME
    2930(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf))))
    3031   "Invoke tests with (asdf:test-system 'abcl-asdf)."
     32   (asdf:load-system 'abcl)
     33   (asdf:load-system 'abcl-test-lisp)
    3134   (asdf:load-system 'abcl-asdf-test)
    3235   (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r13804 r13807  
    1414(resolve-dependencies "org.slf4j" "slf4j-api" "1.6.1")
    1515
    16 (resolve-dependencies "org.apache.maven" "maven-aether-provider" "3.0.3")
     16(resolve-dependencies "org.apache.maven" "maven-aether-provider" "3.0.4")
    1717|#
    1818
     
    2121
    2222(defun find-mvn ()
     23  "Attempt to find a suitable Maven ('mvn') executable on the hosting operating system."
    2324  (dolist (mvn-path *mavens*)
    2425    (let ((mvn
     
    7677
    7778(defun init ()
     79  "Run the initialization strategy to bootstrap a Maven dependency node."
    7880  (unless *mvn-libs-directory*
    7981    (setf *mvn-libs-directory* (find-mvn-libs)))
    8082  (unless (probe-file *mvn-libs-directory*)
    81     (error "You must download maven-3.0.3 from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
     83    (error "You must download maven-3.0.3 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
    8284  (unless (ensure-mvn-version)
    8385    (error "We need maven-3.0.3 or later."))
     
    8688
    8789(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  `("org.apache.maven.wagon.providers.http.HttpWagon" ;; introduced as default with maven-3.0.4
     91    "org.apache.maven.wagon.providers.http.LightweightHttpWagon")
     92  "A list of possible candidate implementations that provide access to http and https resources.
     93
     94Supposedly configurable with the java.net.protocols (c.f. reference maso2000 in the Manual.")
    9095
    9196(defun make-wagon-provider ()
     97  "Returns an implementation of the org.sonatype.aether.connector.wagon.WagonProvider contract.
     98
     99The implementation is specified as Lisp closures.  Currently, it only
     100specializes the lookup() method if passed an 'http' role hint."
    92101  (unless *init* (init))
    93102  (java:jinterface-implementation
     
    138147
    139148(defun resolve-artifact (group-id artifact-id &optional (version "LATEST" versionp))
    140   "Dynamically resolve Maven dependencies for item with GROUP-ID and ARTIFACT-ID at VERSION.
     149  "Directly resolve Maven dependencies for item with GROUP-ID and ARTIFACT-ID at VERSION, ignoring dependencies.
    141150
    142151Declared dependencies are not attempted to be located.
  • trunk/abcl/contrib/abcl-asdf/packages.lisp

    r13806 r13807  
    55   #:resolve-dependencies
    66
     7   #:find-mvn
     8
     9   #:*mvn-directory*
     10
     11   #:init
     12
    713;;; "Internal" API
     14
     15;;;; Maven
     16   #:*mvn-libs-directory*
     17
    818   #:satisfy
    919   #:as-classpath
     
    1828
    1929(defpackage #:abcl-asdf-test
    20   (:use :cl :abcl-rt)
     30  (:use :cl #+nil :abcl-test-lisp) ;;; FIXME
    2131  (:export #:run))
Note: See TracChangeset for help on using the changeset viewer.