Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asdf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tarn Burton
asdf
Commits
1cc3e482
Commit
1cc3e482
authored
12 years ago
by
Francois-Rene Rideau
Browse files
Options
Downloads
Patches
Plain Diff
More ECL bundle fixes.
parent
6782f5eb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
bundle.lisp
+10
-7
10 additions, 7 deletions
bundle.lisp
generate-asdf.asd
+1
-1
1 addition, 1 deletion
generate-asdf.asd
test/make-hello-world.lisp
+2
-0
2 additions, 0 deletions
test/make-hello-world.lisp
test/script-support.lisp
+2
-2
2 additions, 2 deletions
test/script-support.lisp
with
15 additions
and
10 deletions
bundle.lisp
+
10
−
7
View file @
1cc3e482
...
...
@@ -115,7 +115,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
)
((
member
:binary
:dll
:lib
: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"
)))
...
...
@@ -216,8 +216,8 @@
(
defun*
bundlable-file-p
(
pathname
)
(
let
((
type
(
pathname-type
pathname
)))
(
declare
(
ignorable
type
))
(
or
#+
ecl
(
or
(
equal
type
(
compile-file-type
:object
))
(
equal
type
(
compile-file-type
:static-library
)))
(
or
#+
ecl
(
or
(
equal
type
(
compile-file-type
:type
:object
))
(
equal
type
(
compile-file-type
:type
:static-library
)))
#+
mkcl
(
equal
type
(
compile-file-type
:fasl-p
nil
))
#+
(
or
allegro
clisp
clozure
cmu
lispworks
sbcl
scl
xcl
)
(
equal
type
(
compile-file-type
)))))
...
...
@@ -482,10 +482,13 @@
#+
ecl
(
defmethod
perform
((
o
bundle-op
)
(
c
system
))
(
let*
((
object-files
(
remove
"fas"
(
input-files
o
c
)
:key
#'
pathname-type
:test
#'
string=
))
(
output
(
output-files
o
c
)))
(
apply
#'
c::builder
(
bundle-type
o
)
(
first
output
)
(
let*
((
object-files
(
input-files
o
c
))
(
output
(
output-files
o
c
))
(
bundle
(
first
output
))
(
kind
(
bundle-type
o
))
(
init-name
(
c::compute-init-name
bundle
:kind
kind
)))
(
apply
#'
c::builder
kind
(
first
output
)
: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
)
...
...
This diff is collapsed.
Click to expand it.
generate-asdf.asd
+
1
−
1
View file @
1cc3e482
...
...
@@ -8,7 +8,7 @@
:class
:concatenated-source-system
;; :include-dependencies t
:translate-output-p
nil
:concatenated-source-file
"build/asdf
.lisp
"
:concatenated-source-file
"build/asdf"
:version
(
:read-file-form
"version.lisp-expr"
)
:serial
t
:depends-on
(
:asdf-driver
)
...
...
This diff is collapsed.
Click to expand it.
test/make-hello-world.lisp
+
2
−
0
View file @
1cc3e482
;;; -*- Lisp -*-
(
load
"script-support.lisp"
)
(
load-asdf
)
#+
ecl
(
require
:cmp
)
(
with-test
()
(
register-directory
*asdf-directory*
)
;; we need asdf-driver, and ECL can dump.
(
operate
'program-op
:hello-world-example
))
This diff is collapsed.
Click to expand it.
test/script-support.lisp
+
2
−
2
View file @
1cc3e482
...
...
@@ -258,8 +258,8 @@ is bound, write a message and exit on an error. If
((
or
sb-c::simple-compiler-note
sb-kernel:redefinition-warning
)
#'
muffle-warning
)
#+
(
and
ecl
(
not
ecl-bytecmp
))
((
or
c:compiler-note
c::compiler-debug-note
c:compiler-warning
)
;; ECL emits more serious warnings than it should.
((
or
c:
:
compiler-note
c::compiler-debug-note
c:
:
compiler-warning
)
;; ECL emits more serious warnings than it should.
#'
muffle-warning
)
#+
mkcl
((
or
compiler:compiler-note
)
#'
muffle-warning
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment