Changeset 14230


Ignore:
Timestamp:
11/02/12 11:13:16 (8 years ago)
Author:
Mark Evenson
Message:

Upgrade to asdf-2.26 with ABCL specific JAR patches.

Need to get ABCL differences back upstream.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/asdf.lisp

    r14210 r14230  
    11;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
    2 ;;; This is ASDF 2.25: Another System Definition Facility.
     2;;; This is ASDF 2.26: 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.25")
     121         (asdf-version "2.26")
    122122         (existing-asdf (find-class 'component nil))
    123123         (existing-version *asdf-version*)
     
    231231          (pkgdcl
    232232           :asdf
    233            :nicknames (:asdf-utilities) ;; DEPRECATED! Do not use, for backward compatibility only.
    234233           :use (:common-lisp)
    235234           :redefined-functions
     
    33513350  (getenv-pathnames x :want-absolute t :want-directory t))
    33523351
     3352(defun* get-folder-path (folder)
     3353  (or ;; this semi-portably implements a subset of the functionality of lispworks' sys:get-folder-path
     3354   #+(and lispworks mswindows) (sys:get-folder-path folder)
     3355   ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData
     3356   (ecase folder
     3357    (:local-appdata (getenv-absolute-directory "LOCALAPPDATA"))
     3358    (:appdata (getenv-absolute-directory "APPDATA"))
     3359    (:common-appdata (or (getenv-absolute-directory "ALLUSERSAPPDATA")
     3360       (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/"))))))
    33533361
    33543362(defun* user-configuration-directories ()
     
    33603368                  :collect (subpathname* dir "common-lisp/"))))
    33613369           ,@(when (os-windows-p)
    3362                `(,(subpathname* (or #+(and lispworks (not lispworks-personal-edition))
    3363                                     (sys:get-folder-path :local-appdata)
    3364                                     (getenv-absolute-directory "LOCALAPPDATA"))
    3365                                "common-lisp/config/")
    3366                  ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData
    3367                  ,(subpathname* (or #+(and lispworks (not lispworks-personal-edition))
    3368                                     (sys:get-folder-path :appdata)
    3369                                     (getenv-absolute-directory "APPDATA"))
    3370                                 "common-lisp/config/")))
     3370               `(,(subpathname* (get-folder-path :local-appdata) "common-lisp/config/")
     3371                 ,(subpathname* (get-folder-path :appdata) "common-lisp/config/")))
    33713372           ,(subpathname (user-homedir) ".config/common-lisp/"))))
    33723373    (remove-duplicates (remove-if-not #'absolute-pathname-p dirs)
     
    33793380     (aif
    33803381      ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData
    3381       (subpathname* (or #+(and lispworks (not lispworks-personal-edition))
    3382                         (sys:get-folder-path :common-appdata)
    3383                         (getenv-absolute-directory "ALLUSERSAPPDATA")
    3384                         (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/"))
    3385                     "common-lisp/config/")
     3382      (subpathname* (get-folder-path :common-appdata) "common-lisp/config/")
    33863383      (list it)))))
    33873384
     
    35083505     (try (getenv-absolute-directory "XDG_CACHE_HOME") "common-lisp" :implementation)
    35093506     (when (os-windows-p)
    3510        (try (or #+(and lispworks (not lispworks-personal-edition))
    3511                 (sys:get-folder-path :local-appdata)
    3512                 (getenv-absolute-directory "LOCALAPPDATA")
    3513                 #+(and lispworks (not lispworks-personal-edition))
    3514                 (sys:get-folder-path :appdata)
    3515                 (getenv-absolute-directory "APPDATA"))
     3507       (try (or (get-folder-path :local-appdata)
     3508                (get-folder-path :appdata))
    35163509            "common-lisp" "cache" :implementation))
    35173510     '(:home ".cache" "common-lisp" :implementation))))
     
    39183911      ;; what cfp should be doing, w/ mp* instead of mp
    39193912      (let* ((type (pathname-type (apply 'compile-file-pathname "x.lisp" keys)))
    3920              (defaults (make-pathname
    3921                         :type type :defaults (merge-pathnames* input-file))))
    3922         (merge-pathnames* output-file defaults))
     3913       (defaults (make-pathname
     3914      :type type :defaults (merge-pathnames* input-file))))
     3915  (merge-pathnames* output-file defaults))
    39233916      (apply-output-translations
    3924        (apply 'compile-file-pathname input-file keys))))
     3917       (apply 'compile-file-pathname input-file
     3918        (if output-file keys (remove-keyword :output-file keys))))))
    39253919
    39263920(defun* tmpize-pathname (x)
     
    42564250(defun* wrapping-source-registry ()
    42574251  `(:source-registry
     4252    #+ecl (:tree ,(translate-logical-pathname "SYS:"))
    42584253    #+mkcl (:tree ,(translate-logical-pathname "CONTRIB:"))
    42594254    #+sbcl (:tree ,(truenamize (getenv-pathname "SBCL_HOME" :want-directory t)))
     
    42724267                      '("/usr/local/share" "/usr/share"))))
    42734268          ,@(when (os-windows-p)
    4274               `(,(or #+(and lispworks (not lispworks-personal-edition))
    4275                      (sys:get-folder-path :local-appdata)
    4276                      (getenv-absolute-directory "LOCALAPPDATA"))
    4277                 ,(or #+(and lispworks (not lispworks-personal-edition))
    4278                      (sys:get-folder-path :appdata)
    4279                      (getenv-absolute-directory "APPDATA"))
    4280                 ,(or #+(and lispworks (not lispworks-personal-edition))
    4281                      (sys:get-folder-path :common-appdata)
    4282                      (getenv-absolute-directory "ALLUSERSAPPDATA")
    4283                      (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/")))))
     4269              (mapcar 'get-folder-path '(:local-appdata :appdata :common-appdata))))
    42844270        :collect `(:directory ,(subpathname* dir "common-lisp/systems/"))
    42854271        :collect `(:tree ,(subpathname* dir "common-lisp/source/")))
Note: See TracChangeset for help on using the changeset viewer.