Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asdf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tarn Burton
asdf
Commits
dcac2a07
Commit
dcac2a07
authored
12 years ago
by
Francois-Rene Rideau
Browse files
Options
Downloads
Patches
Plain Diff
2.20.19: be more robust when upgrading from ASDF 1 on old SBCLs (e.g. 1.0.29).
parent
71c9441d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
asdf.asd
+1
-1
1 addition, 1 deletion
asdf.asd
asdf.lisp
+29
-26
29 additions, 26 deletions
asdf.lisp
with
30 additions
and
27 deletions
asdf.asd
+
1
−
1
View file @
dcac2a07
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
:licence
"MIT"
:licence
"MIT"
:description
"Another System Definition Facility"
:description
"Another System Definition Facility"
:long-description
"ASDF builds Common Lisp software organized into defined systems."
:long-description
"ASDF builds Common Lisp software organized into defined systems."
:version
"2.20.1
8
"
;; to be automatically updated by bin/bump-revision
:version
"2.20.1
9
"
;; to be automatically updated by bin/bump-revision
:depends-on
()
:depends-on
()
:components
:components
((
:file
"asdf"
)
((
:file
"asdf"
)
...
...
This diff is collapsed.
Click to expand it.
asdf.lisp
+
29
−
26
View file @
dcac2a07
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.20.1
8
: Another System Definition Facility.
;;; This is ASDF 2.20.1
9
: Another System Definition Facility.
;;;
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
;;; please mail to <asdf-devel@common-lisp.net>.
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
;; "2.345.6" would be a development version in the official upstream
;; "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.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
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(
asdf-version
"2.20.1
8
"
)
(
asdf-version
"2.20.1
9
"
)
(
existing-asdf
(
find-class
'component
nil
))
(
existing-asdf
(
find-class
'component
nil
))
(
existing-version
*asdf-version*
)
(
existing-version
*asdf-version*
)
(
already-there
(
equal
asdf-version
existing-version
)))
(
already-there
(
equal
asdf-version
existing-version
)))
...
@@ -1123,22 +1123,22 @@ processed in order by OPERATE."))
...
@@ -1123,22 +1123,22 @@ processed in order by OPERATE."))
;;;; -------------------------------------------------------------------------
;;;; -------------------------------------------------------------------------
;;; Methods in case of hot-upgrade. See https://bugs.launchpad.net/asdf/+bug/485687
;;; Methods in case of hot-upgrade. See https://bugs.launchpad.net/asdf/+bug/485687
(
when
*upgraded-p*
(
when
*upgraded-p*
(
when
(
find-class
'module
nil
)
(
when
(
find-class
'module
nil
)
(
eval
(
eval
'
(
defmethod
update-instance-for-redefined-class
:after
'
(
defmethod
update-instance-for-redefined-class
:after
((
m
module
)
added
deleted
plist
&key
)
((
m
module
)
added
deleted
plist
&key
)
(
declare
(
ignorable
deleted
plist
))
(
declare
(
ignorable
deleted
plist
))
(
when
*asdf-verbose*
(
when
*asdf-verbose*
(
asdf-message
(
compatfmt
"~&~@<; ~@;Updating ~A for ASDF ~A~@:>~%"
)
(
asdf-message
(
compatfmt
"~&~@<; ~@;Updating ~A for ASDF ~A~@:>~%"
)
m
(
asdf-version
)))
m
(
asdf-version
)))
(
when
(
member
'components-by-name
added
)
(
when
(
member
'components-by-name
added
)
(
compute-module-components-by-name
m
))
(
compute-module-components-by-name
m
))
(
when
(
typep
m
'system
)
(
when
(
typep
m
'system
)
(
when
(
member
'source-file
added
)
(
when
(
member
'source-file
added
)
(
%set-system-source-file
(
%set-system-source-file
(
probe-asd
(
component-name
m
)
(
component-pathname
m
))
m
)
(
probe-asd
(
component-name
m
)
(
component-pathname
m
))
m
)
(
when
(
equal
(
component-name
m
)
"asdf"
)
(
when
(
equal
(
component-name
m
)
"asdf"
)
(
setf
(
component-version
m
)
*asdf-version*
))))))))
(
setf
(
component-version
m
)
*asdf-version*
))))))))
;;;; -------------------------------------------------------------------------
;;;; -------------------------------------------------------------------------
;;;; Classes, Conditions
;;;; Classes, Conditions
...
@@ -1811,10 +1811,12 @@ Going forward, we recommend new users should be using the source-registry.
...
@@ -1811,10 +1811,12 @@ Going forward, we recommend new users should be using the source-registry.
(
defun*
locate-system
(
name
)
(
defun*
locate-system
(
name
)
"Given a system NAME designator, try to locate where to load the system from.
"Given a system NAME designator, try to locate where to load the system from.
Returns four values: FOUND-SYSTEM PATHNAME PREVIOUS PREVIOUS-TIME
Returns five values: FOUNDP FOUND-SYSTEM PATHNAME PREVIOUS PREVIOUS-TIME
FOUNDP is true when a new was found, either a new unregistered one or a previously registered one.
FOUNDP is true when a system was found,
either a new unregistered one or a previously registered one.
FOUND-SYSTEM when not null is a SYSTEM object that may be REGISTER-SYSTEM'ed as is
FOUND-SYSTEM when not null is a SYSTEM object that may be REGISTER-SYSTEM'ed as is
PATHNAME when not null is a path from where to load the system, associated with FOUND-SYSTEM, or with the PREVIOUS system.
PATHNAME when not null is a path from where to load the system,
either associated with FOUND-SYSTEM, or with the PREVIOUS system.
PREVIOUS when not null is a previously loaded SYSTEM object of same name.
PREVIOUS when not null is a previously loaded SYSTEM object of same name.
PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded."
PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded."
(
let*
((
name
(
coerce-name
name
))
(
let*
((
name
(
coerce-name
name
))
...
@@ -1822,14 +1824,11 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded.
...
@@ -1822,14 +1824,11 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded.
(
previous
(
cdr
in-memory
))
(
previous
(
cdr
in-memory
))
(
previous
(
and
(
typep
previous
'system
)
previous
))
(
previous
(
and
(
typep
previous
'system
)
previous
))
(
previous-time
(
car
in-memory
))
(
previous-time
(
car
in-memory
))
(
found
(
search-for-system-definition
name
))
(
found
(
search-for-system-definition
name
))
(
found-system
(
and
(
typep
found
'system
)
found
))
(
found-system
(
and
(
typep
found
'system
)
found
))
(
pathname
(
or
(
and
(
typep
found
'
(
or
pathname
string
))
(
pathname
found
))
(
pathname
(
or
(
and
(
typep
found
'
(
or
pathname
string
))
(
pathname
found
))
(
and
found-system
(
system-source-file
found-system
))
(
and
found-system
(
system-source-file
found-system
))
(
and
previous
(
and
previous
(
system-source-file
previous
))))
;; might be missing when upgrading from ASDF 1.
(
slot-boundp
previous
'source-file
)
(
system-source-file
previous
))))
(
foundp
(
and
(
or
found-system
pathname
previous
)
t
)))
(
foundp
(
and
(
or
found-system
pathname
previous
)
t
)))
(
check-type
found
(
or
null
pathname
system
))
(
check-type
found
(
or
null
pathname
system
))
(
when
foundp
(
when
foundp
...
@@ -3124,6 +3123,10 @@ if that's whay you mean." ;;)
...
@@ -3124,6 +3123,10 @@ if that's whay you mean." ;;)
(
system-source-file
x
))
(
system-source-file
x
))
(
defmethod
system-source-file
((
system
system
))
(
defmethod
system-source-file
((
system
system
))
;; might be missing when upgrading from ASDF 1 and u-i-f-r-c failed
(
unless
(
slot-boundp
system
'source-file
)
(
%set-system-source-file
(
probe-asd
(
component-name
system
)
(
component-pathname
system
))
system
))
(
%system-source-file
system
))
(
%system-source-file
system
))
(
defmethod
system-source-file
((
system-name
string
))
(
defmethod
system-source-file
((
system-name
string
))
(
%system-source-file
(
find-system
system-name
)))
(
%system-source-file
(
find-system
system-name
)))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment