Changeset 13686


Ignore:
Timestamp:
May 7, 2010, 12:19:00 AM (10 years ago)
Author:
rme
Message:

Update to 1.719. Delete top-level (declaim (optimize ...)) form.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/tools/asdf.lisp

    r13681 r13686  
    5050(cl:in-package :cl-user)
    5151
    52 (declaim (optimize (speed 2) (debug 2) (safety 3))
    53          #+sbcl (sb-ext:muffle-conditions sb-ext:compiler-note))
    54 
    5552#+ecl (require :cmp)
    5653
     
    7168  (let* ((asdf-version
    7269          ;; the 1+ helps the version bumping script discriminate
    73           (subseq "VERSION:1.717" (1+ (length "VERSION"))))
     70          (subseq "VERSION:1.719" (1+ (length "VERSION"))))
    7471         (existing-asdf (find-package :asdf))
    7572         (vername '#:*asdf-version*)
     
    11751172(defmethod find-component ((component component) (name symbol))
    11761173  (if name
    1177       (find-component component (string name))
     1174      (find-component component (coerce-name name))
    11781175      component))
    11791176
     
    16621659  ;; Note how we use OUTPUT-FILES to find the binary locations
    16631660  ;; This allows the user to override the names.
    1664   (let* ((input (output-files o c))
    1665          (output (compile-file-pathname (lispize-pathname (first input)) :type :fasl)))
    1666     (c:build-fasl output :lisp-files (remove "fas" input :key #'pathname-type :test #'string=))))
     1661  (let* ((files (output-files o c))
     1662         (object (first files))
     1663         (fasl (second files)))
     1664    (c:build-fasl fasl :lisp-files (list object))))
    16671665
    16681666(defmethod perform :after ((operation operation) (c component))
     
    17001698  (let ((p (lispize-pathname (component-pathname c))))
    17011699    #-:broken-fasl-loader
    1702     (list #-ecl (compile-file-pathname p)
    1703           #+ecl (compile-file-pathname p :type :object)
     1700    (list (compile-file-pathname p #+ecl :type #+ecl :object)
    17041701          #+ecl (compile-file-pathname p :type :fasl))
    17051702    #+:broken-fasl-loader (list p)))
     
    24032400        ,@`(#+lispworks ,(try (sys:get-folder-path :common-appdata) "common-lisp/config/")
    24042401            ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData
    2405            #+(not cygwin)
    2406            ,(try (or (getenv "USERPROFILE") (user-homedir))
    2407                  "Application Data/common-lisp/config/"))
     2402           ,(try (getenv "APPDATA") "common-lisp/config/"))
    24082403       ,(try (user-homedir) ".config/common-lisp/")))))
    24092404(defun system-configuration-directories ()
     
    24772472
    24782473(defvar *user-cache*
    2479   (or
    2480    (let ((h (getenv "XDG_CACHE_HOME")))
    2481      (and h `(,h "common-lisp" :implementation)))
    2482    #+(and windows lispworks)
    2483    (let ((h (sys:get-folder-path :common-appdata))) ;; no :common-caches in Windows???
    2484      (and h `(,h "common-lisp" "cache")))
    2485    #+(and (or win32 windows mswindows mingw32) (not cygwin))
    2486    ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Cache
    2487    (let ((h (or (getenv "USERPROFILE") (user-homedir))))
    2488      (and h `(,h "Local Settings" "Temporary Internet Files" "common-lisp")))
    2489    '(:home ".cache" "common-lisp" :implementation)))
     2474  (flet ((try (x &rest sub) (and x `(,x ,@sub))))
     2475    (or
     2476     (try (getenv "XDG_CACHE_HOME") "common-lisp" :implementation)
     2477     #+(and (or win32 windows mswindows mingw32) (not cygwin))
     2478     (try (getenv "APPDATA") "common-lisp" "cache" :implementation)
     2479     '(:home ".cache" "common-lisp" :implementation))))
    24902480(defvar *system-cache*
    2491   (or
    2492    #+(and windows lispworks)
    2493    (let ((h (sys:get-folder-path :common-appdata))) ;; no :common-caches in Windows???
    2494      (and h `(,h "common-lisp" "cache")))
    2495    #+(and (or win32 windows mswindows mingw32) (not cygwin))
    2496    (let ((h (or (getenv "USERPROFILE") (user-homedir))))
    2497      (and h `(,h "Local Settings" "Temporary Internet Files" "common-lisp")))
    2498    #+(or unix cygwin)
    2499    '("/var/cache/common-lisp" :uid :implementation)))
     2481  ;; No good default, plus there's a security problem
     2482  ;; with other users messing with such directories.
     2483  *user-cache*)
    25002484
    25012485(defun output-translations ()
     
    31713155          (dirs (cons datahome (split-string datadirs :separator ":"))))
    31723156         #+(and (or win32 windows mswindows mingw32) (not cygwin))
    3173          ((datahome
    3174            #+lispworks (sys:get-folder-path :common-appdata)
    3175            #-lispworks (try (or (getenv "USERPROFILE") (user-homedir))
    3176                             "Application Data"))
     3157         ((datahome (getenv "APPDATA"))
    31773158          (datadir
    31783159           #+lispworks (sys:get-folder-path :local-appdata)
     
    32823263
    32833264;;;; -----------------------------------------------------------------
    3284 ;;;; Hook into REQUIRE for SBCL, ClozureCL and ABCL
     3265;;;; Hook into REQUIRE for ABCL, ClozureCL, CMUCL, ECL and SBCL
    32853266;;;;
    3286 #+(or sbcl clozure abcl)
     3267#+(or abcl clozure cmu ecl sbcl)
    32873268(progn
    32883269  (defun module-provide-asdf (name)
     
    32993280          t))))
    33003281  (pushnew 'module-provide-asdf
    3301            #+sbcl sb-ext:*module-provider-functions*
     3282           #+abcl sys::*module-provider-functions*
    33023283           #+clozure ccl::*module-provider-functions*
    3303            #+abcl sys::*module-provider-functions*))
     3284           #+cmu ext:*module-provider-functions*
     3285           #+ecl si:*module-provider-functions*
     3286           #+sbcl sb-ext:*module-provider-functions*))
    33043287
    33053288;;;; -------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.