Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
asdf
asdf
Commits
720ecf51
Commit
720ecf51
authored
Feb 12, 2014
by
Robert P. Goldman
Browse files
Incorporated Mark Evenson's check for ABCL bundle support on Mac OS X.
Proposed fix for
https://bugs.launchpad.net/asdf/+bug/1207073
parent
e1f6ad14
Changes
3
Hide whitespace changes
Inline
Side-by-side
bundle.lisp
View file @
720ecf51
...
...
@@ -483,7 +483,8 @@ itself.")) ;; operation on a system and its dependencies
(
apply
#'
operate
'binary-op
system
args
)))
#+
(
and
(
not
asdf-use-unsafe-mac-bundle-op
)
(
or
(
and
ecl
darwin
)
(
and
abcl
darwin
)))
(
or
(
and
ecl
darwin
)
(
and
abcl
darwin
(
not
abcl-bundle-op-supported
))))
(
defmethod
perform
:before
((
o
basic-fasl-op
)
(
c
component
))
(
unless
(
featurep
:asdf-use-unsafe-mac-bundle-op
)
(
cerror
"Continue after modifying *FEATURES*."
...
...
header.lisp
View file @
720ecf51
...
...
@@ -53,6 +53,13 @@
(
eval-when
(
:load-toplevel
:compile-toplevel
:execute
)
(
setf
ext:*gc-verbose*
nil
))
;;; pre 1.3.0 ABCL versions do not support the bundle-op on Mac OS X
#+
abcl
(
eval-when
(
:load-toplevel
:compile-toplevel
:execute
)
(
unless
(
and
(
member
:darwin
*features*
)
(
second
(
third
(
sys::arglist
'directory
))))
(
push
:abcl-bundle-op-supported
*features*
)))
;; Punt on hard package upgrade: from ASDF1 always, and even from ASDF2 on most implementations.
(
eval-when
(
:load-toplevel
:compile-toplevel
:execute
)
(
unless
(
member
:asdf3
*features*
)
...
...
test/test-bundle.script
View file @
720ecf51
...
...
@@ -10,9 +10,15 @@
(asdf:clear-system :test-asdf/bundle-2)
(when (find-package :test-package) (delete-package :test-package))
#+(and darwin
(or abcl
ecl)
)
#+(and darwin ecl)
(leave-test "Bundle test doesn't work on Mac on this lisp." 0)
(when (and (member :abcl *features*)
(os-macosx-p)
;; bundles don't work on pre-1.3.0
(second (third (sys::arglist 'directory))))
(leave-test "Bundle test doesn't work on Mac on this version of ABCL." 0))
#+(or (and ecl ecl-bytecmp) gcl)
(leave-test "bundles not on this implementation" 0)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment