Changeset 14504

Timestamp:

05/21/13 12:04:57 (10 years ago)

Author:

Mark Evenson

Message:

Promote ABCL-ASDF:ENSURE-MVN-VERSION as primary API that Maven can be executed.

Returns the found (MAJOR MINOR PATCH) as the second value.

Adding support for test framework (use :RT).

Location:

trunk/abcl/contrib/abcl-asdf

Files:

• abcl-asdf.asd (modified) (4 diffs)
• maven-embedder.lisp (modified) (5 diffs)
• packages.lisp (modified) (2 diffs)
• tests/example.lisp (modified) (3 diffs)
• tests/maven.lisp (modified) (1 diff)
• tests/test.lisp (modified) (1 diff)

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

@@ -3 +3 @@
 (asdf:defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "1.1.0"
-  :description "<> asdf:defsystem <urn:abcl.org/release/1.1.0/contrib/abcl-asdf#1.1.0>"
+  :version "1.2.0"
+  :description "<> asdf:defsystem <urn:abcl.org/release/1.2.0/dev/contrib/abcl-asdf#1.1.0>"
   :depends-on (jss)
   :components 
@@ -21 +21 @@
 (asdf:defsystem :abcl-asdf-test
   :author "Mark Evenson"
-  :depends-on (abcl abcl-test-lisp abcl-asdf)
+  :depends-on (abcl abcl-test-lisp abcl-asdf rt)
   :components ((:module tests :serial t 
                         :components ((:file "example")
@@ -27 +27 @@
                                      (:file "test")))))
 
-#|
-(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf-test))))
+
+(defmethod asdf:perform ((o asdf:test-op) (c (eql (asdf:find-system 'abcl-asdf-test))))
   (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
 
-(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf))))
-  (asdf:load-system :abcl-asdf-test))
+(defmethod asdf:perform ((o asdf:test-op) (c (eql (asdf:find-system 'abcl-asdf))))
+  (asdf:load-system :abcl-asdf-test)
   (asdf:test-system :abcl-asdf-test))
 
  ;;; FIXME
-(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf))))
+#+nil
+(defmethod asdf:perform ((o asdf:test-op) (c (eql (asdf:find-system 'abcl-asdf))))
    "Invoke tests with (asdf:test-system 'abcl-asdf)."
    (asdf:load-system 'abcl)
@@ -42 +43 @@
    (asdf:load-system 'abcl-asdf-test)
    (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
-|#
+

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

@@ -52 +52 @@
 
 Returns the path of the Maven executable or nil if none are found.
+
+Returns the version of Maven found as the second value.
 
 Emits warnings if not able to find a suitable executable."
@@ -67 +69 @@
              (mvn (truename mvn-path)))
         (if mvn
-            (return-from find-mvn mvn)
+            (values (return-from find-mvn mvn)
+                    (ensure-mvn-version))
             (warn "M2_HOME was set to '~A' in the process environment but '~A' doesn't exist." 
                   m2-home mvn-path))))
@@ -75 +78 @@
              (mvn (truename mvn-path)))
         (if mvn
-            (return-from find-mvn mvn)
+            (values (return-from find-mvn mvn)
+                    (ensure-mvn-version))
             (warn "M2 was set to '~A' in the process environment but '~A' doesn't exist." 
                   m2 mvn-path))))
@@ -101 +105 @@
             (when mvn
               (return-from find-mvn mvn)))))))
-  (warn "Unable to locate Maven executable."))
+  (warn "Unable to locate Maven executable to find Maven Aether adaptors."))
 
 (defun find-mvn-libs ()
@@ -143 +147 @@
          (minor (second version))
          (patch (third version)))
-    (or 
-     (and (>= major 3)
-          (>= minor 1))
-     (and (>= major 3)
-          (>= minor 0)
-          (>= patch 3)))))
+    (values
+     (or 
+      (and (>= major 3)
+           (>= minor 1))
+      (and (>= major 3)
+           (>= minor 0)
+           (>= patch 3)))
+     (list major minor patch))))
 
 (defparameter *init* nil)

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

@@ -5 +5 @@
    #:resolve
 
+   #:ensure-mvn-version
+
+;;; Leaning towards deprecation
    #:resolve-dependencies
    #:resolve-artifact
@@ -39 +42 @@
 
 (defpackage #:abcl-asdf-test
-  (:use :cl #+nil :abcl-test-lisp) ;;; FIXME include some sort of test framework
+  (:use :cl :abcl-asdf)
   (:export #:run))

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

@@ -1 @@
-(in-package :cl-user)
+(in-package :abcl-asdf-test)
 
 (defun test-LOG4J.2 ()
@@ -8 +8 @@
   (#"info" (#"getRootLogger" 'log4j.Logger) "Kilroy wuz here."))
 
+(rt:deftest LOG4j.2 
+    (test-LOG4J.2)
+  t)
 
 
@@ -14 +17 @@
 
 
+

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

@@ -10 +10 @@
 (in-package :abcl-asdf-test)
 
-;;;;(deftest LOG4J.1
-(defun test-LOG4J.1 ()
+(rt:deftest LOG4J.1
     (let ((result (abcl-asdf:resolve-dependencies "log4j" "log4j")))
       (and result
            (format *standard-output* "~&~A~%" result)
-           (type-p result 'cons))))
-;;;  t)
+           (type-p result 'cons)))
+  t)
 
 
-;;;;(deftest ABCL.1
-(defun test-ABCL.1 ()
-    (let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
-      (and result
-           (format *standard-output* "~&~A~%" result)
-           (type-p result 'cons))))
-;;;  t)
+(rt: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)
 
 

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

@@ -2 +2 @@
 
 (defun run (&rest args)
-  (abcl-rt:do-test 'test-log4j.2))
+  (abcl-rt:do-tests))
+
+(rt:deftest ABCL-ASDF.MAVEN.1 
+    (multiple-value-list (ensure-mvn-version))
+  (t (3 0 4)))