Changeset 15010

Timestamp:

05/22/17 18:01:00 (6 years ago)

Author:

Mark Evenson

Message:

abcl-asdf: preparation to use utility functions from ABCL-BUILD

Import SPLIT-STRING for compatibility to its usage in ABCL-ASDF.

Location:

trunk/abcl

Files:

• contrib/abcl-asdf/abcl-asdf-tests.asd (modified) (2 diffs)
• contrib/abcl-asdf/abcl-asdf.asd (modified) (1 diff)
• contrib/abcl-asdf/abcl-asdf.lisp (modified) (1 diff)
• contrib/abcl-asdf/maven.lisp (moved) (moved from trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp)
• contrib/abcl-asdf/package.lisp (modified) (2 diffs)
• contrib/abcl-asdf/t/log4j.lisp (modified) (2 diffs)
• contrib/abcl-asdf/t/maven.lisp (modified) (1 diff)
• contrib/abcl-asdf/t/resolve.lisp (added)
• t/abcl-asdf.lisp (added)

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

@@ -4 +4 @@
   :author "Mark Evenson"
   :long-description "<urn:abcl.org/release/1.5.0/contrib/abcl-asdf/test#>"
-  :version "1.6.0"
+  :version "2.0.0"
   :defsystem-depends-on (prove-asdf)
   :depends-on (abcl-asdf ;; our dependencies
@@ -15 +15 @@
                         :depends-on (package)
                         :components ((:test-file "log4j")
+                                     (:test-file "resolve")
                                      (:test-file "maven"))))
   :perform (asdf:test-op (op c)

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

@@ -4 +4 @@
   :description "Extensions to ASDF for handling Java binary artifacts."
   :long-description "<urn:abcl.org/release/1.5.0/contrib/abcl-asdf#>"
-  :version "1.6.1"
-  :depends-on (jss)
+  :version "2.0.0"
+  :depends-on (jss abcl-build)
   :components 
-  ((:module package :pathname "" 
+  ((:module package
+            :pathname "" 
             :components ((:file "package")))
-   (:module base :pathname "" 
+   (:module base
+            :pathname "" 
             :components ((:file "abcl-asdf")
-                         (:file "asdf-jar" 
-                                :depends-on ("abcl-asdf"))
-                         (:file "maven-embedder" 
-                                :depends-on ("abcl-asdf" "asdf-jar")))
-            :depends-on (package)))
+                         (:file "asdf-jar" :depends-on ("abcl-asdf")))
+            :depends-on (package))
+   (:module maven
+            :pathname "" 
+            :components ((:file "maven"))
+            :depends-on (base)))
   :in-order-to ((test-op (test-op abcl-asdf-tests))))
 

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

@@ -149 +149 @@
                 (java:jfield "java.io.File" "pathSeparator")))
 
-(defun split-string (string split-char)
-  (loop :for i = 0 :then (1+ j)
-     :as j = (position split-char string :test #'string-equal :start i)
-     :collect (subseq string i j)
-     :while j))

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

@@ -3 +3 @@
 (defpackage abcl-asdf
   (:use cl)
+  (:import-from :abcl/build
+                #:split-string)
   (:export 
 ;;; Public API
@@ -37 +39 @@
 
 
+
+
+
+

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

@@ -1 +1 @@
 (in-package :abcl-asdf/test)
 
-(diag
+(prove:diag
   "Output a message to the Console. 
 
 Note:  for users of SLIME, this will appear in the associated *inferior-lisp* buffer.")
 
-(plan 1)
+(prove:plan 1)
 
 (require :log4j)
@@ -13 +13 @@
  (#"info" (#"getRootLogger" 'log4j.Logger) "Kilroy wuz here."))
 
-(finalize)
+(prove:finalize)
 
 

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

@@ -21 +21 @@
  (abcl-asdf:resolve "org.abcl/abcl"))
 
-(ok 
- (let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
-   (and result
-        (format *standard-output* "~&~A~%" result)
-        (type-p result 'cons))))
-
 (finalize)