Changeset 13350

Timestamp:

06/20/11 14:37:10 (12 years ago)

Author:

Mark Evenson

Message:

Document the use of the ASDF-JAR contrib.

ASDF:ADD-TO-ASDF provides a mechanism to add the contents of a
pathname specifying an jar package to be subequently loaded by ASDF.

Generalize mechanism to specifiy contrib contents while including
"README.markdown" files.

Location:

trunk/abcl

Files:

• build.xml (modified) (3 diffs)
• contrib/asdf-jar/README.markdown (added)
• contrib/asdf-jar/asdf-jar.asd (modified) (1 diff)
• contrib/asdf-jar/asdf-jar.lisp (modified) (4 diffs)

trunk/abcl/build.xml

@@ -470 +470 @@
     </target>
 
+    <patternset id="abcl.contrib.source">
+          <include name="**/*.asd"/>
+          <include name="**/*.lisp"/>
+          <include name="**/README.markdown"/>
+    </patternset>
+
     <property name="abcl-contrib.jar"
               value="${dist.dir}/abcl-contrib.jar"/>
@@ -475 +481 @@
       <uptodate targetfile="${abcl-contrib.jar}">
         <srcfiles dir="contrib">
-          <include name="**/*.asd"/>
-          <include name="**/*.lisp"/>
+          <patternset refid="abcl.contrib.source"/>
         </srcfiles>
       </uptodate>
@@ -485 +490 @@
            compress="true"
            basedir="contrib">
-        <patternset>
-          <include name="**/*.asd"/>
-          <include name="**/*.lisp"/>
-        </patternset>
+        <patternset refid="abcl.contrib.source"/>
       </jar>
       <echo>

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

@@ -7 +7 @@
   :components 
   ((:module base :pathname "" :components
-      ((:file "asdf-jar")))))
+      ((:file "asdf-jar")
+             (:static-file "README.markdown))))

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

@@ +1 @@
+;;; This file is part of ABCL contrib
+;;;
+;;; Copyright 2011 Mark <evenson@panix.com>
+
 (defpackage #:asdf-jar
   (:use :cl)
-  (:export #:package))
+  (:export #:package 
+           #:add-to-asdf))
 
 (in-package :asdf-jar)
@@ -10 +15 @@
                 &key (out #p"/var/tmp/") 
                      (recursive t)          ; whether to package dependencies
-                     (force nil)              ; whether to force ASDF compilation
+                     (force nil)             ; whether to force ASDF compilation
                      (verbose t))
 "Compile and package the asdf SYSTEM-NAME in a jar.
@@ -17 +22 @@
 dependencies into the same jar.
 
-Place the resulting packaging in the OUT directory.
+Place the resulting packaged jar in the OUT directory.
 
-Returns the pathname of the created jar archive.
+If FORCE is true, force asdf to recompile all the necessary fasls.
+
+Returns the pathname of the packaged jar archive.
 "
   (let* ((system 
@@ -107 +114 @@
                        (list name)))))
 
+(defun add-to-asdf (jar &key (use-jar-fasls t))
+  "Make a given JAR output by the package mechanism loadable by asdf.
+
+The parameter passed to :USE-JAR-FASLS determines whether to instruct
+asdf to use the fasls packaged in the jar.  If this is nil, the fasls
+will be compiled with respect to the ususual asdf output translation
+conventions."
+  (when (not (typep jar 'pathname))
+    (setf jar (pathname jar)))
+  (when (null (pathname-device jar))
+    (setf jar (make-pathname :device (list jar))))
+
+  ;;; Inform ASDF of all the system definitions in the jar
+  (loop :for asd 
+     :in (directory (merge-pathnames "*/*.asd" jar))
+     :do (pushnew (make-pathname :defaults asd
+                                 :name nil :type nil)
+                  asdf:*central-registry*))
+
+  ;;; Load the FASLs directly from the jar
+  (when use-jar-fasls                    
+    (asdf:initialize-output-translations
+     `(:output-translations (,(merge-pathnames "/**/*.*" jar)) 
+                            :inherit-configuration))))