Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Didier Verna
asdf
Commits
a3f8080e
Commit
a3f8080e
authored
Jan 21, 2013
by
Francois-Rene Rideau
Browse files
2.26.136: try my very best for clean upgrade on abcl, clisp, cmucl. In the end, punt.
parent
1dfd01f0
Changes
13
Hide whitespace changes
Inline
Side-by-side
action.lisp
View file @
a3f8080e
...
...
@@ -73,7 +73,7 @@ You can put together sentences using this phrase."))
(
defmethod
operation-description
(
operation
component
)
(
format
nil
(
compatfmt
"~@<~A on ~A~@:>"
)
(
type-of
operation
)
component
))
(
defgeneric*
explain
(
operation
component
))
(
defgeneric*
(
explain
)
(
operation
component
))
(
defmethod
explain
((
o
operation
)
(
c
component
))
(
asdf-message
(
compatfmt
"~&~@<; ~@;~A~:>~%"
)
(
operation-description
o
c
)))
(
define-convenience-action-methods
explain
(
operation
component
))
...
...
@@ -110,10 +110,11 @@ You can put together sentences using this phrase."))
(
cdr
(
assoc
(
type-of
o
)
(
component-in-order-to
c
))))
; User-specified in-order dependencies
(
defmethod
component-self-dependencies
((
o
operation
)
(
c
component
))
;; NB: result in the same format as component-depends-on
(
loop
:for
(
o-spec
.
c-spec
)
:in
(
component-depends-on
o
c
)
:unless
(
eq
o-spec
'feature
)
;; avoid the FEATURE "feature"
:when
(
find
c
c-spec
:key
#'
(
lambda
(
dep
)
(
resolve-dependency-spec
c
dep
)))
:collect
(
cons
(
find-operation
o
o-spec
)
c
)))
:collect
(
list
o-spec
c
)))
;;;; upward-operation, downward-operation
;; These together handle actions that propagate along the component hierarchy.
...
...
@@ -152,7 +153,7 @@ You can put together sentences using this phrase."))
;;;; Inputs, Outputs, and invisible dependencies
(
defgeneric*
(
output-files
)
(
operation
component
))
(
defgeneric*
(
input-files
)
(
operation
component
))
(
defgeneric*
operation-done-p
(
operation
component
)
(
defgeneric*
(
operation-done-p
)
(
operation
component
)
(
:documentation
"Returns a boolean, which is NIL if the action is forced to be performed again"
))
(
define-convenience-action-methods
output-files
(
operation
component
))
(
define-convenience-action-methods
input-files
(
operation
component
))
...
...
@@ -192,12 +193,13 @@ You can put together sentences using this phrase."))
(
declare
(
ignorable
o
c
))
nil
)
(
defmethod
input-files
((
o
operation
)
(
c
file-
component
))
(
defmethod
input-files
((
o
operation
)
(
c
component
))
(
or
(
loop
:for
(
dep-o
)
:in
(
component-self-dependencies
o
c
)
:append
(
or
(
output-files
dep-o
c
)
(
input-files
dep-o
c
)))
;; no non-trivial previous operations needed?
;; I guess we work with the original source file, then
(
list
(
component-pathname
c
))))
(
if-let
((
pathname
(
component-pathname
c
)))
(
and
(
file-pathname-p
pathname
)
(
list
pathname
)))))
;;;; Done performing
...
...
@@ -247,8 +249,8 @@ in some previous image, or T if it needs to be done.")
;;;; Perform
(
defgeneric*
perform-with-restarts
(
operation
component
))
(
defgeneric*
perform
(
operation
component
))
(
defgeneric*
(
perform-with-restarts
)
(
operation
component
))
(
defgeneric*
(
perform
)
(
operation
component
))
(
define-convenience-action-methods
perform
(
operation
component
))
(
defmethod
perform
:before
((
o
operation
)
(
c
component
))
...
...
asdf.asd
View file @
a3f8080e
...
...
@@ -15,7 +15,7 @@
:licence
"MIT"
:description
"Another System Definition Facility"
:long-description
"ASDF builds Common Lisp software organized into defined systems."
:version
"2.26.13
5
"
;; to be automatically updated by make bump-version
:version
"2.26.13
6
"
;; to be automatically updated by make bump-version
:depends-on
()
:components
((
:module
"build"
:components
((
:file
"asdf"
))))
:in-order-to
(
#+
asdf2.27
(
compile-op
(
monolithic-load-concatenated-source-op
asdf/defsystem
))))
...
...
component.lisp
View file @
a3f8080e
...
...
@@ -43,7 +43,7 @@
(
:documentation
"Find the top-level system containing COMPONENT"
))
(
defgeneric*
component-pathname
(
component
)
(
:documentation
"Extracts the pathname applicable for a particular component."
))
(
defgeneric*
component-relative-pathname
(
component
)
(
defgeneric*
(
component-relative-pathname
)
(
component
)
(
:documentation
"Returns a pathname for the component argument intended to be
interpreted relative to the pathname of that component's parent.
Despite the function's name, the return value may be an absolute
...
...
@@ -58,7 +58,7 @@ another pathname in a degenerate way."))
;;; Backward compatible way of computing the FILE-TYPE of a component.
;;; TODO: find users, have them stop using that.
(
defgeneric*
source-file-type
(
component
system
))
(
defgeneric*
(
source-file-type
)
(
component
system
))
(
when-upgrade
(
:when
(
find-class
'component
nil
))
(
defmethod
reinitialize-instance
:after
((
c
component
)
&rest
initargs
&key
)
...
...
find-component.lisp
View file @
a3f8080e
...
...
@@ -47,7 +47,7 @@
;;;; Finding components
(
defgeneric*
find-component
(
base
path
)
(
defgeneric*
(
find-component
)
(
base
path
)
(
:documentation
"Find a component by resolving the PATH starting from BASE parent"
))
(
defgeneric*
resolve-dependency-combination
(
component
combinator
arguments
))
...
...
header.lisp
View file @
a3f8080e
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.13
5
: Another System Definition Facility.
;;; This is ASDF 2.26.13
6
: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
...
...
@@ -47,20 +47,24 @@
#+
xcvb
(
module
())
#+
clisp
(
in-package
:cl-user
)
#+
clisp
#+
cmu
(
eval-when
(
:load-toplevel
:compile-toplevel
:execute
)
(
declaim
(
optimize
(
speed
1
)
(
safety
3
)
(
debug
3
)))
(
setf
ext:*gc-verbose*
nil
))
#+
(
or
abcl
clisp
cmu
)
(
eval-when
(
:load-toplevel
:compile-toplevel
:execute
)
(
unless
(
member
:asdf2.27
*features*
)
(
let
((
p
(
find-package
:asdf
)))
(
when
p
(
rename-package
:asdf
(
format
nil
"~A-~A"
:asdf
(
or
(
symbol-value
(
and
(
member
:asdf2
*features*
)
(
or
(
find-symbol
(
string
:*asdf-version*
)
:asdf
)
(
find-symbol
(
string
:*asdf-revision*
)
:asdf
))))
:1.x
)))
(
let*
((
existing-version
(
when
(
find-package
:asdf
)
(
or
(
symbol-value
(
or
(
find-symbol
(
string
:*asdf-version*
)
:asdf
)
(
find-symbol
(
string
:*asdf-revision*
)
:asdf
)))
(
string
:1.x
))))
(
away
(
format
nil
"~A-~A"
:asdf
existing-version
)))
(
when
existing-version
(
rename-package
:asdf
away
)
(
when
*load-verbose*
(
format
t
"; Renamed package ~A away to ~A~%"
:asdf
(
package-name
p
)))))))
(
format
t
"; Renamed package ~A away to ~A~%"
:asdf
away
))))))
operate.lisp
View file @
a3f8080e
...
...
@@ -16,7 +16,7 @@
#:upgrade-asdf
#:cleanup-upgraded-asdf
#:*post-upgrade-hook*
))
(
in-package
:asdf/operate
)
(
defgeneric*
operate
(
operation
component
&key
&allow-other-keys
))
(
defgeneric*
(
operate
)
(
operation
component
&key
&allow-other-keys
))
(
define-convenience-action-methods
operate
(
operation
component
&key
)
:operation-initargs
t
;; backward-compatibility with ASDF1. Yuck.
...
...
output-translations.lisp
View file @
a3f8080e
...
...
@@ -169,7 +169,7 @@ and the order is by decreasing length of namestring of the source pathname.")
(
when
inherit
(
process-output-translations
(
first
inherit
)
:collect
collect
:inherit
(
rest
inherit
))))
(
defun*
process-output-translations-directive
(
directive
&key
inherit
collect
)
(
defun*
(
process-output-translations-directive
)
(
directive
&key
inherit
collect
)
(
if
(
atom
directive
)
(
ecase
directive
((
:enable-user-cache
)
...
...
@@ -260,7 +260,7 @@ effectively disabling the output translation facility."
(
output-translations
)
(
initialize-output-translations
)))
(
defun*
apply-output-translations
(
path
)
(
defun*
(
apply-output-translations
)
(
path
)
#+
cormanlisp
(
resolve-symlinks*
path
)
#-
cormanlisp
(
etypecase
path
(
logical-pathname
...
...
pathname.lisp
View file @
a3f8080e
...
...
@@ -15,7 +15,7 @@
#:merge-pathnames*
;; Directories
#:pathname-directory-pathname
#:pathname-parent-directory-pathname
#:directory-pathname-p
#:ensure-directory-pathname
#:directory-pathname-p
#:ensure-directory-pathname
#:file-pathname-p
;; Absolute vs relative pathnames
#:ensure-pathname-absolute
#:relativize-directory-component
#:relativize-pathname-directory
...
...
plan.lisp
View file @
a3f8080e
...
...
@@ -365,6 +365,7 @@ of ASDF operation object and a COMPONENT object. The pairs will be
processed in order by OPERATE."
))
(
defgeneric*
perform-plan
(
plan
&key
))
(
defgeneric*
plan-operates-on-p
(
plan
component
))
(
defgeneric*
(
traverse
)
(
operation
component
&key
&allow-other-keys
))
(
define-convenience-action-methods
traverse
(
operation
component
&key
))
(
defparameter
*default-plan-class*
'sequential-plan
)
...
...
source-registry.lisp
View file @
a3f8080e
...
...
@@ -183,13 +183,13 @@ system names to pathnames of .asd files")
(
defun*
environment-source-registry
()
(
getenv
"CL_SOURCE_REGISTRY"
))
(
defgeneric*
process-source-registry
(
spec
&key
inherit
register
))
(
defgeneric*
(
process-source-registry
)
(
spec
&key
inherit
register
))
(
defun*
inherit-source-registry
(
inherit
&key
register
)
(
defun*
(
inherit-source-registry
)
(
inherit
&key
register
)
(
when
inherit
(
process-source-registry
(
first
inherit
)
:register
register
:inherit
(
rest
inherit
))))
(
defun*
process-source-registry-directive
(
directive
&key
inherit
register
)
(
defun*
(
process-source-registry-directive
)
(
directive
&key
inherit
register
)
(
destructuring-bind
(
kw
&rest
rest
)
(
if
(
consp
directive
)
directive
(
list
directive
))
(
ecase
kw
((
:include
)
...
...
system.lisp
View file @
a3f8080e
...
...
@@ -14,8 +14,8 @@
#:find-system
#:builtin-system-p
))
;; forward-reference, defined in find-system
(
in-package
:asdf/system
)
(
defgeneric*
find-system
(
system
&optional
error-p
))
(
defgeneric*
system-source-file
(
system
)
(
defgeneric*
(
find-system
)
(
system
&optional
error-p
))
(
defgeneric*
(
system-source-file
)
(
system
)
(
:documentation
"Return the source file in which system is defined."
))
(
defgeneric*
builtin-system-p
(
system
))
...
...
@@ -55,7 +55,7 @@
in which the system specification (.asd file) is located."
(
pathname-directory-pathname
(
system-source-file
system-designator
)))
(
defun*
system-relative-pathname
(
system
name
&key
type
)
(
defun*
(
system-relative-pathname
)
(
system
name
&key
type
)
(
subpathname
(
system-source-directory
system
)
name
:type
type
))
(
defmethod
component-pathname
((
system
system
))
...
...
upgrade.lisp
View file @
a3f8080e
...
...
@@ -35,22 +35,24 @@
;; "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.26.13
5
"
)
(
asdf-version
"2.26.13
6
"
)
(
existing-asdf
(
find-class
(
find-symbol*
:component
:asdf
nil
)
nil
))
(
existing-version
*asdf-version*
)
(
already-there
(
equal
asdf-version
existing-version
))
(
redefined-functions
;; gf signature and/or semantics changed incompatibly. Oops.
'
(
#:
perform
#:explain
#:output-files
#:operation-d
one
-p
#:
component-parent-pathname
#:travers
e
#:
component-depends-on
#:input-files
#:
perform-with-restarts
#:component-relative-pathname
#:
system-source-file
#:
o
per
ate
#:
f
in
d-component
#:find-system
#:
apply-output-translati
on
s
#:component-self-dependencies
#:
system-relative-pathname
#:
inherit-source-registry
#:process-source-registry
#:
process-source-registry-directive
#:source-file-type
'
(
#:
component-relative-pathname
#:component-parent-pathname
;; comp
one
nt
#:
source-file-typ
e
#:
find-system
#:system-source-file
#:system-relative-pathname
;; system
#:
find-component
;; find-component
#:
explain
#:perform
#:per
form-with-restarts
#:in
put-files
#:output-files
;; action
#:
component-depends-
on
#:component-self-dependencies
#:operation-done-p
#:
traverse
;; plan
#:
operate
;; operate
#:
apply-output-translations
;; output-translations
#:process-output-translations-directive
#:trivial-system-p
#:inherit-source-registry
#:process-source-registry
;; source-registry
#:process-source-registry-directive
#:trivial-system-p
;; bundle
;; NB: it's too late to do anything about asdf-driver functions!
))
(
uninterned-symbols
...
...
version.lisp-expr
View file @
a3f8080e
"2.26.13
5
"
"2.26.13
6
"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment