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
Container Registry
Model registry
Operate
Environments
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
Jan Moringen
asdf
Commits
9d0f83b7
Commit
9d0f83b7
authored
14 years ago
by
Francois-Rene Rideau
Browse files
Options
Downloads
Patches
Plain Diff
1.717: eliminate some warnings with ECL or when upgrading SBCL.
parent
6dbec7fe
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-ecl.lisp
+15
-11
15 additions, 11 deletions
asdf-ecl.lisp
asdf.lisp
+14
-12
14 additions, 12 deletions
asdf.lisp
with
29 additions
and
23 deletions
asdf-ecl.lisp
+
15
−
11
View file @
9d0f83b7
...
...
@@ -66,6 +66,7 @@
(
defmethod
initialize-instance
:after
((
instance
bundle-op
)
&rest
initargs
&key
(
name-suffix
nil
name-suffix-p
)
&allow-other-keys
)
(
declare
(
ignorable
initargs
name-suffix
))
(
unless
name-suffix-p
(
setf
(
slot-value
instance
'name-suffix
)
(
if
(
bundle-op-monolithic-p
instance
)
"-mono"
""
)))
...
...
@@ -84,6 +85,7 @@
(
defvar
*force-load-p*
nil
)
(
defmethod
operation-done-p
:around
((
operation
load-op
)
c
)
(
declare
(
ignorable
operation
c
))
(
if
*force-load-p*
nil
(
call-next-method
)))
(
defun
gather-components
(
op-type
system
&key
filter-system
filter-type
include-self
)
...
...
@@ -122,6 +124,7 @@
;;; Gather the static libraries of all components.
;;;
(
defmethod
bundle-sub-operations
((
o
monolithic-bundle-op
)
c
)
(
declare
(
ignorable
o
))
(
gather-components
'lib-op
c
:filter-type
'system
:include-self
t
))
;;;
;;; STATIC LIBRARIES
...
...
@@ -141,7 +144,7 @@
;;; with the static library of this module.
;;;
(
defmethod
bundle-sub-operations
((
o
dll-op
)
c
)
(
declare
(
ignore
o
))
(
declare
(
ignor
abl
e
o
))
(
list
(
cons
(
make-instance
'lib-op
)
c
)))
;;;
;;; FASL FILES
...
...
@@ -149,7 +152,7 @@
;;; Gather the statically linked library of this component.
;;;
(
defmethod
bundle-sub-operations
((
o
fasl-op
)
c
)
(
declare
(
ignore
o
))
(
declare
(
ignor
abl
e
o
))
(
list
(
cons
(
make-instance
'lib-op
)
c
)))
(
defmethod
component-depends-on
((
o
bundle-op
)
(
c
system
))
...
...
@@ -159,11 +162,11 @@
(
component-name
dep
))))
(
defmethod
component-depends-on
((
o
lib-op
)
(
c
system
))
(
declare
(
ignore
o
))
(
declare
(
ignor
abl
e
o
))
(
list
(
list
'compile-op
(
component-name
c
))))
(
defmethod
component-depends-on
((
o
bundle-op
)
c
)
(
declare
(
ignore
o
c
))
(
declare
(
ignor
abl
e
o
c
))
nil
)
(
defmethod
input-files
((
o
bundle-op
)
(
c
system
))
...
...
@@ -177,16 +180,16 @@
(
component-relative-pathname
c
)))))
(
defmethod
output-files
((
o
fasl-op
)
(
c
system
))
(
declare
(
ignor
e
c
))
(
declare
(
ignor
able
o
c
))
(
loop
for
file
in
(
call-next-method
)
collect
(
make-pathname
:type
"fasb"
:defaults
file
)))
(
defmethod
perform
((
o
bundle-op
)
(
c
t
))
(
declare
(
ignore
o
c
))
(
declare
(
ignor
abl
e
o
c
))
t
)
(
defmethod
operation-done-p
((
o
bundle-op
)
(
c
source-file
))
(
declare
(
ignore
o
c
))
(
declare
(
ignor
abl
e
o
c
))
t
)
(
defmethod
perform
((
o
bundle-op
)
(
c
system
))
...
...
@@ -255,6 +258,7 @@
(
every
#'
(
lambda
(
c
)
(
typep
c
'compiled-file
))
(
module-components
c
)))
(
defmethod
component-depends-on
((
o
load-fasl-op
)
(
c
system
))
(
declare
(
ignorable
o
))
(
unless
(
trivial-system-p
c
)
(
subst
'load-fasl-op
'load-op
(
subst
'fasl-op
'compile-op
...
...
@@ -325,19 +329,19 @@
(
car
(
output-files
o
c
)))
(
defmethod
component-depends-on
((
o
lib-op
)
(
c
prebuilt-system
))
(
declare
(
ignore
o
c
))
(
declare
(
ignor
abl
e
o
c
))
nil
)
(
defmethod
bundle-sub-operations
((
o
lib-op
)
(
c
prebuilt-system
))
(
declare
(
ignore
o
c
))
(
declare
(
ignor
abl
e
o
c
))
nil
)
(
defmethod
bundle-sub-operations
((
o
monolithic-lib-op
)
(
c
prebuilt-system
))
(
declare
(
ignore
o
c
))
(
declare
(
ignor
abl
e
o
))
(
error
"Prebuilt system ~S shipped with ECL can not be used in a monolithic library operation."
c
))
(
defmethod
bundle-sub-operations
((
o
monolithic-bundle-op
)
(
c
prebuilt-system
))
(
declare
(
ignore
o
c
))
(
declare
(
ignor
abl
e
o
c
))
nil
)
;;;
...
...
This diff is collapsed.
Click to expand it.
asdf.lisp
+
14
−
12
View file @
9d0f83b7
...
...
@@ -70,7 +70,7 @@
:test
'equalp
:key
'car
))
(
let*
((
asdf-version
;; the 1+ helps the version bumping script discriminate
(
subseq
"VERSION:1.71
6
"
(
1+
(
length
"VERSION"
))))
(
subseq
"VERSION:1.71
7
"
(
1+
(
length
"VERSION"
))))
(
existing-asdf
(
find-package
:asdf
))
(
vername
'
#:*asdf-version*
)
(
versym
(
and
existing-asdf
...
...
@@ -316,17 +316,19 @@
(
defvar
*upgraded-p*
nil
))
(
when
*upgraded-p*
#+
ecl
(
defmethod
update-instance-for-redefined-class
:after
((
c
compile-op
)
added
deleted
plist
&key
)
(
declare
(
ignore
added
deleted
))
(
let
((
system-p
(
getf
plist
'system-p
)))
(
when
system-p
(
setf
(
getf
(
slot-value
c
'flags
)
:system-p
)
system-p
))))
(
eval
'
(
defmethod
update-instance-for-redefined-class
:after
((
m
module
)
added
deleted
plist
&key
)
(
declare
(
ignorable
deleted
plist
))
(
when
(
member
'components-by-name
added
)
(
compute-module-components-by-name
m
)))))
(
when
(
find-class
'compile-op
nil
)
(
defmethod
update-instance-for-redefined-class
:after
((
c
compile-op
)
added
deleted
plist
&key
)
(
declare
(
ignore
added
deleted
))
(
let
((
system-p
(
getf
plist
'system-p
)))
(
when
system-p
(
setf
(
getf
(
slot-value
c
'flags
)
:system-p
)
system-p
)))))
(
when
(
find-class
'module
nil
)
(
eval
'
(
defmethod
update-instance-for-redefined-class
:after
((
m
module
)
added
deleted
plist
&key
)
(
declare
(
ignorable
deleted
plist
))
(
when
(
member
'components-by-name
added
)
(
compute-module-components-by-name
m
))))))
;;;; -------------------------------------------------------------------------
;;;; User-visible parameters
...
...
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