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
f3c080cc
Commit
f3c080cc
authored
15 years ago
by
Francois-Rene Rideau
Browse files
Options
Downloads
Patches
Plain Diff
1.653: Fix typo that broke ECL (thanks to janderson).
Remove extra output translations and source-registry entries from end.
parent
440adb88
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
asdf.lisp
+7
-15
7 additions, 15 deletions
asdf.lisp
with
7 additions
and
15 deletions
asdf.lisp
+
7
−
15
View file @
f3c080cc
...
...
@@ -75,7 +75,7 @@
(
remove-if
#'
null
(
mapcar
#'
find-package
(
cons
name
nicknames
)))
:from-end
nil
)))
:from-end
t
)))
(
cond
(
previous
(
map
()
#'
rename-away
(
cdr
previous
))
;; packages with conflicting (nick)names
...
...
@@ -158,7 +158,7 @@
:unintern
`
(
#-
ecl
,@
redefined-functions
#:*asdf-revision*
#:around
#:asdf-method-combination
#:split
#:make-collector
)
:fmakunbound
'
(
#+
ecl
,@
redefined-functions
:fmakunbound
`
(
#+
ecl
,@
redefined-functions
#:system-source-file
#:component-relative-pathname
#:system-relative-pathname
#:process-source-registry
...
...
@@ -262,7 +262,7 @@
;; This parameter isn't actually user-visible
;; -- please use the exported function ASDF:ASDF-VERSION below.
;; the 1+ hair is to ensure that we don't do an inadvertent find and replace
(
subseq
"VERSION:1.65
2
"
(
1+
(
length
"VERSION"
))))
(
subseq
"VERSION:1.65
3
"
(
1+
(
length
"VERSION"
))))
(
defun
asdf-version
()
"Exported interface to the version of ASDF currently installed. A string.
...
...
@@ -598,15 +598,7 @@ actually-existing directory."
"Converts the non-wild pathname designator PATHSPEC to directory form."
(
cond
((
stringp
pathspec
)
(
pathname
(
let
((
lastchar
(
aref
pathspec
(
1-
(
length
pathspec
)))))
(
cond
((
or
(
eql
lastchar
#\;
)
(
eql
lastchar
#\/
))
pathspec
)
((
find
#\;
pathspec
)
;; assume a ; means a logical pathname directory separator
(
concatenate
'string
pathspec
";"
))
(
t
;; guess it's a string that's not a logical
;; pathname string
(
concatenate
'string
pathspec
"/"
))))))
(
ensure-directory-pathname
(
pathname
pathspec
)))
((
not
(
pathnamep
pathspec
))
(
error
"Invalid pathname designator ~S"
pathspec
))
((
wild-pathname-p
pathspec
)
...
...
@@ -2522,7 +2514,7 @@ with a different configuration, so the configuration would be re-read then."
(
while-collecting
(
c
)
(
inherit-output-translations
`
(
wrapping-output-translations
,
parameter
,@
*default-output-translations*
)
:collect
#'
c
))
:test
'equal
:from-end
nil
))
:test
'equal
:from-end
t
))
(
defun
initialize-output-translations
(
&optional
parameter
)
"read the configuration, initialize the internal configuration variable,
...
...
@@ -2761,7 +2753,7 @@ with a different configuration, so the configuration would be re-read then."
#+
sbcl
#+
sbcl
:resolve-symlinks
nil
#+
clisp
#+
clisp
:circle
t
)))
(
dirs
(
remove-duplicates
(
mapcar
#'
pathname-directory-pathname
files
)
:test
#'
equal
)))
:test
#'
equal
:from-end
t
)))
(
loop
:for
dir
:in
dirs
:unless
(
loop
:for
x
:in
exclude
...
...
@@ -2881,7 +2873,7 @@ with a different configuration, so the configuration would be re-read then."
,@
*default-source-registries*
)
:register
(
lambda
(
directory
&key
recurse
exclude
)
(
collect
(
list
directory
:recurse
recurse
:exclude
exclude
)))))
:test
'equal
:from-end
nil
))
:test
'equal
:from-end
t
))
;; Will read the configuration and initialize all internal variables,
;; and return the new configuration.
...
...
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