[armedbear-cvs] r13037 - in branches/0.23.x/abcl: . contrib/asdf-install

[Mark Evenson]

Author: mevenson
Date: Sat Nov 20 10:38:03 2010
New Revision: 13037

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

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


Modified:
   branches/0.23.x/abcl/CHANGES
   branches/0.23.x/abcl/contrib/asdf-install/port.lisp
   branches/0.23.x/abcl/contrib/asdf-install/variables.lisp

Modified: branches/0.23.x/abcl/CHANGES
==============================================================================
--- branches/0.23.x/abcl/CHANGES	(original)
+++ branches/0.23.x/abcl/CHANGES	Sat Nov 20 10:38:03 2010
@@ -13,6 +13,8 @@
 
 * [svn r12994] New java-interop macros: CHAIN and JMETHOD-LET
 
+* [svn r13031] Ensure that the ASDF registry contains the ASDF-INSTALL locations.
+
 Fixes
 -----
 

Modified: branches/0.23.x/abcl/contrib/asdf-install/port.lisp
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/port.lisp	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/port.lisp	Sat Nov 20 10:38:03 2010
@@ -1,10 +1,18 @@
 (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)
   #+:allegro
   (require :osi)

Modified: branches/0.23.x/abcl/contrib/asdf-install/variables.lisp
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/variables.lisp	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/variables.lisp	Sat Nov 20 10:38:03 2010
@@ -115,8 +115,8 @@
 (defvar *temporary-directory* 
   (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*)))