Commit 6038e089 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.015.4: fixes for ECL and RMCL.

Thanks to Terje Norderhaug and binghe for the MCL patch.
parent a0c70698
Loading
Loading
Loading
Loading
+6 −8
Original line number Diff line number Diff line
;;; Copyright (c) 2005, Michael Goffioul (michael dot goffioul at swing dot be)
;;; Copyright (c) 2005-2011 Michael Goffioul (michael dot goffioul at swing dot be)
;;;
;;;   This program is free software; you can redistribute it and/or
;;;   modify it under the terms of the GNU Library General Public
@@ -345,12 +345,10 @@
  ())

(defun binary-op-dependencies (o s)
  (let (lib-op fasl-op)
  (multiple-value-bind (lib-op fasl-op)
      (if (bundle-op-monolithic-p o)
        (setf lib-op 'monolithic-lib-op
              fasl-op 'monolithic-fasl-op)
        (setf lib-op 'lib-op
              fasl-op 'fasl-op))
          (values 'monolithic-lib-op 'monolithic-fasl-op)
          (values 'lib-op 'fasl-op))
    (list (list (make-instance lib-op :args (bundle-op-build-args o))
                s)
          (list (make-instance fasl-op :args (bundle-op-build-args o))
@@ -405,7 +403,7 @@
(push '("fasb" . si::load-binary) si::*load-hooks*)

(defun register-pre-built-system (name)
  (register-system name (make-instance 'system :name name :source-file nil)))
  (register-system (make-instance 'system :name name :source-file nil)))

(setf si::*module-provider-functions*
      (loop :for f :in si::*module-provider-functions*
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
  :licence "MIT"
  :description "Another System Definition Facility"
  :long-description "ASDF builds Common Lisp software organized into defined systems."
  :version "2.015.3" ;; to be automatically updated by bin/bump-revision
  :version "2.015.4" ;; to be automatically updated by bin/bump-revision
  :depends-on ()
  :components
  ((:file "asdf")
+14 −3
Original line number Diff line number Diff line
;;; -*- mode: common-lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.015.3: Another System Definition Facility.
;;; This is ASDF 2.015.4: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
@@ -104,7 +104,7 @@
         ;; "2.345.6" would be a development version in the official upstream
         ;; "2.345.0.7" would be your seventh local modification of official release 2.345
         ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
         (asdf-version "2.015.3")
         (asdf-version "2.015.4")
         (existing-asdf (fboundp 'find-system))
         (existing-version *asdf-version*)
         (already-there (equal asdf-version existing-version)))
@@ -2950,8 +2950,19 @@ located."
  #+asdf-unix #\:
  #-asdf-unix #\;)

;; Note: ASDF may expect user-homedir-pathname to provide the pathname of
;; the current user's home directory, while MCL by default provides the
;; directory from which MCL was started.
;; See http://code.google.com/p/mcl/wiki/Portability
#.(or #+mcl ;; the #$ doesn't work on other implementations, even inside #+mcl
      `(defun current-user-homedir-pathname ()
         ,(read-from-string "(ccl::findfolder #$kuserdomain #$kCurrentUserFolderType))")))

(defun* user-homedir ()
  (truenamize (pathname-directory-pathname (user-homedir-pathname))))
  (truenamize
   (pathname-directory-pathname
    #+mcl (current-user-homedir-pathname)
    #-mcl (user-homedir-pathname))))

(defun* try-directory-subpath (x sub &key type)
  (let* ((p (and x (ensure-directory-pathname x)))