Changeset 14166

Timestamp:

10/06/12 06:26:41 (11 years ago)

Author:

Mark Evenson

Message:

Update to asdf-2.25.

Note that ASDF no longer exports symbols that are now exported by
ASDF-UTILS, which is available via Quicklisp. ASDF-ABCL has been
adjusted for this, but there may be other problems lurking.

Location:

trunk/abcl

Files:

• contrib/abcl-asdf/maven-embedder.lisp (modified) (1 diff)
• src/org/armedbear/lisp/asdf.lisp (modified) (10 diffs)

trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

@@ -48 +48 @@
 Returns the path of the Maven executable or nil if none are found."
 
-  (let ((m2-home (asdf:getenv "M2_HOME"))
-        (m2 (asdf:getenv "M2"))
+  (let ((m2-home (ext:getenv "M2_HOME"))
+        (m2 (ext:getenv "M2"))
         (mvn-executable (if (find :unix *features*)
                                "mvn"

trunk/abcl/src/org/armedbear/lisp/asdf.lisp

@@ -1 +1 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.24: Another System Definition Facility.
+;;; This is ASDF 2.25: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
@@ -119 +119 @@
          ;; "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.24")
+         (asdf-version "2.25")
          (existing-asdf (find-class 'component nil))
          (existing-version *asdf-version*)
@@ -365 +365 @@
             #:system-source-registry-directory
 
-            ;; Utilities
+            ;; Utilities: please use asdf-utils instead
+            #|
             ;; #:aif #:it
-            #:appendf #:orf
+            ;; #:appendf #:orf
             #:length=n-p
             #:remove-keys #:remove-keyword
@@ -390 +391 @@
             #:*wild* #:*wild-file* #:*wild-directory* #:*wild-inferiors*
             #:*wild-path* #:wilden
-            #:directorize-pathname-host-device
+            #:directorize-pathname-host-device|#
             )))
         #+genera (import 'scl:boolean :asdf)
@@ -463 +464 @@
   (deftype logical-pathname () nil)
   (defun make-broadcast-stream () *error-output*)
+  (defun translate-logical-pathname (x) x)
   (defun file-namestring (p)
     (setf p (pathname p))
@@ -3322 +3324 @@
   (truenamize
    (pathname-directory-pathname
+    #+cormanlisp (ensure-directory-pathname (user-homedir-pathname))
     #+mcl (current-user-homedir-pathname)
-    #-mcl (user-homedir-pathname))))
+    #-(or cormanlisp mcl) (user-homedir-pathname))))
 
 (defun* ensure-pathname* (x want-absolute want-directory fmt &rest args)
@@ -3357 +3360 @@
                   :collect (subpathname* dir "common-lisp/"))))
            ,@(when (os-windows-p)
-               `(,(subpathname* (or #+lispworks (sys:get-folder-path :local-appdata)
+               `(,(subpathname* (or #+(and lispworks (not lispworks-personal-edition))
+                                    (sys:get-folder-path :local-appdata)
                                     (getenv-absolute-directory "LOCALAPPDATA"))
                                "common-lisp/config/")
                  ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData
-                 ,(subpathname* (or #+lispworks (sys:get-folder-path :appdata)
+                 ,(subpathname* (or #+(and lispworks (not lispworks-personal-edition))
+                                    (sys:get-folder-path :appdata)
                                     (getenv-absolute-directory "APPDATA"))
                                 "common-lisp/config/")))
@@ -3374 +3379 @@
      (aif
       ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData
-      (subpathname* (or #+lispworks (sys:get-folder-path :common-appdata)
+      (subpathname* (or #+(and lispworks (not lispworks-personal-edition))
+                        (sys:get-folder-path :common-appdata)
                         (getenv-absolute-directory "ALLUSERSAPPDATA")
                         (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/"))
@@ -3502 +3508 @@
      (try (getenv-absolute-directory "XDG_CACHE_HOME") "common-lisp" :implementation)
      (when (os-windows-p)
-       (try (or #+lispworks (sys:get-folder-path :local-appdata)
+       (try (or #+(and lispworks (not lispworks-personal-edition))
+                (sys:get-folder-path :local-appdata)
                 (getenv-absolute-directory "LOCALAPPDATA")
-                #+lispworks (sys:get-folder-path :appdata)
+                #+(and lispworks (not lispworks-personal-edition))
+                (sys:get-folder-path :appdata)
                 (getenv-absolute-directory "APPDATA"))
             "common-lisp" "cache" :implementation))
@@ -4243 +4251 @@
                       '("/usr/local/share" "/usr/share"))))
           ,@(when (os-windows-p)
-              `(,(or #+lispworks (sys:get-folder-path :local-appdata)
+              `(,(or #+(and lispworks (not lispworks-personal-edition))
+                     (sys:get-folder-path :local-appdata)
                      (getenv-absolute-directory "LOCALAPPDATA"))
-                ,(or #+lispworks (sys:get-folder-path :appdata)
+                ,(or #+(and lispworks (not lispworks-personal-edition))
+                     (sys:get-folder-path :appdata)
                      (getenv-absolute-directory "APPDATA"))
-                ,(or #+lispworks (sys:get-folder-path :common-appdata)
+                ,(or #+(and lispworks (not lispworks-personal-edition))
+                     (sys:get-folder-path :common-appdata)
                      (getenv-absolute-directory "ALLUSERSAPPDATA")
                      (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/")))))