From 2eeef9dda5edfe398ebf5583e2f9e131d2dea234 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Sun, 9 Oct 2011 14:11:05 -0400
Subject: [PATCH] 2.017.10: merge with ECL's version of ASDF.

---
 Makefile      |  6 +++---
 asdf-ecl.lisp | 12 ++++++++----
 asdf.asd      |  2 +-
 asdf.lisp     | 12 +++++-------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index c7f6d2b8..cb8e7a95 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,9 @@ clnet_home      := "/project/asdf/public_html/"
 sourceDirectory := $(shell pwd)
 
 lisps ?= ccl clisp sbcl ecl cmucl abcl scl allegro
-## occasionally tested by not me: allegromodern lispworks xcl
-## FAIL: gclcvs (COMPILER BUGS!!!)
-## tentatively supported by asdf, not supported by our tests: ecl-bytecmp cormancl mcl genera
+## occasionally tested by not me: allegromodern lispworks
+## FAIL: gclcvs (COMPILER BUGS!!!), ecl-bytecodes (one failed test for now), xcl (pathname issues)
+## tentatively supported by asdf, not supported by our tests: cormancl genera rmcl
 
 lisp ?= sbcl
 
diff --git a/asdf-ecl.lisp b/asdf-ecl.lisp
index 37d912ea..86185e59 100644
--- a/asdf-ecl.lisp
+++ b/asdf-ecl.lisp
@@ -141,6 +141,10 @@
   (gather-components 'compile-op c
                      :filter-system (and (not (bundle-op-monolithic-p o)) c)
                      :filter-type '(not system)))
+(defmethod bundle-sub-operations ((o monolithic-lib-op) c)
+  (gather-components 'compile-op c
+                     :filter-system nil
+                     :filter-type '(not system)))
 ;;;
 ;;; SHARED LIBRARIES
 ;;;
@@ -415,19 +419,19 @@
 ;;;
 
 (export '(make-build load-fasl-op prebuilt-system))
-(push '("fasb" . si::load-binary) si::*load-hooks*)
+(push '("fasb" . si::load-binary) ext:*load-hooks*)
 
 (defun register-pre-built-system (name)
   (register-system (make-instance 'system :name name :source-file nil)))
 
-(setf si::*module-provider-functions*
-      (loop :for f :in si::*module-provider-functions*
+(setf ext:*module-provider-functions*
+      (loop :for f :in ext:*module-provider-functions*
         :unless (eq f 'module-provide-asdf)
         :collect #'(lambda (name)
                      (let ((l (multiple-value-list (funcall f name))))
                        (and (first l) (register-pre-built-system name))
                        (values-list l)))))
-#+win32 (push '("asd" . si::load-source) si::*load-hooks*)
+#+win32 (push '("asd" . si::load-source) ext:*load-hooks*)
 (pushnew (translate-logical-pathname "SYS:") *central-registry*)
 
 (provide :asdf)
diff --git a/asdf.asd b/asdf.asd
index fd2473fd..21d16ae6 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -14,7 +14,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.017.9" ;; to be automatically updated by bin/bump-revision
+  :version "2.017.10" ;; to be automatically updated by bin/bump-revision
   :depends-on ()
   :components
   ((:file "asdf")
diff --git a/asdf.lisp b/asdf.lisp
index eb969084..0d7e395a 100755
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-;;; This is ASDF 2.017.9: Another System Definition Facility.
+;;; This is ASDF 2.017.10: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
@@ -115,7 +115,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.017.9")
+         (asdf-version "2.017.10")
          (existing-asdf (find-class 'component nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))
@@ -679,7 +679,7 @@ pathnames."
 
 (defun* getenv (x)
   (declare (ignorable x))
-  #+(or abcl clisp xcl) (ext:getenv x)
+  #+(or abcl clisp ecl xcl) (ext:getenv x)
   #+allegro (sys:getenv x)
   #+clozure (ccl:getenv x)
   #+(or cmu scl) (cdr (assoc x ext:*environment-list* :test #'string=))
@@ -693,7 +693,6 @@ pathnames."
                (ct:c-string-to-lisp-string buffer1))
       (ct:free buffer)
       (ct:free buffer1)))
-  #+ecl (si:getenv x)
   #+gcl (system:getenv x)
   #+genera nil
   #+lispworks (lispworks:environment-variable x)
@@ -2813,7 +2812,7 @@ output to *VERBOSE-OUT*.  Returns the shell's exit code."
       :input nil :output *verbose-out*))
 
     #+ecl ;; courtesy of Juan Jose Garcia Ripoll
-    (si:system command)
+    (ext:system command)
 
     #+gcl
     (lisp:system command)
@@ -4158,8 +4157,7 @@ with a different configuration, so the configuration would be re-read then."
             #+abcl sys::*module-provider-functions*
             #+clisp ,x
             #+clozure ccl:*module-provider-functions*
-            #+cmu ext:*module-provider-functions*
-            #+ecl si:*module-provider-functions*
+            #+(or cmu ecl) ext:*module-provider-functions*
             #+sbcl sb-ext:*module-provider-functions*))))
 
 
-- 
GitLab