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
e0f6b19d
Commit
e0f6b19d
authored
Jun 26, 2013
by
Francois-Rene Rideau
Browse files
3.0.1.12: fix dll-op and monolithic-dll-op for ECL. Based on a patch by Juanjo.
parent
2ae62b6d
Changes
5
Hide whitespace changes
Inline
Side-by-side
asdf.asd
View file @
e0f6b19d
...
...
@@ -74,7 +74,7 @@
:licence
"MIT"
:description
"Another System Definition Facility"
:long-description
"ASDF builds Common Lisp software organized into defined systems."
:version
"3.0.1.1
1
"
;; to be automatically updated by make bump-version
:version
"3.0.1.1
2
"
;; 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.
...
...
bundle.lisp
View file @
e0f6b19d
...
...
@@ -49,14 +49,16 @@
;; we'd have to have the monolithic-op not inherit from the main op,
;; but instead inherit from a basic-FOO-op as with basic-fasl-op above.
(
defclass
lib-op
(
bundle-compile-op
)
(
defclass
no-ld-flags-op
(
operation
)
())
(
defclass
lib-op
(
bundle-compile-op
no-ld-flags-op
)
((
bundle-type
:initform
#+
(
or
ecl
mkcl
)
:lib
#-
(
or
ecl
mkcl
)
:no-output-file
))
(
:documentation
#+
(
or
ecl
mkcl
)
"compile the system and produce linkable (.a) library for it."
#-
(
or
ecl
mkcl
)
"just compile the system"
))
(
defclass
dll-op
(
bundle-
op
basic-compile
-op
)
(
defclass
dll-op
(
bundle-
compile-op
selfward-operation
no-ld-flags
-op
)
((
bundle-type
:initform
:dll
))
(
:documentation
"
Link together all the dynamic library used by this system into a single one
."
))
(
:documentation
"
compile the system and produce dynamic (.so/.dll) library for it
."
))
(
defclass
binary-op
(
basic-compile-op
selfward-operation
)
((
selfward-operation
:initform
'
(
fasl-op
lib-op
)))
...
...
@@ -79,15 +81,14 @@
(
defclass
monolithic-fasl-op
(
monolithic-bundle-compile-op
basic-fasl-op
)
()
(
:documentation
"Create a single fasl for the system and its dependencies."
))
(
defclass
monolithic-lib-op
(
monolithic-bundle-compile-op
basic-compile-op
)
(
defclass
monolithic-lib-op
(
monolithic-bundle-compile-op
basic-compile-op
no-ld-flags-op
)
((
bundle-type
:initform
#+
(
or
ecl
mkcl
)
:lib
#-
(
or
ecl
mkcl
)
:no-output-file
))
(
:documentation
#+
(
or
ecl
mkcl
)
"Create a single linkable library for the system and its dependencies."
#-
(
or
ecl
mkcl
)
"Compile a system and its dependencies."
))
(
defclass
monolithic-dll-op
(
monolithic-bundle-op
basic-compile-op
sideway-operation
selfward-operation
)
((
bundle-type
:initform
:dll
)
(
selfward-operation
:initform
'dll-op
)
(
sideway-operation
:initform
'dll-op
)))
(
defclass
monolithic-dll-op
(
monolithic-bundle-compile-op
sideway-operation
selfward-operation
no-ld-flags-op
)
((
bundle-type
:initform
:dll
))
(
:documentation
"Create a single dynamic (.so/.dll) library for the system and its dependencies."
))
(
defclass
program-op
#+
(
or
mkcl
ecl
)
(
monolithic-bundle-compile-op
)
#-
(
or
mkcl
ecl
)
(
monolithic-bundle-op
selfward-operation
)
...
...
@@ -101,7 +102,7 @@
((
or
null
string
)
bundle-type
)
((
eql
:fasl
)
#-
(
or
ecl
mkcl
)
(
compile-file-type
)
#+
(
or
ecl
mkcl
)
"fasb"
)
#+
ecl
((
member
:binary
:dll
:lib
:static-library
:program
:object
:program
)
((
member
:binary
:dll
:lib
:shared-library
:static-library
:program
:object
:program
)
(
compile-file-type
:type
bundle-type
))
((
eql
:binary
)
"image"
)
((
eql
:dll
)
(
cond
((
os-unix-p
)
"so"
)
((
os-windows-p
)
"dll"
)))
...
...
@@ -173,7 +174,7 @@
(
remove-plist-keys
'
(
:type
:monolithic
:name-suffix
)
(
operation-original-initargs
instance
))))
(
defmethod
bundle-op-build-args
:around
((
o
lib
-op
))
(
defmethod
bundle-op-build-args
:around
((
o
no-ld-flags
-op
))
(
declare
(
ignorable
o
))
(
let
((
args
(
call-next-method
)))
(
remf
args
:ld-flags
)
...
...
header.lisp
View file @
e0f6b19d
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 3.0.1.1
1
: Another System Definition Facility.
;;; This is ASDF 3.0.1.1
2
: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
...
...
upgrade.lisp
View file @
e0f6b19d
...
...
@@ -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
"3.0.1.1
1
"
)
(
asdf-version
"3.0.1.1
2
"
)
(
existing-version
(
asdf-version
)))
(
setf
*asdf-version*
asdf-version
)
(
when
(
and
existing-version
(
not
(
equal
asdf-version
existing-version
)))
...
...
version.lisp-expr
View file @
e0f6b19d
"3.0.1.1
1
"
"3.0.1.1
2
"
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