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
asdf
asdf
Commits
7038a24e
Commit
7038a24e
authored
Sep 11, 2015
by
Francois-Rene Rideau
Browse files
Merge branch 'master' into minimakefile
parents
2badce8c
20403bcb
Changes
9
Show whitespace changes
Inline
Side-by-side
asdf.asd
View file @
7038a24e
...
...
@@ -75,7 +75,7 @@
:licence
"MIT"
:description
"Another System Definition Facility"
:long-description
"ASDF builds Common Lisp software organized into defined systems."
:version
"3.1.5.
6
"
;; to be automatically updated by make bump-version
:version
"3.1.5.
7
"
;; to be automatically updated by make bump-version
:depends-on
()
#+
asdf3
:encoding
#+
asdf3
:utf-8
:class
#+
asdf3.1
package-inferred-system
#-
asdf3.1
system
...
...
bundle.lisp
View file @
7038a24e
...
...
@@ -95,15 +95,24 @@ itself.")) ;; operation on a system and its dependencies
(
defclass
lib-op
(
link-op
gather-op
non-propagating-operation
)
((
bundle-type
:initform
:lib
))
(
:documentation
"compile the system and produce linkable (.a) library for it."
))
(
:documentation
"Compile the system and produce linkable (.a) library for it.
Compare with DLL-OP."
))
(
defclass
compile-bundle-op
(
basic-compile-bundle-op
selfward-operation
#+
(
or
clasp
ecl
mkcl
)
link-op
#-
(
or
clasp
ecl
)
gather-op
)
((
selfward-operation
:initform
'
(
prepare-bundle-op
#+
(
or
clasp
ecl
)
lib-op
)
:allocation
:class
)))
:allocation
:class
))
(
:documentation
"This operator is an alternative to COMPILE-OP. Build a system
and all of its dependencies, but build only a single (\"monolithic\") FASL, instead
of one per source file, which may be more resource efficient. That monolithic
FASL should be loaded with LOAD-BUNDLE-OP, rather than LOAD-OP."
))
(
defclass
load-bundle-op
(
basic-load-op
selfward-operation
)
((
selfward-operation
:initform
'
(
prepare-bundle-op
compile-bundle-op
)
:allocation
:class
)))
((
selfward-operation
:initform
'
(
prepare-bundle-op
compile-bundle-op
)
:allocation
:class
))
(
:documentation
"This operator is an alternative to LOAD-OP. Build a system
and all of its dependencies, using COMPILE-BUNDLE-OP. The difference with
respect to LOAD-OP is that it builds only a single FASL, which may be
faster and more resource efficient."
))
;; NB: since the monolithic-op's can't be sideway-operation's,
;; if we wanted lib-op, dll-op, deliver-asd-op to be sideway-operation's,
...
...
@@ -112,7 +121,8 @@ itself.")) ;; operation on a system and its dependencies
(
defclass
dll-op
(
link-op
gather-op
non-propagating-operation
)
((
bundle-type
:initform
:dll
))
(
:documentation
"compile the system and produce dynamic (.so/.dll) library for it."
))
(
:documentation
"compile the system and produce dynamic (.so/.dll) library for it.
Compare with LIB-OP."
))
(
defclass
deliver-asd-op
(
basic-compile-op
selfward-operation
)
((
selfward-operation
:initform
'
(
compile-bundle-op
#+
(
or
clasp
ecl
mkcl
)
lib-op
)
:allocation
:class
))
...
...
cl-launch
@
4a4ec3d8
Compare
cdd5d110
...
4a4ec3d8
Subproject commit
cdd5d11006a482927da8297be13d69df77e4d53b
Subproject commit
4a4ec3d8643a04dfcdc742284d0c965bc40adb37
fare-utils
@
71f965fe
Compare
16a589ec
...
71f965fe
Subproject commit
16a589ece0aa3ec91afd8f61d2ddf9a83472ebbc
Subproject commit
71f965fe8dd908fbb0eb1a7c73cb82e8195099bd
header.lisp
View file @
7038a24e
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.5.
6
: Another System Definition Facility.
;;; This is ASDF 3.1.5.
7
: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
...
...
uiop/run-program.lisp
View file @
7038a24e
...
...
@@ -579,13 +579,12 @@ It returns a process-info plist with possible keys:
;; 1- wait
#+
clozure
(
ccl::external-process-wait
process
)
#+
(
or
cmu
scl
)
(
ext:process-wait
process
)
#+
(
and
(
or
clasp
ecl
)
os-unix
)
(
ext:external-process-wait
process
)
#+
sbcl
(
sb-ext:process-wait
process
)
;; 2- extract result
#+
allegro
(
sys:reap-os-subprocess
:pid
process
:wait
t
)
#+
clozure
(
nth-value
1
(
ccl:external-process-status
process
))
#+
(
or
cmu
scl
)
(
ext:process-exit-code
process
)
#+
(
or
clasp
ecl
)
(
nth-value
1
(
ext:external-process-wait
process
))
#+
(
or
clasp
ecl
)
(
nth-value
1
(
ext:external-process-wait
process
t
))
#+
lispworks
(
if-let
((
stream
(
or
(
getf
process-info
:input-stream
)
(
getf
process-info
:output-stream
)
...
...
@@ -911,9 +910,7 @@ or an indication of failure via the EXIT-CODE of the process"
(
apply
(
if
(
or
force-shell
#+
(
or
clasp
clisp
)
(
or
(
not
ignore-error-status
)
t
)
#+
clisp
(
member
error-output
'
(
:interactive
:output
))
;; old versions of ecl <= 15.3.7 don't support non-trivial :error
#+
ecl
(
and
(
nth-value
1
(
ignore-errors
(
slot-value
(
ext:make-external-process
)
'ext::error-stream
)))
(
not
(
member
error-output
'
(
:interactive
:output
nil
))))
#+
ecl
t
;; A race condition in ECL <= 16.0.0 prevents using ext:run-program
#+
(
and
lispworks
os-unix
)
(
%interactivep
input
output
error-output
)
#+
(
or
abcl
cormanlisp
gcl
(
and
lispworks
os-windows
)
mcl
xcl
)
t
)
'%use-system
'%use-run-program
)
...
...
uiop/version.lisp-expr
View file @
7038a24e
"3.1.5.
6
"
"3.1.5.
7
"
upgrade.lisp
View file @
7038a24e
...
...
@@ -67,7 +67,7 @@ previously-loaded version of ASDF."
;; "3.4.5.67" would be a development version in the official branch, on top 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
"3.1.5.
6
"
)
(
asdf-version
"3.1.5.
7
"
)
(
existing-version
(
asdf-version
)))
(
setf
*asdf-version*
asdf-version
)
(
when
(
and
existing-version
(
not
(
equal
asdf-version
existing-version
)))
...
...
version.lisp-expr
View file @
7038a24e
"3.1.5.
6
"
"3.1.5.
7
"
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