Changeset 13795


Ignore:
Timestamp:
01/22/12 08:47:02 (9 years ago)
Author:
Mark Evenson
Message:

Yong patches asdf-jar for MSFT.

See http://article.gmane.org/gmane.lisp.armedbear.devel/2190

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/asdf-jar/asdf-jar.lisp

    r13351 r13795  
    3636            (unbound-slot () "unknown")))
    3737         (package-jar-name
    38           (format nil "~A~A-~A.jar" name (if recursive "-all" "") version))
     38          (format nil "~A~A-~A" name (if recursive "-all" "") version))
    3939         (package-jar
    40           (make-pathname :directory (pathname-directory out) :defaults package-jar-name))
     40          (make-pathname :name package-jar-name
     41                         :type "jar"
     42                         :defaults out))
    4143         (mapping (make-hash-table :test 'equal))
    4244         (dependencies (dependent-systems system)))
     
    5658            (name (slot-value system 'asdf::name))
    5759            (asdf (slot-value system 'asdf::source-file)))
    58         (setf (gethash asdf mapping) (relative-path base name asdf))
     60        (setf (gethash asdf mapping) (archive-relative-path base name asdf))
    5961        (loop :for component :in (all-files system)
    6062           :for source = (slot-value component 'asdf::absolute-pathname)
    61            :for source-entry = (relative-path base name source)
     63           :for source-entry = (archive-relative-path base name source)
    6264           :do (setf (gethash source mapping)
    6365                     source-entry)
     
    9799    (remove-duplicates `(,@dependencies ,@sub-depends))))
    98100
    99 (defun relative-path (base dir file)
     101(defun archive-relative-path (base dir file)
    100102  (let* ((relative
    101103          (nthcdr (length (pathname-directory base)) (pathname-directory file)))
    102          (entry-dir `(:relative ,dir ,@(when relative relative))))
    103     (make-pathname :directory entry-dir
     104         (entry-dir `(:relative ,dir ,@relative)))
     105    (make-pathname :device nil
     106                   :directory entry-dir
    104107                   :defaults file)))
    105108
     
    118121The parameter passed to :USE-JAR-FASLS determines whether to instruct
    119122asdf to use the fasls packaged in the jar.  If this is nil, the fasls
    120 will be compiled with respect to the ususual asdf output translation
     123will be compiled with respect to the usual asdf output translation
    121124conventions."
    122125  (when (not (typep jar 'pathname))
Note: See TracChangeset for help on using the changeset viewer.