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
0
Issues
0
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
Jan Moringen
asdf
Commits
7ba708cb
Commit
7ba708cb
authored
Jan 16, 2013
by
Francois-Rene Rideau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2.26.104: get program-op to work alright on ECL.
Some attempts at making things work for ABCL and CLISP.
parent
80b45e97
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
42 additions
and
31 deletions
+42
-31
asdf.asd
asdf.asd
+1
-1
bundle.lisp
bundle.lisp
+6
-5
compatibility.lisp
compatibility.lisp
+1
-0
header.lisp
header.lisp
+1
-1
image.lisp
image.lisp
+1
-1
lisp-build.lisp
lisp-build.lisp
+2
-2
package.lisp
package.lisp
+13
-11
pathname.lisp
pathname.lisp
+1
-1
test/make-hello-world.lisp
test/make-hello-world.lisp
+1
-0
test/run-tests.sh
test/run-tests.sh
+8
-5
test/script-support.lisp
test/script-support.lisp
+2
-2
test/test-encodings.script
test/test-encodings.script
+3
-0
upgrade.lisp
upgrade.lisp
+1
-1
version.lisp-expr
version.lisp-expr
+1
-1
No files found.
asdf.asd
View file @
7ba708cb
...
...
@@ -15,7 +15,7 @@
:licence
"MIT"
:description
"Another System Definition Facility"
:long-description
"ASDF builds Common Lisp software organized into defined systems."
:version
"2.26.10
3
"
;; to be automatically updated by bin/bump-revision
:version
"2.26.10
4
"
;; to be automatically updated by bin/bump-revision
:depends-on
()
:components
((
:module
"build"
:components
((
:file
"asdf"
))))
:in-order-to
(
#+
asdf2.27
(
compile-op
(
monolithic-load-concatenated-source-op
generate-asdf
))))
...
...
bundle.lisp
View file @
7ba708cb
...
...
@@ -7,7 +7,7 @@
:asdf/component
:asdf/system
:asdf/find-system
:asdf/find-component
:asdf/operation
:asdf/action
:asdf/lisp-action
:asdf/plan
:asdf/operate
)
(
:export
#:bundle-op
#:bundle-op-build-args
#:bundle-type
#:bundle-system
#:bundle-op
#:bundle-op-build-args
#:bundle-type
#:bundle-system
#:bundle-pathname-type
#:fasl-op
#:load-fasl-op
#:lib-op
#:dll-op
#:binary-op
#:monolithic-op
#:monolithic-bundle-op
#:dependency-files
#:monolithic-binary-op
#:monolithic-fasl-op
#:monolithic-lib-op
#:monolithic-dll-op
...
...
@@ -266,7 +266,8 @@
(
defmethod
component-depends-on
((
o
program-op
)
(
c
system
))
(
declare
(
ignorable
o
))
`
((
#+
(
or
ecl
mkcl
)
monolithic-lib-op
#-
(
or
ecl
mkcl
)
load-op
,
c
)))
#+
(
or
ecl
mkcl
)
(
component-depends-on
(
make-operation
'monolithic-lib-op
)
c
)
#-
(
or
ecl
mkcl
)
`
((
load-op
,
c
)))
(
defmethod
component-depends-on
((
o
binary-op
)
(
c
system
))
(
declare
(
ignorable
o
))
...
...
@@ -491,12 +492,12 @@
:init-name
init-name
:lisp-files
(
append
object-files
(
bundle-op-lisp-files
o
))
(
append
(
bundle-op-build-args
o
)
(
when
(
typep
o
'program-op
)
`
(
:prologue-code
(
restore-image
:entry-point
,
(
component-entry-point
c
))))
(
when
(
and
(
typep
o
'monolithic-bundle-op
)
(
monolithic-op-prologue-code
o
))
`
(
:prologue-code
,
(
monolithic-op-prologue-code
o
)))
(
when
(
typep
o
'program-op
)
`
(
:epilogue-code
(
restore-image
:entry-point
,
(
component-entry-point
c
))))
(
when
(
and
(
typep
o
'monolithic-bundle-op
)
(
monolithic-op-epilogue-code
o
))
`
(
:epilogue-code
,
(
monolithic-op-epilogue-code
o
)))))))
...
...
compatibility.lisp
View file @
7ba708cb
...
...
@@ -45,6 +45,7 @@
#+
ecl
(
eval-when
(
:load-toplevel
:compile-toplevel
:execute
)
(
setf
*load-verbose*
nil
)
(
defun
use-ecl-byte-compiler-p
()
(
and
(
member
:ecl-bytecmp
*features*
)
t
))
(
unless
(
use-ecl-byte-compiler-p
)
(
require
:cmp
)))
...
...
header.lisp
View file @
7ba708cb
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.10
3
: Another System Definition Facility.
;;; This is ASDF 2.26.10
4
: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
...
...
image.lisp
View file @
7ba708cb
...
...
@@ -226,7 +226,7 @@ if we are not called from a directly executable image dumped by XCVB."
(
standard-eval-thunk
*image-prelude*
)
(
let
((
results
(
multiple-value-list
(
if
*image-entry-point*
(
apply
*image-entry-point*
*command-line-arguments*
)
(
apply
(
ensure-function
*image-entry-point*
)
*command-line-arguments*
)
t
))))
(
if
*lisp-interaction*
(
apply
'values
results
)
...
...
lisp-build.lisp
View file @
7ba708cb
...
...
@@ -20,7 +20,7 @@
#:current-lisp-file-pathname
#:lispize-pathname
#:compile-file-type
#:call-around-hook
#:compile-file*
#:compile-file-pathname*
#:load*
#:load-from-string
#:combine-fasls
)
(
:intern
#:defaults
#:failure-p
#:warnings-p
))
(
:intern
#:defaults
#:failure-p
#:warnings-p
#:s
#:y
#:body
))
(
in-package
:asdf/lisp-build
)
(
defvar
*compile-file-warnings-behaviour*
...
...
@@ -171,7 +171,7 @@ for processing later (possibly in a different process)."
"pathname TYPE for lisp FASt Loading files"
(
declare
(
ignorable
keys
))
#-
(
or
ecl
mkcl
)
(
load-time-value
(
pathname-type
(
compile-file-pathname
"foo.lisp"
)))
#+
(
or
ecl
mkcl
)
(
pathname-type
(
apply
'compile-file-pathname
"foo
.lisp
"
keys
)))
#+
(
or
ecl
mkcl
)
(
pathname-type
(
apply
'compile-file-pathname
"foo"
keys
)))
(
defun*
call-around-hook
(
hook
function
)
(
call-function
(
or
hook
'funcall
)
function
))
...
...
package.lisp
View file @
7ba708cb
...
...
@@ -343,42 +343,42 @@ or when loading the package is optional."
(
when-fishy
(
record-fishy
name
))
(
labels
((
ensure-shadowing-import
(
name
p
)
(
let
((
import
(
find-symbol*
name
p
)))
(
let
((
import
-me
(
find-symbol*
name
p
)))
(
multiple-value-bind
(
existing
status
)
(
find-symbol
name
package
)
(
cond
((
gethash
name
shadowed
)
(
unless
(
eq
import
existing
)
(
unless
(
eq
import
-me
existing
)
(
error
"Conflicting shadowings for ~A"
name
)))
(
t
(
setf
(
gethash
name
shadowed
)
t
)
(
setf
(
gethash
name
imported
)
t
)
(
unless
(
or
(
null
status
)
(
and
(
member
status
'
(
:internal
:external
))
(
eq
existing
import
)
(
eq
existing
import
-me
)
(
symbol-shadowing-p
existing
package
)))
(
fishy
:shadowing-import
name
(
package-name
p
)
(
symbol-package-name
import
)
name
(
package-name
p
)
(
symbol-package-name
import
-me
)
(
and
status
(
symbol-package-name
existing
))
status
))
(
shadowing-import
import
package
))))))
(
shadowing-import
import
-me
package
))))))
(
ensure-import
(
sym
p
)
(
let*
((
name
(
string
sym
))
(
import
(
find-symbol*
name
p
)))
(
import
-me
(
find-symbol*
name
p
)))
(
multiple-value-bind
(
existing
status
)
(
find-symbol
name
package
)
(
cond
((
gethash
name
imported
)
(
unless
(
eq
import
existing
)
(
unless
(
eq
import
-me
existing
)
(
error
"Can't import ~S from both ~S and ~S"
name
(
package-name
(
symbol-package
existing
))
(
package-name
p
))))
((
gethash
name
shadowed
)
(
error
"Can't both shadow ~S and import it from ~S"
name
(
package-name
p
)))
(
t
(
setf
(
gethash
name
imported
)
t
)
(
unless
(
and
status
(
eq
import
existing
))
(
unless
(
and
status
(
eq
import
-me
existing
))
(
when
status
(
unintern*
existing
package
)
(
fishy
:import
name
(
package-name
p
)
(
symbol-package-name
import
)
(
fishy
:import
name
(
package-name
p
)
(
symbol-package-name
import
-me
)
(
and
status
(
symbol-package-name
existing
))
status
))
(
import
import
package
)))))))
(
import
import
-me
package
)))))))
(
ensure-mix
(
name
symbol
p
)
(
unless
(
gethash
name
shadowed
)
(
multiple-value-bind
(
existing
status
)
(
find-symbol
name
package
)
...
...
@@ -588,7 +588,9 @@ or when loading the package is optional."
(
eval-when
(
:compile-toplevel
:load-toplevel
:execute
)
,
ensure-form
)
#+
(
or
ecl
gcl
)
(
defpackage
,
package
(
:use
))
#+
clisp
,
(
package-definition-form
package
:error
nil
)
#+
clisp
,
(
package-definition-form
package
:nicknamesp
nil
:usep
nil
:internp
nil
:exportp
nil
:error
nil
)
(
eval-when
(
:compile-toplevel
:load-toplevel
:execute
)
,
ensure-form
))))
...
...
pathname.lisp
View file @
7ba708cb
...
...
@@ -723,7 +723,7 @@ then it is merged with the PATHNAME-DIRECTORY-PATHNAME of PATHNAME."
#-
allegro
(
truenamize
path
)
#+
allegro
(
if
(
physical-pathname-p
path
)
(
excl:pathname-resolve-symbolic-links
path
)
(
or
(
ignore-errors
(
excl:pathname-resolve-symbolic-links
path
))
path
)
path
))
(
defun*
resolve-symlinks*
(
path
)
...
...
test/make-hello-world.lisp
View file @
7ba708cb
...
...
@@ -5,4 +5,5 @@
(
with-test
()
(
register-directory
*asdf-directory*
)
;; we need asdf-driver, and ECL can dump.
(
operate
'load-fasl-op
:hello-world-example
)
(
operate
'program-op
:hello-world-example
))
test/run-tests.sh
View file @
7ba708cb
...
...
@@ -208,8 +208,8 @@ create_config () {
mkdir
-p
../build/test-source-registry-conf.d ../build/test-asdf-output-translations-conf.d
}
upgrade_tags
()
{
if
[
-n
"
$
TEST_ASDF
_TAGS
"
]
;
then
echo
$
TEST_ASDF
_TAGS
;
return
if
[
-n
"
$
ASDF_UPGRADE_TEST
_TAGS
"
]
;
then
echo
$
ASDF_UPGRADE_TEST
_TAGS
;
return
fi
# REQUIRE is a magic tag meaning whatever your implementation provides
# 1.37 is the last release by Daniel Barlow
...
...
@@ -222,8 +222,8 @@ upgrade_tags () {
git tag
-l
'2.??'
}
upgrade_methods
()
{
if
[
-n
"
$
TEST_ASDF
_METHODS
"
]
;
then
echo
$
TEST_ASDF
_METHODS
;
return
if
[
-n
"
$
ASDF_UPGRADE_TEST
_METHODS
"
]
;
then
echo
$
ASDF_UPGRADE_TEST
_METHODS
;
return
fi
cat
<<
EOF
'load-asdf-lisp'load-asdf-system
...
...
@@ -281,7 +281,10 @@ run_upgrade_tests () {
extract_tagged_asdf
$tag
$command
$eval
\
"'(#.(load
\"
$su
\"
)#.(in-package :asdf-test)#.(test-upgrade
$method
\"
$tag
\"
))"
||
{
echo
"upgrade FAILED for
$lisp
from
$tag
using method
$method
"
;
exit
1
;
}
{
echo
"upgrade FAILED for
$lisp
from
$tag
using method
$method
"
;
echo
"you can retry just that test with:"
;
echo
ASDF_UPGRADE_TEST_TAGS
=
\"
$tag
\"
ADSF_UPGRADE_TEST_METHODS
=
\"
$method
\"
./test/run-tests.sh
-u
$lisp
;
exit
1
;
}
fi
;
done
;
done
2>&1 |
tee
build/results/
${
lisp
}
-upgrade
.text
}
run_tests
()
{
...
...
test/script-support.lisp
View file @
7ba708cb
...
...
@@ -351,10 +351,10 @@ is bound, write a message and exit on an error. If
(
with-test
()
(
when
old-method
(
cond
((
equal
tag
"REQUIRE"
)
((
string-
equal
tag
"REQUIRE"
)
(
format
t
"Requiring some previous asdf ~A~%"
tag
)
(
ignore-errors
(
funcall
'require
"asdf"
))
(
unless
(
member
"ASDF"
*modules*
:test
'equal
)
(
unless
(
member
"ASDF"
*modules*
:test
'equal
p
)
(
leave-test
"Your Lisp implementation does not provide ASDF. Skipping test.~%"
0
)))
(
t
(
format
t
"Loading old asdf ~A via ~A~%"
tag
old-method
)
...
...
test/test-encodings.script
View file @
7ba708cb
...
...
@@ -46,6 +46,9 @@
#-asdf-unicode
(leave-test "No Unicode support to test on this lisp implementation" 0)
#+abcl
(leave-test "abcl is known to fail these tests. Go update asdf-encodings" 0)
;; NB: recent clozure can autodetect without asdf-encodings with :default (!)
#+sbcl
...
...
upgrade.lisp
View file @
7ba708cb
...
...
@@ -45,7 +45,7 @@
;; "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.6.7" would be your seventh local modification of development version 2.345.6
(
asdf-version
"2.26.10
3
"
)
(
asdf-version
"2.26.10
4
"
)
(
existing-asdf
(
find-class
(
find-symbol*
:component
:asdf
nil
)
nil
))
(
existing-version
*asdf-version*
)
(
already-there
(
equal
asdf-version
existing-version
)))
...
...
version.lisp-expr
View file @
7ba708cb
"2.26.10
3
"
"2.26.10
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