Loading asdf.asd +1 −2 Original line number Diff line number Diff line Loading @@ -12,8 +12,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." :version "2.012" ;;:version #.(asdf:asdf-version) ; how do we make that the *described* ASDF's version rather than the *previously loaded* ASDF's version? :version "2.012.1" ;; to be automatically updated by bin/bump-revision :depends-on () :components ((:file "asdf") Loading asdf.lisp +25 −22 Original line number Diff line number Diff line ;;; -*- mode: common-lisp; package: asdf; -*- ;;; This is ASDF: Another System Definition Facility. ;;; This is ASDF 2.012.1: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. Loading @@ -10,9 +10,9 @@ ;;; trouble using it, or find bugs, you may want to check at the ;;; location above for a more recent version (and for documentation ;;; and test files, if your copy came without them) before reporting ;;; bugs. There are usually two "supported" revisions - the git HEAD ;;; is the latest development version, whereas the revision tagged ;;; RELEASE may be slightly older but is considered `stable' ;;; bugs. There are usually two "supported" revisions - the git master ;;; branch is the latest development version, whereas the git release ;;; branch may be slightly older but is considered `stable' ;;; -- LICENSE START ;;; (This is the MIT / X Consortium license as taken from Loading Loading @@ -62,7 +62,9 @@ (setf excl::*autoload-package-name-alist* (remove "asdf" excl::*autoload-package-name-alist* :test 'equalp :key 'car)) #+ecl (require :cmp)) #+ecl (require :cmp) #+(and (or win32 windows mswindows mingw32) (not cygwin)) (pushnew :asdf-windows *features*) #+(or unix cygwin) (pushnew :asdf-unix *features*)) (in-package :asdf) Loading @@ -76,11 +78,12 @@ (let* (;; For bug reporting sanity, please always bump this version when you modify this file. ;; Please also modify asdf.asd to reflect this change. The script bin/bump-version ;; can help you do these changes in synch (look at the source for documentation). ;; Relying on its automation, the version is now redundantly present on top of this file. ;; "2.345" would be an official release ;; "2.345.6" would be a development version in the official upstream ;; "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.012") (asdf-version "2.012.1") (existing-asdf (fboundp 'find-system)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) Loading Loading @@ -629,7 +632,7 @@ actually-existing directory." :until (eq form eof) :collect form))) #-(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-unix (progn #+ecl #.(cl:and (cl:< ext:+ecl-version-number+ 100601) '(ffi:clines "#include <sys/types.h>" "#include <unistd.h>")) Loading Loading @@ -1232,7 +1235,7 @@ Going forward, we recommend new users should be using the source-registry. :type "asd"))) (when (probe-file file) (return file))) #+(and (or win32 windows mswindows mingw32) (not cygwin) (not clisp)) #+(and asdf-windows (not clisp)) (let ((shortcut (make-pathname :defaults defaults :version :newest :case :local Loading Loading @@ -1935,10 +1938,10 @@ recursive calls to traverse.") (defmethod output-files ((operation compile-op) (c cl-source-file)) (declare (ignorable operation)) (let ((p (lispize-pathname (component-pathname c)))) #-:broken-fasl-loader #-broken-fasl-loader (list (compile-file-pathname p #+ecl :type #+ecl :object) #+ecl (compile-file-pathname p :type :fasl)) #+:broken-fasl-loader (list p))) #+broken-fasl-loader (list p))) (defmethod perform ((operation compile-op) (c static-file)) (declare (ignorable operation c)) Loading Loading @@ -2631,8 +2634,8 @@ located." ;;; Generic support for configuration files (defparameter *inter-directory-separator* #+(or unix cygwin) #\: #-(or unix cygwin) #\;) #+asdf-unix #\: #-asdf-unix #\;) (defun* user-homedir () (truename (user-homedir-pathname))) Loading @@ -2651,7 +2654,7 @@ located." ,@(loop :with dirs = (getenv "XDG_CONFIG_DIRS") :for dir :in (split-string dirs :separator ":") :collect (try dir "common-lisp/")) #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows ,@`(#+lispworks ,(try (sys:get-folder-path :common-appdata) "common-lisp/config/") ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData ,(try (getenv "APPDATA") "common-lisp/config/")) Loading @@ -2660,7 +2663,7 @@ located." (remove-if #'null (append #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows (flet ((try (x sub) (try-directory-subpath x sub :type :directory))) `(,@`(#+lispworks ,(try (sys:get-folder-path :local-appdata) "common-lisp/config/") ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData Loading Loading @@ -2781,7 +2784,7 @@ and the order is by decreasing length of namestring of the source pathname.") (flet ((try (x &rest sub) (and x `(,x ,@sub)))) (or (try (getenv "XDG_CACHE_HOME") "common-lisp" :implementation) #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows (try (getenv "APPDATA") "common-lisp" "cache" :implementation) '(:home ".cache" "common-lisp" :implementation)))) (defvar *system-cache* Loading Loading @@ -2840,7 +2843,7 @@ with a different configuration, so the configuration would be re-read then." ((eql :*.*.*) *wild-file*) ((eql :implementation) (implementation-identifier)) ((eql :implementation-type) (string-downcase (implementation-type))) #-(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-unix ((eql :uid) (princ-to-string (get-uid))))) (d (if (or (pathnamep x) (not directory)) r (ensure-directory-pathname r))) (s (if (or (pathnamep x) (not wilden)) d (wilden d)))) Loading Loading @@ -2911,7 +2914,7 @@ directive.") (typep c '(or string pathname (member :default-directory :*/ :**/ :*.*.* :implementation :implementation-type #-(and (or win32 windows mswindows mingw32) (not cygwin)) :uid))))) #+asdf-unix :uid))))) (or (typep x 'boolean) (absolute-component-p x) (and (consp x) (absolute-component-p (first x)) (every #'relative-component-p (rest x)))))) Loading Loading @@ -3278,7 +3281,7 @@ call that function where you would otherwise have loaded and configured A-B-L.") ;;;; Jesse Hager: The Windows Shortcut File Format. ;;;; http://www.wotsit.org/list.asp?fc=13 #+(and (or win32 windows mswindows mingw32) (not cygwin) (not clisp)) #+(and asdf-windows (not clisp)) (progn (defparameter *link-initial-dword* 76) (defparameter *link-guid* #(1 20 2 0 0 0 0 0 192 0 0 0 0 0 0 70)) Loading Loading @@ -3517,23 +3520,23 @@ with a different configuration, so the configuration would be re-read then." (flet ((try (x sub) (try-directory-subpath x sub :type :directory))) `(:source-registry #+sbcl (:directory ,(merge-pathnames* ".sbcl/systems/" (user-homedir))) (:directory ,(truenamize (directory-namestring *default-pathname-defaults*))) (:directory ,(default-directory)) ,@(let* #+(or unix cygwin) #+asdf-unix ((datahome (or (getenv "XDG_DATA_HOME") (try (user-homedir) ".local/share/"))) (datadirs (or (getenv "XDG_DATA_DIRS") "/usr/local/share:/usr/share")) (dirs (cons datahome (split-string datadirs :separator ":")))) #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows ((datahome (getenv "APPDATA")) (datadir #+lispworks (sys:get-folder-path :local-appdata) #-lispworks (try (getenv "ALLUSERSPROFILE") "Application Data")) (dirs (list datahome datadir))) #-(or unix win32 windows mswindows mingw32 cygwin) #-(or asdf-unix asdf-windows) ((dirs ())) (loop :for dir :in dirs :collect `(:directory ,(try dir "common-lisp/systems/")) Loading bin/bump-version +1 −1 Original line number Diff line number Diff line Loading @@ -10,7 +10,7 @@ if [ -z "$NEWVER" ] ; then NEWVER="$(echo $OLDVER | perl -npe 's/([0-9].[0-9]+)(\.([0-9]+))?/"${1}.".($3+1)/e')" fi echo "Setting ASDF version to $NEWVER" perl -i.bak -npe 's/^( \(asdf-version ")[0-9.]+("\))/${1}'"$NEWVER"'${2}/' $ASDFLISP perl -i.bak -npe 's/^( \(asdf-version "|;;; This is ASDF )[0-9.]+("\)|:)/${1}'"$NEWVER"'${2}/' $ASDFLISP perl -i.bak -npe 's/^( :version ")[0-9.]+(")/${1}'"$NEWVER"'${2}/' $ASDFASD cat<<EOF To complete the version change, you may: Loading Loading
asdf.asd +1 −2 Original line number Diff line number Diff line Loading @@ -12,8 +12,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." :version "2.012" ;;:version #.(asdf:asdf-version) ; how do we make that the *described* ASDF's version rather than the *previously loaded* ASDF's version? :version "2.012.1" ;; to be automatically updated by bin/bump-revision :depends-on () :components ((:file "asdf") Loading
asdf.lisp +25 −22 Original line number Diff line number Diff line ;;; -*- mode: common-lisp; package: asdf; -*- ;;; This is ASDF: Another System Definition Facility. ;;; This is ASDF 2.012.1: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. Loading @@ -10,9 +10,9 @@ ;;; trouble using it, or find bugs, you may want to check at the ;;; location above for a more recent version (and for documentation ;;; and test files, if your copy came without them) before reporting ;;; bugs. There are usually two "supported" revisions - the git HEAD ;;; is the latest development version, whereas the revision tagged ;;; RELEASE may be slightly older but is considered `stable' ;;; bugs. There are usually two "supported" revisions - the git master ;;; branch is the latest development version, whereas the git release ;;; branch may be slightly older but is considered `stable' ;;; -- LICENSE START ;;; (This is the MIT / X Consortium license as taken from Loading Loading @@ -62,7 +62,9 @@ (setf excl::*autoload-package-name-alist* (remove "asdf" excl::*autoload-package-name-alist* :test 'equalp :key 'car)) #+ecl (require :cmp)) #+ecl (require :cmp) #+(and (or win32 windows mswindows mingw32) (not cygwin)) (pushnew :asdf-windows *features*) #+(or unix cygwin) (pushnew :asdf-unix *features*)) (in-package :asdf) Loading @@ -76,11 +78,12 @@ (let* (;; For bug reporting sanity, please always bump this version when you modify this file. ;; Please also modify asdf.asd to reflect this change. The script bin/bump-version ;; can help you do these changes in synch (look at the source for documentation). ;; Relying on its automation, the version is now redundantly present on top of this file. ;; "2.345" would be an official release ;; "2.345.6" would be a development version in the official upstream ;; "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.012") (asdf-version "2.012.1") (existing-asdf (fboundp 'find-system)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) Loading Loading @@ -629,7 +632,7 @@ actually-existing directory." :until (eq form eof) :collect form))) #-(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-unix (progn #+ecl #.(cl:and (cl:< ext:+ecl-version-number+ 100601) '(ffi:clines "#include <sys/types.h>" "#include <unistd.h>")) Loading Loading @@ -1232,7 +1235,7 @@ Going forward, we recommend new users should be using the source-registry. :type "asd"))) (when (probe-file file) (return file))) #+(and (or win32 windows mswindows mingw32) (not cygwin) (not clisp)) #+(and asdf-windows (not clisp)) (let ((shortcut (make-pathname :defaults defaults :version :newest :case :local Loading Loading @@ -1935,10 +1938,10 @@ recursive calls to traverse.") (defmethod output-files ((operation compile-op) (c cl-source-file)) (declare (ignorable operation)) (let ((p (lispize-pathname (component-pathname c)))) #-:broken-fasl-loader #-broken-fasl-loader (list (compile-file-pathname p #+ecl :type #+ecl :object) #+ecl (compile-file-pathname p :type :fasl)) #+:broken-fasl-loader (list p))) #+broken-fasl-loader (list p))) (defmethod perform ((operation compile-op) (c static-file)) (declare (ignorable operation c)) Loading Loading @@ -2631,8 +2634,8 @@ located." ;;; Generic support for configuration files (defparameter *inter-directory-separator* #+(or unix cygwin) #\: #-(or unix cygwin) #\;) #+asdf-unix #\: #-asdf-unix #\;) (defun* user-homedir () (truename (user-homedir-pathname))) Loading @@ -2651,7 +2654,7 @@ located." ,@(loop :with dirs = (getenv "XDG_CONFIG_DIRS") :for dir :in (split-string dirs :separator ":") :collect (try dir "common-lisp/")) #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows ,@`(#+lispworks ,(try (sys:get-folder-path :common-appdata) "common-lisp/config/") ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData ,(try (getenv "APPDATA") "common-lisp/config/")) Loading @@ -2660,7 +2663,7 @@ located." (remove-if #'null (append #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows (flet ((try (x sub) (try-directory-subpath x sub :type :directory))) `(,@`(#+lispworks ,(try (sys:get-folder-path :local-appdata) "common-lisp/config/") ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData Loading Loading @@ -2781,7 +2784,7 @@ and the order is by decreasing length of namestring of the source pathname.") (flet ((try (x &rest sub) (and x `(,x ,@sub)))) (or (try (getenv "XDG_CACHE_HOME") "common-lisp" :implementation) #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows (try (getenv "APPDATA") "common-lisp" "cache" :implementation) '(:home ".cache" "common-lisp" :implementation)))) (defvar *system-cache* Loading Loading @@ -2840,7 +2843,7 @@ with a different configuration, so the configuration would be re-read then." ((eql :*.*.*) *wild-file*) ((eql :implementation) (implementation-identifier)) ((eql :implementation-type) (string-downcase (implementation-type))) #-(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-unix ((eql :uid) (princ-to-string (get-uid))))) (d (if (or (pathnamep x) (not directory)) r (ensure-directory-pathname r))) (s (if (or (pathnamep x) (not wilden)) d (wilden d)))) Loading Loading @@ -2911,7 +2914,7 @@ directive.") (typep c '(or string pathname (member :default-directory :*/ :**/ :*.*.* :implementation :implementation-type #-(and (or win32 windows mswindows mingw32) (not cygwin)) :uid))))) #+asdf-unix :uid))))) (or (typep x 'boolean) (absolute-component-p x) (and (consp x) (absolute-component-p (first x)) (every #'relative-component-p (rest x)))))) Loading Loading @@ -3278,7 +3281,7 @@ call that function where you would otherwise have loaded and configured A-B-L.") ;;;; Jesse Hager: The Windows Shortcut File Format. ;;;; http://www.wotsit.org/list.asp?fc=13 #+(and (or win32 windows mswindows mingw32) (not cygwin) (not clisp)) #+(and asdf-windows (not clisp)) (progn (defparameter *link-initial-dword* 76) (defparameter *link-guid* #(1 20 2 0 0 0 0 0 192 0 0 0 0 0 0 70)) Loading Loading @@ -3517,23 +3520,23 @@ with a different configuration, so the configuration would be re-read then." (flet ((try (x sub) (try-directory-subpath x sub :type :directory))) `(:source-registry #+sbcl (:directory ,(merge-pathnames* ".sbcl/systems/" (user-homedir))) (:directory ,(truenamize (directory-namestring *default-pathname-defaults*))) (:directory ,(default-directory)) ,@(let* #+(or unix cygwin) #+asdf-unix ((datahome (or (getenv "XDG_DATA_HOME") (try (user-homedir) ".local/share/"))) (datadirs (or (getenv "XDG_DATA_DIRS") "/usr/local/share:/usr/share")) (dirs (cons datahome (split-string datadirs :separator ":")))) #+(and (or win32 windows mswindows mingw32) (not cygwin)) #+asdf-windows ((datahome (getenv "APPDATA")) (datadir #+lispworks (sys:get-folder-path :local-appdata) #-lispworks (try (getenv "ALLUSERSPROFILE") "Application Data")) (dirs (list datahome datadir))) #-(or unix win32 windows mswindows mingw32 cygwin) #-(or asdf-unix asdf-windows) ((dirs ())) (loop :for dir :in dirs :collect `(:directory ,(try dir "common-lisp/systems/")) Loading
bin/bump-version +1 −1 Original line number Diff line number Diff line Loading @@ -10,7 +10,7 @@ if [ -z "$NEWVER" ] ; then NEWVER="$(echo $OLDVER | perl -npe 's/([0-9].[0-9]+)(\.([0-9]+))?/"${1}.".($3+1)/e')" fi echo "Setting ASDF version to $NEWVER" perl -i.bak -npe 's/^( \(asdf-version ")[0-9.]+("\))/${1}'"$NEWVER"'${2}/' $ASDFLISP perl -i.bak -npe 's/^( \(asdf-version "|;;; This is ASDF )[0-9.]+("\)|:)/${1}'"$NEWVER"'${2}/' $ASDFLISP perl -i.bak -npe 's/^( :version ")[0-9.]+(")/${1}'"$NEWVER"'${2}/' $ASDFASD cat<<EOF To complete the version change, you may: Loading