Changeset 13430 for trunk/abcl/contrib/abcl-asdf/asdf-jar.lisp

Timestamp:

08/01/11 21:34:26 (12 years ago)

Author:

Mark Evenson

Message:

Refactor ASDF extensions from JSS into ABCL-ASDF.

The JAR-FILE, JAR-DIRECTORY, and CLASS-FILE-DIRECTORY ASDF extensions
are now part of the ABCL-ASDF contrib as we aim to centralize all such
things in one place. *ADDED-TO-CLASSPATH* is now part of the
ABCL-ASDF package as well.

There is currently a (mostly) recursive relationship between JSS and
ABCL-ASDF, as each (mostly) requires the other for operation.
JSS:ENSURE-COMPATIBILITY will ensure that JSS continues to understand
the refactored extensions.

File:

• trunk/abcl/contrib/abcl-asdf/asdf-jar.lisp (moved) (moved from trunk/abcl/contrib/jss/asdf-jar.lisp) (4 diffs)

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

@@ +1 @@
+(in-package :abcl-asdf)
+
+(defvar *added-to-classpath* nil)
+
+(defvar *inhibit-add-to-classpath* nil)
+
+(defun add-directory-jars-to-class-path (directory recursive-p)
+  (loop :for jar :in (if recursive-p 
+                         (all-jars-below directory) 
+                         (directory (merge-pathnames "*.jar" directory)))
+     :do (java:add-to-classpath jar)))
+
+(defun all-jars-below (directory) 
+  (loop :with q = (system:list-directory directory) 
+     :while q :for top = (pop q)
+     :if (null (pathname-name top)) 
+       :do (setq q (append q (all-jars-below top))) 
+     :if (equal (pathname-type top) "jar") 
+       :collect top))
+
+(defun need-to-add-directory-jar? (directory recursive-p)
+  (loop :for jar :in (if recursive-p 
+                         (all-jars-below directory)
+                         (directory (merge-pathnames "*.jar" directory)))
+     :doing (if (not (member (namestring (truename jar)) *added-to-classpath* :test 'equal))
+                (return-from need-to-add-directory-jar? t)))
+  nil)
+
 (in-package :asdf)
 
@@ -4 +32 @@
 
 (defmethod perform ((operation compile-op) (c jar-directory))
-  (unless jss:*inhibit-add-to-classpath*
-    (jss:add-directory-jars-to-class-path (truename (component-pathname c)) t)))
+  (unless abcl-asdf:*inhibit-add-to-classpath*
+    (abcl-asdf:add-directory-jars-to-class-path (truename (component-pathname c)) t)))
 
 (defmethod perform ((operation load-op) (c jar-directory))
-  (unless jss:*inhibit-add-to-classpath*
-    (jss:add-directory-jars-to-class-path (truename (component-pathname c)) t)))
+  (unless abcl-asdf:*inhibit-add-to-classpath*
+    (abcl-asdf:add-directory-jars-to-class-path (truename (component-pathname c)) t)))
 
 (defmethod operation-done-p ((operation load-op) (c jar-directory))
-  (or jss:*inhibit-add-to-classpath*
-    (not (jss:need-to-add-directory-jar? (component-pathname c) t))))
+  (or abcl-asdf:*inhibit-add-to-classpath*
+      (not (abcl-asdf:need-to-add-directory-jar? (component-pathname c) t))))
 
 (defmethod operation-done-p ((operation compile-op) (c jar-directory))
@@ -20 +48 @@
 (defclass jar-file (static-file) ())
 
+(defmethod source-file-type ((c jar-file) (s module)) "jar")
+
 (defmethod perform ((operation compile-op) (c jar-file))
-  (jss:add-to-classpath (component-pathname c)))
+  (java:add-to-classpath (component-pathname c)))
 
 (defmethod perform ((operation load-op) (c jar-file))
-  (or jss:*inhibit-add-to-classpath*
-      (jss:add-to-classpath (component-pathname c))))
+  (or abcl-asdf:*inhibit-add-to-classpath*
+      (java:add-to-classpath (component-pathname c))))
 
 (defmethod operation-done-p ((operation load-op) (c jar-file))
-  (or jss:*inhibit-add-to-classpath*
-      (member (namestring (truename (component-pathname c))) jss:*added-to-classpath* :test 'equal)))
+  (or abcl-asdf:*inhibit-add-to-classpath*
+      (member (namestring (truename (component-pathname c)))
+              abcl-asdf:*added-to-classpath* :test 'equal)))
 
 (defmethod operation-done-p ((operation compile-op) (c jar-file))
@@ -37 +68 @@
 
 (defmethod perform ((operation compile-op) (c class-file-directory))
-  (jss:add-to-classpath (component-pathname c)))
+  (java:add-to-classpath (component-pathname c)))
 
 (defmethod perform ((operation load-op) (c class-file-directory))
-  (jss:add-to-classpath (component-pathname c)))
-
-(defmethod source-file-type ((c jar-file) (s module)) "jar")
+  (java:add-to-classpath (component-pathname c)))
 
 
 
 
+