From mevenson at common-lisp.net Tue Aug 5 17:49:43 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Tue, 05 Aug 2014 17:49:43 -0000 Subject: [Armedbear-cvs] r14716 - trunk/abcl/src/org/armedbear/lisp Message-ID: <20140805174943.17642.35815@lisp.not.org> Author: mevenson Date: Tue Aug 5 17:49:43 2014 New Revision: 14716 Log: asdf: bless as 3.1.3. Should not have functionally changed. Modified: trunk/abcl/src/org/armedbear/lisp/asdf.lisp Modified: trunk/abcl/src/org/armedbear/lisp/asdf.lisp ============================================================================== --- trunk/abcl/src/org/armedbear/lisp/asdf.lisp Tue Jul 29 22:55:15 2014 (r14715) +++ trunk/abcl/src/org/armedbear/lisp/asdf.lisp Tue Aug 5 17:49:43 2014 (r14716) @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*- -;;; This is ASDF 3.1.2.9: Another System Definition Facility. +;;; This is ASDF 3.1.3: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to . @@ -6658,7 +6658,7 @@ ;; "3.4.5.67" would be a development version in the official branch, on top of 3.4.5. ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67 - (asdf-version "3.1.2.9") + (asdf-version "3.1.3") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) From mevenson at common-lisp.net Sun Aug 17 17:55:44 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Sun, 17 Aug 2014 17:55:44 -0000 Subject: [Armedbear-cvs] r14717 - trunk/abcl/contrib/asdf-jar Message-ID: <20140817175544.30608.28995@lisp.not.org> Author: mevenson Date: Sun Aug 17 17:55:43 2014 New Revision: 14717 Log: Fix #364: ASDF-JAR:PACKAGE breaks with simple usage. Thanks to Eduardo Bellani. Modified: trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Modified: trunk/abcl/contrib/asdf-jar/asdf-jar.lisp ============================================================================== --- trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Tue Aug 5 17:49:43 2014 (r14716) +++ trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Sun Aug 17 17:55:43 2014 (r14717) @@ -13,6 +13,59 @@ (defvar *debug* nil) +(defun add-system-files-to-mapping! (system + mapping + system-base + system-name + &optional root verbose) + "Auxiliary procedure that adds all the files of a SYSTEM to the +MAPPING with a given SYSTEM-BASE and SYSTEM-NAME. The whole idea of +this procedure is to modify MAPPING, so a NIL is returned." + (let ((abcl-file-type "abcl")) + (loop :for component :in (all-files system) + :for source = (slot-value component 'asdf::absolute-pathname) + :for source-entry = (archive-relative-path system-base system-name source) + :do (setf (gethash source mapping) + (if root + (merge-pathnames source-entry (make-pathname :directory root)) + source-entry)) + :do (format verbose "~&~A~& => ~A" source source-entry) + :when (and (typep component 'asdf::source-file) + (not (typep component 'asdf::static-file))) + :do (let ((output + (make-pathname + :defaults (asdf:apply-output-translations source) + :type abcl-file-type)) + (output-entry + (make-pathname :defaults source-entry + :type abcl-file-type + :directory + (append root + (cadr (pathname-directory source-entry)))))) + (format verbose "~&~A~& => ~A" output output-entry) + (setf (gethash output mapping) + output-entry))))) + +(defun systems->hash-table (systems &optional root verbose) + "Auxiliary function that, given a list of SYSTEMS, builds a hash +table mapping absolute file names to of these systems into relative +path names. This mapping will be used to zip the files of the system +into a JAR file." + (let ((mapping (make-hash-table :test 'equal))) + (dolist (system systems) + (let ((base (slot-value system 'asdf::absolute-pathname)) + (name (slot-value system 'asdf::name)) + (asdf (slot-value system 'asdf::source-file))) + (setf (gethash asdf mapping) + (let ((relative-path (archive-relative-path base name asdf))) + (if root + (merge-pathnames + relative-path + (make-pathname :directory root)) + relative-path))) + (add-system-files-to-mapping! system mapping base name root verbose))) + mapping)) + (defun package (system &key (out #p"/var/tmp/") (recursive t) ; whether to package dependencies @@ -28,6 +81,14 @@ If FORCE is true, force asdf to recompile all the necessary fasls. +VERBOSE controls how many messages will be logged to +*standard-output*. + +ROOT controls if the relative pathnames will be appended to something +before being added to the mapping. The purpose of having this option +is to add the paths to an internal directory, such as (list :relative +\"META-INF\" \"resources\") for generating WAR files. + Returns the pathname of the packaged jar archive. " (when (not (typep system 'asdf:system)) @@ -38,15 +99,14 @@ (when v v))) (package-jar-name - (format nil "~A~A~A" name (if recursive "-all" "") (if version - (format nil "-~A" version) - ""))) + (format nil "~A~A~A" name (if recursive "-all" "") + (if version + (format nil "-~A" version) + ""))) (package-jar (make-pathname :name package-jar-name :type "jar" - :defaults out)) - (mapping (make-hash-table :test 'equal)) - (dependencies (dependent-systems system))) + :defaults out))) (when verbose (format verbose "~&Packaging ASDF definition of ~A" system)) (when (and verbose force) @@ -54,46 +114,18 @@ (asdf:compile-system system :force force) (when verbose (format verbose "~&Packaging contents in ~A" package-jar)) - (when (and verbose recursive dependencies) - (format verbose "~& with recursive dependencies~{ ~A~^, ~}." dependencies)) - (dolist (system (append (list system) - (when recursive - (mapcar #'asdf:find-system dependencies)))) - (let ((base (slot-value system 'asdf::absolute-pathname)) - (name (slot-value system 'asdf::name)) - (asdf (slot-value system 'asdf::source-file))) - (setf (gethash asdf mapping) (let ((relative-path (archive-relative-path - base name asdf))) - (if root - (merge-pathnames - relative-path - (make-pathname :directory root)) - relative-path))) - (loop :for component :in (all-files system) - :for source = (slot-value component 'asdf::absolute-pathname) - :for source-entry = (archive-relative-path base name source) - :do (setf (gethash source mapping) - (if root - (merge-pathnames source-entry (make-pathname :directory root)) - source-entry)) - :do (when *debug* - (format verbose "~&~A~& => ~A" source source-entry)) - :when (and (typep component 'asdf::source-file) - (not (typep component 'asdf::static-file))) - :do (let ((output - (make-pathname - :defaults (asdf:apply-output-translations source) - :type "abcl")) - (output-entry - (make-pathname :defaults source-entry - :type "abcl" - :directory (append root - (rest (pathname-directory source-entry)))))) - (when *debug* - (format verbose "~&~A~& => ~A" output output-entry)) - (setf (gethash output mapping) - output-entry))))) - (system:zip package-jar mapping))) + (system:zip package-jar + (systems->hash-table + (append (list system) + (when recursive + (let ((dependencies (dependent-systems system))) + (when (and verbose dependencies) + (format verbose + "~& with recursive dependencies~{ ~A~^, ~}." + dependencies) + (mapcar #'asdf:find-system dependencies))))) + root + verbose)))) (defun all-files (component) (loop :for c From mevenson at common-lisp.net Sun Aug 17 18:04:53 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Sun, 17 Aug 2014 18:04:53 -0000 Subject: [Armedbear-cvs] r14718 - trunk/abcl/contrib/jss Message-ID: <20140817180453.30845.45251@lisp.not.org> Author: mevenson Date: Sun Aug 17 18:04:52 2014 New Revision: 14718 Log: Extend JSS fix for GET-JAVA-FIELD to SET-JAVA-FIELD. Thanks to Robert Goldman. Modified: trunk/abcl/contrib/jss/invoke.lisp Modified: trunk/abcl/contrib/jss/invoke.lisp ============================================================================== --- trunk/abcl/contrib/jss/invoke.lisp Sun Aug 17 17:55:43 2014 (r14717) +++ trunk/abcl/contrib/jss/invoke.lisp Sun Aug 17 18:04:52 2014 (r14718) @@ -314,6 +314,18 @@ (defvar *running-in-osgi* (ignore-errors (jclass "org.osgi.framework.BundleActivator"))) +(define-condition no-such-java-field (error) + ((field-name + :initarg :field-name + :reader field-name + ) + (object + :initarg :object + :reader object + )) + (:report (lambda (c stream) + (error 'no-such-java-field :field-name field :object object)))) + (defun get-java-field (object field &optional (try-harder *running-in-osgi*)) "Get the value of the FIELD contained in OBJECT. If OBJECT is a symbol it names a dot qualified static FIELD." @@ -367,7 +379,8 @@ (jobject-class object)))) (jfield (if (java-object-p field) field - (find field (#"getDeclaredFields" class) :key 'jfield-name :test 'equal)))) + (or (find-declared-field field class) ++ (error 'no-such-java-field :field-name field :object object))))) (#"setAccessible" jfield +true+) (values (#"set" jfield object value) jfield)) (if (symbolp object) @@ -377,6 +390,9 @@ (setf (jfield (jclass-of object) field) value) (setf (jfield object field) value))))) +(defun (setf get-java-field) (value object field &optional (try-harder *running-in-osgi*)) + (set-java-field object field value try-harder)) + (defconstant +for-name+ (jmethod "java.lang.Class" "forName" "java.lang.String" "boolean" "java.lang.ClassLoader")) From mevenson at common-lisp.net Sun Aug 17 18:30:33 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Sun, 17 Aug 2014 18:30:33 -0000 Subject: [Armedbear-cvs] r14719 - trunk/abcl/contrib/jss Message-ID: <20140817183033.31314.11972@lisp.not.org> Author: mevenson Date: Sun Aug 17 18:30:33 2014 New Revision: 14719 Log: jss/3.0.9: Fix typo. Modified: trunk/abcl/contrib/jss/invoke.lisp trunk/abcl/contrib/jss/jss.asd Modified: trunk/abcl/contrib/jss/invoke.lisp ============================================================================== --- trunk/abcl/contrib/jss/invoke.lisp Sun Aug 17 18:04:52 2014 (r14718) +++ trunk/abcl/contrib/jss/invoke.lisp Sun Aug 17 18:30:33 2014 (r14719) @@ -380,7 +380,7 @@ (jfield (if (java-object-p field) field (or (find-declared-field field class) -+ (error 'no-such-java-field :field-name field :object object))))) + (error 'no-such-java-field :field-name field :object object))))) (#"setAccessible" jfield +true+) (values (#"set" jfield object value) jfield)) (if (symbolp object) Modified: trunk/abcl/contrib/jss/jss.asd ============================================================================== --- trunk/abcl/contrib/jss/jss.asd Sun Aug 17 18:04:52 2014 (r14718) +++ trunk/abcl/contrib/jss/jss.asd Sun Aug 17 18:30:33 2014 (r14719) @@ -2,7 +2,7 @@ (asdf:defsystem :jss :author "Alan Ruttenberg, Mark Evenson" :version "3.0.8" - :description "<> asdf:defsystem asdf:defsystem " :components ((:module base :pathname "" :serial t :components ((:file "packages") From mevenson at common-lisp.net Sun Aug 17 19:32:06 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Sun, 17 Aug 2014 19:32:06 -0000 Subject: [Armedbear-cvs] r14720 - trunk/abcl/contrib/asdf-jar Message-ID: <20140817193206.32350.42667@lisp.not.org> Author: mevenson Date: Sun Aug 17 19:32:05 2014 New Revision: 14720 Log: asdf-jar: Stablize recent fixes across more cases. (Eduardo Bellani) Modified: trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Modified: trunk/abcl/contrib/asdf-jar/asdf-jar.lisp ============================================================================== --- trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Sun Aug 17 18:30:33 2014 (r14719) +++ trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Sun Aug 17 19:32:05 2014 (r14720) @@ -66,12 +66,65 @@ (add-system-files-to-mapping! system mapping base name root verbose))) mapping)) +(defun add-system-files-to-mapping! (system + mapping + system-base + system-name + &optional root verbose) + "Auxiliary procedure that adds all the files of a SYSTEM to the +MAPPING with a given SYSTEM-BASE and SYSTEM-NAME. The whole idea of +this procedure is to modify MAPPING, so a NIL is returned." + (let ((abcl-file-type "abcl")) + (loop :for component :in (all-files system) + :for source = (slot-value component 'asdf::absolute-pathname) + :for source-entry = (archive-relative-path system-base system-name source) + :do (setf (gethash source mapping) + (if root + (merge-pathnames source-entry (make-pathname :directory root)) + source-entry)) + :do (format verbose "~&~A~& => ~A" source source-entry) + :when (and (typep component 'asdf::source-file) + (not (typep component 'asdf::static-file))) + :do (let ((output + (make-pathname + :defaults (asdf:apply-output-translations source) + :type abcl-file-type)) + (output-entry + (make-pathname :defaults source-entry + :type abcl-file-type + :directory + (append root + (cadr (pathname-directory source-entry)))))) + (format verbose "~&~A~& => ~A" output output-entry) + (setf (gethash output mapping) + output-entry))))) + +(defun systems->hash-table (systems &optional root verbose) + "Auxiliary function that, given a list of SYSTEMS, builds a hash +table mapping absolute file names to of these systems into relative +path names. This mapping will be used to zip the files of the system +into a JAR file." + (let ((mapping (make-hash-table :test 'equal))) + (dolist (system systems) + (let ((base (slot-value system 'asdf::absolute-pathname)) + (name (slot-value system 'asdf::name)) + (asdf (slot-value system 'asdf::source-file))) + (setf (gethash asdf mapping) + (let ((relative-path (archive-relative-path base name asdf))) + (if root + (merge-pathnames + relative-path + (make-pathname :directory root)) + relative-path))) + (add-system-files-to-mapping! system mapping base name root verbose))) + mapping)) + (defun package (system &key (out #p"/var/tmp/") (recursive t) ; whether to package dependencies (force nil) ; whether to force ASDF compilation - (root nil) - (verbose t)) + (root '(:relative)) + (verbose nil)) "Compile and package the asdf SYSTEM in a jar. When RECURSIVE is true (the default), recursively add all asdf @@ -89,6 +142,14 @@ is to add the paths to an internal directory, such as (list :relative \"META-INF\" \"resources\") for generating WAR files. +VERBOSE controls how many messages will be logged to +*standard-output*. + +ROOT controls if the relative pathnames will be appended to something +before being added to the mapping. The purpose of having this option +is to add the paths to an internal directory, such as (list :relative +\"META-INF\" \"resources\") for generating WAR files. + Returns the pathname of the packaged jar archive. " (when (not (typep system 'asdf:system)) @@ -99,10 +160,10 @@ (when v v))) (package-jar-name - (format nil "~A~A~A" name (if recursive "-all" "") - (if version - (format nil "-~A" version) - ""))) + (format nil "~A~A~A" name (if recursive "-all" "") + (if version + (format nil "-~A" version) + ""))) (package-jar (make-pathname :name package-jar-name :type "jar" @@ -114,18 +175,18 @@ (asdf:compile-system system :force force) (when verbose (format verbose "~&Packaging contents in ~A" package-jar)) - (system:zip package-jar - (systems->hash-table - (append (list system) - (when recursive - (let ((dependencies (dependent-systems system))) - (when (and verbose dependencies) - (format verbose - "~& with recursive dependencies~{ ~A~^, ~}." - dependencies) - (mapcar #'asdf:find-system dependencies))))) - root - verbose)))) + (system:zip package-jar + (systems->hash-table + (append (list system) + (when recursive + (let ((dependencies (dependent-systems system))) + (when (and verbose dependencies) + (format verbose + "~& with recursive dependencies~{ ~A~^, ~}." + dependencies) + (mapcar #'asdf:find-system dependencies))))) + root + verbose)))) (defun all-files (component) (loop :for c From mevenson at common-lisp.net Sun Aug 17 19:38:09 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Sun, 17 Aug 2014 19:38:09 -0000 Subject: [Armedbear-cvs] r14721 - in trunk/abcl: . src/org/armedbear/lisp test/lisp/abcl Message-ID: <20140817193809.32567.74037@lisp.not.org> Author: mevenson Date: Sun Aug 17 19:38:08 2014 New Revision: 14721 Log: Intermediary JNEW-RUNTIME-CLASS work: start adding failing tests. Run the failing tests via CL-USER> (asdf:load-system :abcl) (asdf:test-system :abcl-test-lisp) c.f. and . Start editing documentation for JNEW-RUNTIME-CLASS. Add failing tests for cases that should work, indicating that we have basic problems with the code at this point. Added: trunk/abcl/test/lisp/abcl/runtime-class.lisp Modified: trunk/abcl/abcl.asd trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp Modified: trunk/abcl/abcl.asd ============================================================================== --- trunk/abcl/abcl.asd Sun Aug 17 19:32:05 2014 (r14720) +++ trunk/abcl/abcl.asd Sun Aug 17 19:38:08 2014 (r14721) @@ -65,6 +65,8 @@ (:file "pathname-tests" :depends-on ("utilities")) #+abcl + (:file "runtime-class") + #+abcl (:file "package-local-nicknames-tests"))))) (defmethod perform ((o test-op) (c (eql (find-system 'abcl-test-lisp)))) Modified: trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp ============================================================================== --- trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp Sun Aug 17 19:32:05 2014 (r14720) +++ trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp Sun Aug 17 19:38:08 2014 (r14721) @@ -28,10 +28,20 @@ be called with the second and first arguments. Method definitions are lists of the form - (method-name return-type argument-types function &key modifiers annotations) - where method-name is a string, return-type and argument-types are strings or keywords for - primitive types (:void, :int, etc.), and function is a Lisp function of minimum arity - (1+ (length argument-types)); the instance (`this') is passed in as the first argument. + + (METHOD-NAME RETURN-TYPE ARGUMENT-TYPES FUNCTION &key MODIFIERS ANNOTATIONS) + + where + METHOD-NAME is a string + RETURN-TYPE denotes the type of the object returned by the method + ARGUMENT-TYPES is a list of parameters to the method + + The types are either strings naming fully qualified java classes or Lisp keywords referring to + primitive types (:void, :int, etc.). + + FUNCTION is a Lisp function of minimum arity (1+ (length + argument-types)). The instance (`this') is passed as the first + argument. Field definitions are lists of the form (field-name type &key modifiers annotations)." (declare (ignorable superclass interfaces constructors methods fields access-flags annotations)) @@ -73,8 +83,10 @@ (write-class-file class-file stream) (finish-output stream) #+test-record-generated-class-file - (with-open-file (f (format nil "~A.class" class-name) :direction :output :element-type '(signed-byte 8)) - (write-sequence (java::list-from-jarray (sys::%get-output-stream-bytes stream)) f)) + (let ((filename (merge-pathnames (format nil "~A.class" class-name)))) + (with-open-file (f filename :direction :output :element-type '(signed-byte 8)) + (write-sequence (java::list-from-jarray (sys::%get-output-stream-bytes stream)) f)) + (format *standard-output* "~&Wrote class file ~A.~%" filename)) (values class-file method-implementation-fields))) (defun java::make-accessor-name (prefix name) Added: trunk/abcl/test/lisp/abcl/runtime-class.lisp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/abcl/test/lisp/abcl/runtime-class.lisp Sun Aug 17 19:38:08 2014 (r14721) @@ -0,0 +1,70 @@ +(in-package :abcl.test.lisp) + + +;; method with no arguments +(deftest runtime-class.1 + (java:jnew-runtime-class + "Actor" + :fields `(("name" "java.lang.String")) + :methods `(("getName" "java.lang.String" nil + (lambda (this) + (java:jfield this "name"))))) + t) + +;; method with primitive type +(deftest runtime-class.2 + (java:jnew-runtime-class + "Actor" + :fields `(("name" "java.lang.String")) + :methods `(("getName" "java.lang.String" (:int) + (lambda (this) + (java:jfield this "name"))))) + t) + +;; inheritance of type + +(deftest runtime-class.3 + (progn + (java:jnew-runtime-class + "foo.Actor" + :fields `(("name" "java.lang.String"))) + (java:jnew-runtime-class + "foo.StageActor" + :superclass "foo.Actor" + :fields (list '("givenName" "java.lang.String")))) + t) + + +#| +// Simple constructor test +public class Actor { + String name; + + public Actor(String name) { + this.name = name; + } + + public String getName() { + return name; + } + +} +|# + +;; constructor +(deftest runtime-class.4 + (java:jnew-runtime-class + "Actor" + :constructors `(("java.lang.String") + (lambda (name) + (setf (jfield this "name") + name))) + :methods `(("getName" "java.lang.String" ("java.lang.String") ;; no-arg methods not working + (lambda (this dummy) + (declare (ignore dummy)) + (java:jfield this "name")))) + :fields `(("name" "java.lang.String"))) + t) + + + From mevenson at common-lisp.net Tue Aug 19 05:22:18 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Tue, 19 Aug 2014 05:22:18 -0000 Subject: [Armedbear-cvs] r14722 - trunk/abcl/contrib/asdf-jar Message-ID: <20140819052218.10528.55687@lisp.not.org> Author: mevenson Date: Tue Aug 19 05:22:17 2014 New Revision: 14722 Log: asdf-jar: bump version to 0.3.1. Edit docstrings. Modified: trunk/abcl/contrib/asdf-jar/asdf-jar.asd trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Modified: trunk/abcl/contrib/asdf-jar/asdf-jar.asd ============================================================================== --- trunk/abcl/contrib/asdf-jar/asdf-jar.asd Sun Aug 17 19:38:08 2014 (r14721) +++ trunk/abcl/contrib/asdf-jar/asdf-jar.asd Tue Aug 19 05:22:17 2014 (r14722) @@ -3,8 +3,8 @@ (defsystem :asdf-jar :author "Mark Evenson" - :version "0.3.0" - :description "<> asdf:defsystem " + :version "0.3.1" + :description "<> asdf:defsystem " :components ((:module base :pathname "" :components ((:file "asdf-jar") Modified: trunk/abcl/contrib/asdf-jar/asdf-jar.lisp ============================================================================== --- trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Sun Aug 17 19:38:08 2014 (r14721) +++ trunk/abcl/contrib/asdf-jar/asdf-jar.lisp Tue Aug 19 05:22:17 2014 (r14722) @@ -132,18 +132,12 @@ Place the resulting packaged jar in the OUT directory. -If FORCE is true, force asdf to recompile all the necessary fasls. +If FORCE is true, force asdf to recompile all the necessary fasls for +inclusion in the packaging artifact. -VERBOSE controls how many messages will be logged to -*standard-output*. - -ROOT controls if the relative pathnames will be appended to something -before being added to the mapping. The purpose of having this option -is to add the paths to an internal directory, such as (list :relative -\"META-INF\" \"resources\") for generating WAR files. - -VERBOSE controls how many messages will be logged to -*standard-output*. +VERBOSE designates the stream to which information messages about the +packaging process will be logged, or nil if one wishes to muffle +output. ROOT controls if the relative pathnames will be appended to something before being added to the mapping. The purpose of having this option From mevenson at common-lisp.net Tue Aug 19 11:20:52 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Tue, 19 Aug 2014 11:20:52 -0000 Subject: [Armedbear-cvs] r14723 - trunk/abcl/contrib/abcl-asdf Message-ID: <20140819112052.19438.69798@lisp.not.org> Author: mevenson Date: Tue Aug 19 11:20:51 2014 New Revision: 14723 Log: abcl-asdf: Find maven installed via FreeBSD ports system. Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp ============================================================================== --- trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp Tue Aug 19 05:22:17 2014 (r14722) +++ trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp Tue Aug 19 11:20:51 2014 (r14723) @@ -115,6 +115,7 @@ (truename d))) (list (make-pathname :defaults (merge-pathnames "../lib/" (find-mvn)) :name nil :type nil) + #p"/usr/local/share/java/maven3/lib/" ;; FreeBSD ports #p"/usr/local/maven/lib/"))) ;; OpenBSD location suggested by Timo Myyr? (defparameter *mvn-libs-directory* From mevenson at common-lisp.net Tue Aug 19 12:13:21 2014 From: mevenson at common-lisp.net (mevenson at common-lisp.net) Date: Tue, 19 Aug 2014 12:13:21 -0000 Subject: [Armedbear-cvs] r14724 - trunk/abcl/contrib/abcl-asdf Message-ID: <20140819121321.20998.1352@lisp.not.org> Author: mevenson Date: Tue Aug 19 12:13:20 2014 New Revision: 14724 Log: abcl-asdf: correct comment to note the correction to *MVN-LIBS-DIRECTORY*. Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd ============================================================================== --- trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd Tue Aug 19 11:20:51 2014 (r14723) +++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd Tue Aug 19 12:13:20 2014 (r14724) @@ -2,8 +2,8 @@ (asdf:defsystem :abcl-asdf :author "Mark Evenson" - :version "1.3.1" - :description "<> asdf:defsystem " + :version "1.3.2" + :description "<> asdf:defsystem " :depends-on (jss) :components ((:module packages :pathname "" Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp ============================================================================== --- trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp Tue Aug 19 11:20:51 2014 (r14723) +++ trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp Tue Aug 19 12:13:20 2014 (r14724) @@ -170,9 +170,9 @@ (setf *mvn-libs-directory* (find-mvn-libs))) (unless (and *mvn-libs-directory* (probe-file *mvn-libs-directory*)) - (error "Please obtain and install maven-3.0.4 locally from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately.")) + (error "Please obtain and install maven-3.0.4 or lates locally from , then set ABCL-ASDF:*MVN-LIBS-DIRECTORY* to the directory containing maven-core-3.*.jar et. al.")) (unless (ensure-mvn-version) - (error "We need maven-3.0.3 or later.")) (add-directory-jars-to-class-path *mvn-libs-directory* nil) + (error "We need maven-3.0.4 or later.")) (add-directory-jars-to-class-path *mvn-libs-directory* nil) (setf *init* t)) (defun find-http-wagon ()