Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Hugo Ishimaru
asdf
Commits
79a01889
Commit
79a01889
authored
Jul 02, 2014
by
Francois-Rene Rideau
Browse files
Expand all tabs. Will make SBCL happier.
parent
a9ff4e6f
Changes
7
Hide whitespace changes
Inline
Side-by-side
cache.lisp
View file @
79a01889
...
...
@@ -5,7 +5,7 @@
(
:use
:uiop/common-lisp
:uiop
:asdf/upgrade
)
(
:export
#:get-file-stamp
#:compute-file-stamp
#:register-file-stamp
#:set-asdf-cache-entry
#:unset-asdf-cache-entry
#:consult-asdf-cache
#:do-asdf-cache
#:normalize-namestring
#:do-asdf-cache
#:normalize-namestring
#:call-with-asdf-cache
#:with-asdf-cache
#:*asdf-cache*
))
(
in-package
:asdf/cache
)
...
...
find-component.lisp
View file @
79a01889
...
...
@@ -107,10 +107,10 @@
(
and
(
typep
c
'missing-dependency
)
(
eq
(
missing-required-by
c
)
component
)
(
equal
(
missing-requires
c
)
name
))))
(
unless
(
component-parent
component
)
(
let
((
name
(
coerce-name
name
)))
(
unset-asdf-cache-entry
`
(
find-system
,
name
))
(
unset-asdf-cache-entry
`
(
locate-system
,
name
))))))))
(
unless
(
component-parent
component
)
(
let
((
name
(
coerce-name
name
)))
(
unset-asdf-cache-entry
`
(
find-system
,
name
))
(
unset-asdf-cache-entry
`
(
locate-system
,
name
))))))))
(
defun
resolve-dependency-spec
(
component
dep-spec
)
...
...
test/dll-test.lisp
View file @
79a01889
...
...
@@ -6,7 +6,7 @@ extern int sample_function();
int sample_function()
{
return 42;
return 42;
}
"
)
...
...
@@ -16,6 +16,6 @@ extern MKCL_DLLEXPORT int sample_function(void);
int sample_function(void)
{
return 42;
return 42;
}
"
)
test/monodll-1.lisp
View file @
79a01889
...
...
@@ -6,7 +6,7 @@ extern int always_7();
int always_7()
{
return 7;
return 7;
}
"
)
...
...
@@ -16,6 +16,6 @@ extern MKCL_DLLEXPORT int always_7(void);
int always_7(void)
{
return 7;
return 7;
}
"
)
test/monodll.lisp
View file @
79a01889
...
...
@@ -6,7 +6,7 @@ extern int always_42();
int always_42()
{
return 6*always_7();
return 6*always_7();
}
"
)
...
...
@@ -16,6 +16,6 @@ extern MKCL_DLLEXPORT int always_42(void);
int always_42(void)
{
return 6*always_7();
return 6*always_7();
}
"
)
uiop/pathname.lisp
View file @
79a01889
...
...
@@ -580,7 +580,7 @@ when used with MERGE-PATHNAMES* with defaults BASE-PATHNAME, returns MAYBE-SUBPA
"if MAYBE-SUBPATH is a pathname that is under BASE-PATHNAME, return a pathname object that
when used with MERGE-PATHNAMES* with defaults BASE-PATHNAME, returns MAYBE-SUBPATH."
(
let
((
sub
(
when
maybe-subpath
(
pathname
maybe-subpath
)))
(
base
(
when
base-pathname
(
ensure-absolute-pathname
(
pathname
base-pathname
)))))
(
base
(
when
base-pathname
(
ensure-absolute-pathname
(
pathname
base-pathname
)))))
(
or
(
and
base
(
subpathp
sub
base
))
sub
)))
(
defun
call-with-enough-pathname
(
maybe-subpath
defaults-pathname
thunk
)
...
...
upgrade.lisp
View file @
79a01889
...
...
@@ -79,26 +79,26 @@ previously-loaded version of ASDF."
(
when-upgrading
()
(
let
((
redefined-functions
;; gf signature and/or semantics changed incompatibly. Oops.
;; NB: it's too late to do anything about functions in UIOP!
;; If you introduce some critically incompatibility there, you must change name.
;; NB: it's too late to do anything about functions in UIOP!
;; If you introduce some critically incompatibility there, you must change name.
'
(
#:component-relative-pathname
#:component-parent-pathname
;; component
#:source-file-type
#:find-system
#:system-source-file
#:system-relative-pathname
;; system
#:find-component
;; find-component
#:explain
#:perform
#:perform-with-restarts
#:input-files
#:output-files
;; action
#:component-depends-on
#:operation-done-p
#:component-depends-on
#:traverse
;; backward-interface
#:find-component
;; find-component
#:explain
#:perform
#:perform-with-restarts
#:input-files
#:output-files
;; action
#:component-depends-on
#:operation-done-p
#:component-depends-on
#:traverse
;; backward-interface
#:map-direct-dependencies
#:reduce-direct-dependencies
#:direct-dependencies
;; plan
#:operate
;; operate
#:parse-component-form
;; defsystem
#:apply-output-translations
;; output-translations
#:process-output-translations-directive
#:inherit-source-registry
#:process-source-registry
;; source-registry
#:process-source-registry-directive
#:trivial-system-p
))
;; bundle
(
redefined-classes
#:operate
;; operate
#:parse-component-form
;; defsystem
#:apply-output-translations
;; output-translations
#:process-output-translations-directive
#:inherit-source-registry
#:process-source-registry
;; source-registry
#:process-source-registry-directive
#:trivial-system-p
))
;; bundle
(
redefined-classes
;; redefining the classes causes interim circularities
;; with the old ASDF during upgrade, and many implementations bork
;; with the old ASDF during upgrade, and many implementations bork
'
((
#:compile-concatenated-source-op
(
#:operation
)
()))))
(
loop
:for
name
:in
redefined-functions
:for
sym
=
(
find-symbol*
name
:asdf
nil
)
:do
...
...
@@ -106,12 +106,12 @@ previously-loaded version of ASDF."
;; On CLISP we seem to be unable to fmakunbound and define a function in the same fasl. Sigh.
#-
clisp
(
fmakunbound
sym
)))
(
labels
((
asym
(
x
)
(
multiple-value-bind
(
s
p
)
(
if
(
consp
x
)
(
values
(
car
x
)
(
cadr
x
))
(
values
x
:asdf
))
(
find-symbol*
s
p
nil
)))
(
asyms
(
l
)
(
mapcar
#'
asym
l
)))
(
find-symbol*
s
p
nil
)))
(
asyms
(
l
)
(
mapcar
#'
asym
l
)))
(
loop*
:for
(
name
superclasses
slots
)
:in
redefined-classes
:for
sym
=
(
find-symbol*
name
:asdf
nil
)
:when
(
and
sym
(
find-class
sym
))
:do
(
eval
`
(
defclass
,
sym
,
(
asyms
superclasses
)
,
(
asyms
slots
)))))))
:for
sym
=
(
find-symbol*
name
:asdf
nil
)
:when
(
and
sym
(
find-class
sym
))
:do
(
eval
`
(
defclass
,
sym
,
(
asyms
superclasses
)
,
(
asyms
slots
)))))))
;;; Self-upgrade functions
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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