Changeset 13037

Timestamp:

11/20/10 15:38:03 (11 years ago)

Author:

Mark Evenson

Message:

[backport r13030,r13031] Ensure ASDF registry contains ASDF-INSTALL locations.

Fix compiler warning about *gpg-program* being assumed special.

Location:

branches/0.23.x/abcl

Files:

• CHANGES (modified) (1 diff)
• contrib/asdf-install/port.lisp (modified) (1 diff)
• contrib/asdf-install/variables.lisp (modified) (1 diff)

branches/0.23.x/abcl/CHANGES

@@ -13 +13 @@
 
 * [svn r12994] New java-interop macros: CHAIN and JMETHOD-LET
+
+* [svn r13031] Ensure that the ASDF registry contains the ASDF-INSTALL locations.
 
 Fixes

branches/0.23.x/abcl/contrib/asdf-install/port.lisp

@@ -1 +1 @@
 (in-package #:asdf-install)
 
-(defvar *temporary-files*)
-
+;;; 'port.lisp' is loaded before 'variables.lisp' primarily for the
+;;; definiton of GET-ENV-VAR, but still needs the following specials
+;;; which would otherwise be in 'variables.lisp'.
 (defparameter *shell-path* "/bin/sh"
   "The path to a Bourne compatible command shell in physical pathname notation.")
+
+(defvar *gpg-command* "gpg"
+  "Location of the gpg binary, if for some reason, it does not appear
+  in the default path for /bin/sh.")
+;;; End variables
+
+(defvar *temporary-files*)
 
 (eval-when (:load-toplevel :compile-toplevel :execute)

branches/0.23.x/abcl/contrib/asdf-install/variables.lisp

@@ -116 +116 @@
   (pathname-sans-name+type (user-homedir-pathname)))
 
-(defvar *gpg-command* "gpg"
-  "Location of the gpg binary, if for some reason, it does appear in
-  the default path for /bin/sh.")
-
-
+#+abcl
+(eval-when (:load-toplevel)
+  (require 'asdf)
+  (dolist (location *locations*)
+    (pushnew (second location) asdf:*central-registry*)))