Changeset 14166


Ignore:
Timestamp:
10/06/12 06:26:41 (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r13907 r14166  
    4848Returns the path of the Maven executable or nil if none are found."
    4949
    50   (let ((m2-home (asdf:getenv "M2_HOME"))
    51         (m2 (asdf:getenv "M2"))
     50  (let ((m2-home (ext:getenv "M2_HOME"))
     51        (m2 (ext:getenv "M2"))
    5252        (mvn-executable (if (find :unix *features*)
    5353                               "mvn"
  • trunk/abcl/src/org/armedbear/lisp/asdf.lisp

    r14150 r14166  
    11;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
    2 ;;; This is ASDF 2.24: Another System Definition Facility.
     2;;; This is ASDF 2.25: Another System Definition Facility.
    33;;;
    44;;; Feedback, bug reports, and patches are all welcome:
     
    119119         ;; "2.345.0.7" would be your seventh local modification of official release 2.345
    120120         ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
    121          (asdf-version "2.24")
     121         (asdf-version "2.25")
    122122         (existing-asdf (find-class 'component nil))
    123123         (existing-version *asdf-version*)
     
    365365            #:system-source-registry-directory
    366366
    367             ;; Utilities
     367            ;; Utilities: please use asdf-utils instead
     368            #|
    368369            ;; #:aif #:it
    369             #:appendf #:orf
     370            ;; #:appendf #:orf
    370371            #:length=n-p
    371372            #:remove-keys #:remove-keyword
     
    390391            #:*wild* #:*wild-file* #:*wild-directory* #:*wild-inferiors*
    391392            #:*wild-path* #:wilden
    392             #:directorize-pathname-host-device
     393            #:directorize-pathname-host-device|#
    393394            )))
    394395        #+genera (import 'scl:boolean :asdf)
     
    463464  (deftype logical-pathname () nil)
    464465  (defun make-broadcast-stream () *error-output*)
     466  (defun translate-logical-pathname (x) x)
    465467  (defun file-namestring (p)
    466468    (setf p (pathname p))
     
    33223324  (truenamize
    33233325   (pathname-directory-pathname
     3326    #+cormanlisp (ensure-directory-pathname (user-homedir-pathname))
    33243327    #+mcl (current-user-homedir-pathname)
    3325     #-mcl (user-homedir-pathname))))
     3328    #-(or cormanlisp mcl) (user-homedir-pathname))))
    33263329
    33273330(defun* ensure-pathname* (x want-absolute want-directory fmt &rest args)
     
    33573360                  :collect (subpathname* dir "common-lisp/"))))
    33583361           ,@(when (os-windows-p)
    3359                `(,(subpathname* (or #+lispworks (sys:get-folder-path :local-appdata)
     3362               `(,(subpathname* (or #+(and lispworks (not lispworks-personal-edition))
     3363                                    (sys:get-folder-path :local-appdata)
    33603364                                    (getenv-absolute-directory "LOCALAPPDATA"))
    33613365                               "common-lisp/config/")
    33623366                 ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData
    3363                  ,(subpathname* (or #+lispworks (sys:get-folder-path :appdata)
     3367                 ,(subpathname* (or #+(and lispworks (not lispworks-personal-edition))
     3368                                    (sys:get-folder-path :appdata)
    33643369                                    (getenv-absolute-directory "APPDATA"))
    33653370                                "common-lisp/config/")))
     
    33743379     (aif
    33753380      ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData
    3376       (subpathname* (or #+lispworks (sys:get-folder-path :common-appdata)
     3381      (subpathname* (or #+(and lispworks (not lispworks-personal-edition))
     3382                        (sys:get-folder-path :common-appdata)
    33773383                        (getenv-absolute-directory "ALLUSERSAPPDATA")
    33783384                        (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/"))
     
    35023508     (try (getenv-absolute-directory "XDG_CACHE_HOME") "common-lisp" :implementation)
    35033509     (when (os-windows-p)
    3504        (try (or #+lispworks (sys:get-folder-path :local-appdata)
     3510       (try (or #+(and lispworks (not lispworks-personal-edition))
     3511                (sys:get-folder-path :local-appdata)
    35053512                (getenv-absolute-directory "LOCALAPPDATA")
    3506                 #+lispworks (sys:get-folder-path :appdata)
     3513                #+(and lispworks (not lispworks-personal-edition))
     3514                (sys:get-folder-path :appdata)
    35073515                (getenv-absolute-directory "APPDATA"))
    35083516            "common-lisp" "cache" :implementation))
     
    42434251                      '("/usr/local/share" "/usr/share"))))
    42444252          ,@(when (os-windows-p)
    4245               `(,(or #+lispworks (sys:get-folder-path :local-appdata)
     4253              `(,(or #+(and lispworks (not lispworks-personal-edition))
     4254                     (sys:get-folder-path :local-appdata)
    42464255                     (getenv-absolute-directory "LOCALAPPDATA"))
    4247                 ,(or #+lispworks (sys:get-folder-path :appdata)
     4256                ,(or #+(and lispworks (not lispworks-personal-edition))
     4257                     (sys:get-folder-path :appdata)
    42484258                     (getenv-absolute-directory "APPDATA"))
    4249                 ,(or #+lispworks (sys:get-folder-path :common-appdata)
     4259                ,(or #+(and lispworks (not lispworks-personal-edition))
     4260                     (sys:get-folder-path :common-appdata)
    42504261                     (getenv-absolute-directory "ALLUSERSAPPDATA")
    42514262                     (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/")))))
Note: See TracChangeset for help on using the changeset viewer.