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

Import SPLIT-STRING for compatibility to its usage in ABCL-ASDF.
parent f8592464
......@@ -3,7 +3,7 @@
(defsystem abcl-asdf-tests
: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
;; Actual testing framework
......@@ -14,6 +14,7 @@
(:module tests :pathname "t/" :serial t
:depends-on (package)
:components ((:test-file "log4j")
(:test-file "resolve")
(:test-file "maven"))))
:perform (asdf:test-op (op c)
(uiop:symbol-call :prove-asdf 'run-test-system c)))
......
......@@ -3,17 +3,20 @@
:author "Mark Evenson"
: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))))
......@@ -148,8 +148,3 @@ single entry denoting a remote binary artifact."
(split-string classpath
(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))
......@@ -2,6 +2,8 @@
(defpackage abcl-asdf
(:use cl)
(:import-from :abcl/build
#:split-string)
(:export
;;; Public API
#:resolve
......@@ -36,3 +38,7 @@
(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)
(#"configure" 'log4j.BasicConfigurator)
(ok
(#"info" (#"getRootLogger" 'log4j.Logger) "Kilroy wuz here."))
(finalize)
(prove:finalize)
......
......@@ -20,12 +20,6 @@
(ok
(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)
......
(prove:plan 1)
(prove:ok
(let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
(and result
(format *standard-output* "~&~A~%" result)
(type-p result 'cons))))
(prove:finalize)
(eval-when (:load-toplevel :execute)
(require :abcl-contrib)
(require :jss)
(require :abcl-asdf))
(prove:plan 1)
(let (ignorable)
(abcl-asdf:with-aether (ignorable)
(prove:ok
(abcl-asdf:ensure-mvn-version))))
(prove:finalize)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment