Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
asdf
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hugo Ishimaru
asdf
Commits
cd8db039
Commit
cd8db039
authored
Mar 08, 2013
by
Francois-Rene Rideau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2.32.4: more punting with CLISP upgrade.
Can't seem to be able to fmakunbound in the same fasl as a definition.
parent
b4b713f9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
20 deletions
+42
-20
asdf.asd
asdf.asd
+1
-1
header.lisp
header.lisp
+1
-1
test/run-tests.sh
test/run-tests.sh
+1
-1
test/script-support.lisp
test/script-support.lisp
+35
-14
upgrade.lisp
upgrade.lisp
+3
-2
version.lisp-expr
version.lisp-expr
+1
-1
No files found.
asdf.asd
View file @
cd8db039
...
...
@@ -74,7 +74,7 @@
:licence
"MIT"
:description
"Another System Definition Facility"
:long-description
"ASDF builds Common Lisp software organized into defined systems."
:version
"2.32.
3
"
;; to be automatically updated by make bump-version
:version
"2.32.
4
"
;; to be automatically updated by make bump-version
:depends-on
()
#+
asdf3
:encoding
#+
asdf3
:utf-8
;; For most purposes, asdf itself specially counts as a builtin system.
...
...
header.lisp
View file @
cd8db039
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.32.
3
: Another System Definition Facility.
;;; This is ASDF 2.32.
4
: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
...
...
test/run-tests.sh
View file @
cd8db039
...
...
@@ -264,8 +264,8 @@ upgrade_methods () {
'load-asdf-lisp'load-asdf-system
'load-asdf-lisp'compile-load-asdf
'load-asdf-lisp'load-asdf-fasl
'load-asdf-lisp-and-test-uiop'load-asdf-fasl
()'load-asdf-fasl
'load-asdf-lisp-and-test-uiop'load-asdf-fasl
EOF
}
extract_tagged_asdf
()
{
...
...
test/script-support.lisp
View file @
cd8db039
...
...
@@ -356,12 +356,14 @@ is bound, write a message and exit on an error. If
(
defmacro
with-asdf-conditions
((
&optional
verbose
)
&body
body
)
`
(
call-with-asdf-conditions
#'
(
lambda
()
,@
body
)
,
verbose
))
#+
clisp
(
trace
compile-file
)
(
defun
compile-asdf
(
&optional
tag
verbose
)
(
let*
((
alisp
(
asdf-lisp
tag
))
(
afasl
(
asdf-fasl
tag
))
(
tmp
(
make-pathname
:name
"asdf-tmp"
:defaults
afasl
)))
(
ensure-directories-exist
afasl
)
(
multiple-value-bind
(
result
warnings-p
errors
-p
)
(
multiple-value-bind
(
result
warnings-p
failure
-p
)
(
compile-file
alisp
:output-file
tmp
#-
gcl
:verbose
#-
gcl
verbose
:print
verbose
)
(
flet
((
bad
(
key
)
(
when
result
(
ignore-errors
(
delete-file
result
)))
...
...
@@ -371,13 +373,20 @@ is bound, write a message and exit on an error. If
(
rename-file
tmp
afasl
)
key
))
(
cond
(
errors-p
(
bad
:errors
))
((
null
result
)
(
bad
:no-output
))
(
failure-p
(
or
#+
clisp
(
good
:expected-full-warnings
)
(
bad
:unexpected-full-warnings
)))
(
warnings-p
(
or
;; CLISP has full warnings for method redefinition in eval-when.
;; CMUCL: ?
;; ECL 11.1.1 has spurious warnings, same with XCL 0.0.0.291.
;; SCL has no warning but still raises the warningp flag since 2.20.15 (?)
#+
(
or
c
mu
ecl
scl
xcl
)
(
good
:expected
-warnings
)
(
bad
:unexpected
-warnings
)))
#+
(
or
c
lisp
cmu
ecl
scl
xcl
)
(
good
:expected-style
-warnings
)
(
bad
:unexpected-style
-warnings
)))
(
t
(
good
:success
)))))))
(
defun
maybe-compile-asdf
(
&optional
tag
)
...
...
@@ -401,22 +410,29 @@ is bound, write a message and exit on an error. If
(
leave-test
"Testsuite failed: unable to find ASDF source"
3
))
(
:previously-compiled
(
leave-test
"Reusing previously-compiled ASDF"
0
))
(
:errors
(
leave-test
"Testsuite failed: ASDF compiled with ERRORS"
2
))
(
:unexpected-warnings
(
:no-output
(
leave-test
"Testsuite failed: ASDF compilation failed without output"
1
))
(
:unexpected-full-warnings
(
leave-test
"Testsuite failed: ASDF compiled with unexpected full warnings"
1
))
(
:expected-full-warnings
(
leave-test
"ASDF compiled with full warnings, ignored for your implementation"
0
))
(
:unexpected-style-warnings
(
leave-test
"Testsuite failed: ASDF compiled with unexpected warnings"
1
))
(
:expected-warnings
(
leave-test
"ASDF compiled with warnings, ignored for your implementation"
0
))
(
:expected-
style-
warnings
(
leave-test
"ASDF compiled with
style-
warnings, ignored for your implementation"
0
))
(
:success
(
leave-test
"ASDF compiled cleanly"
0
)))))
(
defun
compile-load-asdf
(
&optional
tag
)
;; emulate the way asdf upgrades itself: load source, compile, load fasl.
(
load-asdf-lisp
tag
)
(
ecase
(
compile-asdf
tag
)
((
:errors
:unexpected-warnings
)
(
leave-test
"failed to compile ASDF"
1
))
((
:expected-warnings
:success
)
(
load-asdf-fasl
tag
))))
(
let
((
results
(
compile-asdf
tag
)))
(
ecase
results
((
:no-output
:unexpected-full-warnings
:unexpected-style-warnings
)
(
warn
"ASDF compiled with ~S"
results
)
(
leave-test
"failed to compile ASDF"
1
))
((
:expected-full-warnings
:expected-style-warnings
:success
)
(
load-asdf-fasl
tag
)))))
;;; Now, functions to compile and load ASDF.
...
...
@@ -508,7 +524,8 @@ is bound, write a message and exit on an error. If
(
register-directory
*uiop-directory*
)
(
register-directory
*test-directory*
)
(
DBG
:lalatu
(
asymval
:*central-registry*
))
(
acall
:oos
(
asym
:load-op
)
:uiop
)
(
quietly
(
acall
:oos
(
asym
:load-op
)
:uiop
))
(
acall
:oos
(
asym
:load-op
)
:test-module-depend
))
(
defun
load-asdf
(
&optional
tag
)
...
...
@@ -560,6 +577,10 @@ is bound, write a message and exit on an error. If
(
funcall
old-method
tag
))))
(
when
(
find-package
:asdf
)
(
configure-asdf
))
(
when
(
and
(
null
old-method
)
(
eq
'load-asdf-fasl
new-method
)
(
not
(
probe-file
(
asdf-fasl
))))
(
if
(
ignore-errors
(
funcall
'require
"asdf"
)
t
)
(
leave-test
"Your failed to compile ASDF before your run (test-upgrade ()'load-asdf-fasl ...)"
1
)
(
leave-test
"Your Lisp doesn't provide ASDF. Skipping (test-upgrade ()'load-asdf-fasl ...)"
0
)))
(
format
t
"Now loading new asdf via method ~A~%"
new-method
)
(
funcall
new-method
)
(
format
t
"Testing it~%"
)
...
...
upgrade.lisp
View file @
cd8db039
...
...
@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(
asdf-version
"2.32.
3
"
)
(
asdf-version
"2.32.
4
"
)
(
existing-version
(
asdf-version
)))
(
setf
*asdf-version*
asdf-version
)
(
when
(
and
existing-version
(
not
(
equal
asdf-version
existing-version
)))
...
...
@@ -89,7 +89,8 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
(
loop
:for
name
:in
(
append
redefined-functions
)
:for
sym
=
(
find-symbol*
name
:asdf
nil
)
:do
(
when
sym
(
fmakunbound
sym
)))
;; On CLISP we seem to be unable to fmakunbound and define a function in the same fasl. Sigh.
#-
clisp
(
fmakunbound
sym
)))
(
loop
:with
asdf
=
(
find-package
:asdf
)
:for
name
:in
uninterned-symbols
:for
sym
=
(
find-symbol*
name
:asdf
nil
)
...
...
version.lisp-expr
View file @
cd8db039
"2.32.
3
"
"2.32.
4
"
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