Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
asdf
asdf
Commits
f6832b7a
Commit
f6832b7a
authored
Jan 20, 2013
by
Francois-Rene Rideau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2.26.130: fix compile-file* for ecl_bytecodes
Also, make script re-loadable in a debug session.
parent
16223e47
Changes
49
Hide whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
72 additions
and
72 deletions
+72
-72
asdf.asd
asdf.asd
+1
-1
header.lisp
header.lisp
+1
-1
lisp-build.lisp
lisp-build.lisp
+9
-7
test/asdf-pathname-test.script
test/asdf-pathname-test.script
+1
-1
test/run-tests.sh
test/run-tests.sh
+2
-2
test/test-around-compile.script
test/test-around-compile.script
+1
-1
test/test-builtin-source-file-type.script
test/test-builtin-source-file-type.script
+1
-1
test/test-bundle.script
test/test-bundle.script
+1
-1
test/test-compile-file-failure.script
test/test-compile-file-failure.script
+1
-1
test/test-concatenate-source.script
test/test-concatenate-source.script
+1
-1
test/test-configuration.script
test/test-configuration.script
+1
-1
test/test-encodings.script
test/test-encodings.script
+1
-1
test/test-force.script
test/test-force.script
+1
-1
test/test-logical-pathname.script
test/test-logical-pathname.script
+1
-1
test/test-missing-lisp-file.script
test/test-missing-lisp-file.script
+1
-1
test/test-module-depend.script
test/test-module-depend.script
+1
-1
test/test-module-excessive-depend.script
test/test-module-excessive-depend.script
+1
-1
test/test-module-pathnames.script
test/test-module-pathnames.script
+1
-1
test/test-multiple.script
test/test-multiple.script
+1
-1
test/test-nested-components.script
test/test-nested-components.script
+1
-1
test/test-package.script
test/test-package.script
+1
-1
test/test-program.script
test/test-program.script
+1
-1
test/test-redundant-recompile.asd
test/test-redundant-recompile.asd
+0
-16
test/test-redundant-recompile.script
test/test-redundant-recompile.script
+16
-2
test/test-retry-loading-component-1.script
test/test-retry-loading-component-1.script
+1
-1
test/test-run-program.script
test/test-run-program.script
+1
-1
test/test-samedir-modules.script
test/test-samedir-modules.script
+1
-1
test/test-source-file-type.script
test/test-source-file-type.script
+1
-1
test/test-static-and-serial.script
test/test-static-and-serial.script
+1
-1
test/test-sysdef-asdf.script
test/test-sysdef-asdf.script
+1
-1
test/test-system-pathnames.script
test/test-system-pathnames.script
+1
-1
test/test-touch-system-1.script
test/test-touch-system-1.script
+1
-1
test/test-touch-system-2.script
test/test-touch-system-2.script
+1
-1
test/test-try-recompiling-1.script
test/test-try-recompiling-1.script
+1
-1
test/test-urls-1.script
test/test-urls-1.script
+1
-1
test/test-urls-2.script
test/test-urls-2.script
+1
-1
test/test-utilities.script
test/test-utilities.script
+1
-1
test/test-version.script
test/test-version.script
+1
-1
test/test-weakly-depends-on-present.script
test/test-weakly-depends-on-present.script
+1
-1
test/test-weakly-depends-on-unpresent.script
test/test-weakly-depends-on-unpresent.script
+1
-1
test/test-xach-update-bug.script
test/test-xach-update-bug.script
+1
-1
test/test1.script
test/test1.script
+1
-1
test/test2.script
test/test2.script
+1
-1
test/test3.script
test/test3.script
+1
-1
test/test8.script
test/test8.script
+1
-1
test/test9.script
test/test9.script
+1
-1
test/wild-module.script
test/wild-module.script
+1
-1
upgrade.lisp
upgrade.lisp
+1
-1
version.lisp-expr
version.lisp-expr
+1
-1
No files found.
asdf.asd
View file @
f6832b7a
...
...
@@ -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.1
29
"
;; to be automatically updated by make bump-version
:version
"2.26.1
30
"
;; to be automatically updated by make bump-version
:depends-on
()
:components
((
:module
"build"
:components
((
:file
"asdf"
))))
:in-order-to
(
#+
asdf2.27
(
compile-op
(
monolithic-load-concatenated-source-op
asdf/defsystem
))))
...
...
header.lisp
View file @
f6832b7a
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.1
29
: Another System Definition Facility.
;;; This is ASDF 2.26.1
30
: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
...
...
lisp-build.lisp
View file @
f6832b7a
...
...
@@ -448,10 +448,16 @@ If WARNINGS-FILE is defined, deferred warnings are saved to that file.
On ECL or MKCL, it creates both the linkable object and loadable fasl files.
On implementations that erroneously do not recognize standard keyword arguments,
it will filter them appropriately."
#+
ecl
(
when
(
and
object-file
(
equal
(
compile-file-type
)
(
pathname
object-file
)))
(
format
t
"Whoa, some funky ASDF upgrade switched ~S calling convention for ~S and ~S~%"
'compile-file*
output-file
object-file
)
(
rotatef
output-file
object-file
))
(
let*
((
keywords
(
remove-plist-keys
`
(
:compile-check
:warnings-file
#+
(
or
ecl
mkcl
)
:object-file
`
(
:compile-check
:warnings-file
#+
(
or
ecl
mkcl
)
:object-file
:output-file
#+
gcl<2.7
,@'
(
:external-format
:print
:verbose
))
keys
))
(
output-file
(
apply
'compile-file-pathname*
input-file
:output-file
output-file
keywords
))
(
output-file
(
or
output-file
(
apply
'compile-file-pathname*
input-file
:output-file
output-file
keywords
)))
#+
ecl
(
object-file
(
unless
(
use-ecl-byte-compiler-p
)
...
...
@@ -462,17 +468,13 @@ it will filter them appropriately."
(
or
object-file
(
compile-file-pathname
output-file
:fasl-p
nil
)))
(
tmp-file
(
tmpize-pathname
output-file
)))
#+
ecl
(
when
(
and
object-file
(
equal
(
compile-file-type
)
(
pathname
object-file
)))
(
format
t
"Whoa, funky upgrade API switching happening in ~S with ~S ~S~%"
'compile-file*
output-file
object-file
)
(
rotatef
output-file
object-file
))
(
multiple-value-bind
(
output-truename
warnings-p
failure-p
)
(
with-saved-deferred-warnings
(
warnings-file
)
(
or
#-
(
or
ecl
mkcl
)
(
apply
'compile-file
input-file
:output-file
tmp-file
keywords
)
#+
ecl
(
apply
'compile-file
input-file
:output-file
(
if
object-file
(
list*
object-file
:system-p
t
keywords
)
(
list*
output
-file
keywords
)))
(
list*
tmp
-file
keywords
)))
#+
mkcl
(
apply
'compile-file
input-file
:output-file
object-file
:fasl-p
nil
keywords
)))
(
cond
...
...
test/asdf-pathname-test.script
View file @
f6832b7a
;;; -*- Lisp -*-
(in-package :asdf-test)
(load-asdf)
;;(setf *unspecific-pathname-type* nil)
...
...
test/run-tests.sh
View file @
f6832b7a
...
...
@@ -90,7 +90,7 @@ do_tests() {
echo
"Testing:
$i
"
>
&2
test_count
=
`
expr
"
$test_count
"
+ 1
`
rm
-f
~/.cache/common-lisp/
"
`
pwd
`
"
/
*
||
true
if
DO
$cmd
$debugp
$eval
"(load
\"
script-support.lisp
\"
)"
$eval
"(asdf-test::with-test () (load
\"
$i
\"
))"
;
then
if
DO
$cmd
$debugp
$eval
"(load
\"
script-support.lisp
\"
)"
$eval
"(asdf-test::load-asdf)"
$eval
"(asdf-test::with-test () (load
\"
$i
\"
))"
;
then
echo
"Using
$command
,
$i
passed"
>
&2
test_pass
=
`
expr
"
$test_pass
"
+ 1
`
else
...
...
@@ -102,7 +102,7 @@ do_tests() {
echo
"or more interactively (and maybe with rlwrap or in emacs), start with:"
>
&2
echo
"(cd test ;
$cmd
)"
>
&2
echo
"then copy/paste:"
>
&2
echo
"'(#.(load
\"
script-support.lisp
\"
) #.(asdf-test::da) #.(
asdf-test::with-test ()
(load
\"
$i
\"
))
)
"
>
&2
echo
"'(#.(load
\"
script-support.lisp
\"
) #.(asdf-test::da) #.(
load-asdf) #.
(load
\"
$i
\"
))"
>
&2
fi
echo
>
&2
echo
>
&2
...
...
test/test-around-compile.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(defun call-in-base-2 (thunk)
(let ((*read-base* 2))
...
...
test/test-builtin-source-file-type.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
;;(trace source-file-type)
...
...
test/test-bundle.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(in-package :asdf-test)
;;;---------------------------------------------------------------------------
...
...
test/test-compile-file-failure.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(progn
#-gcl<2.7
...
...
test/test-concatenate-source.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(def-test-system :test-concatenate-source
:depends-on (:file3-only)
...
...
test/test-configuration.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(in-package :asdf)
(use-package :asdf-test)
...
...
test/test-encodings.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(defparameter *lambda-string* nil)
...
...
test/test-force.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(asdf:operate 'asdf:load-op 'test-force)
...
...
test/test-logical-pathname.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
#-gcl<2.7
(setf (logical-pathname-translations "ASDF")
...
...
test/test-missing-lisp-file.script
View file @
f6832b7a
...
...
@@ -7,7 +7,7 @@
;;;---------------------------------------------------------------------------
(load-asdf)
(def-test-system test-missing-lisp-file
...
...
test/test-module-depend.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(asdf:load-system 'test-module-depend)
...
...
test/test-module-excessive-depend.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
;;;---------------------------------------------------------------------------
;;; Here's what we are trying to test. Let us say we have a system X that
...
...
test/test-module-pathnames.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(progn
(asdf:load-system 'test-module-pathnames)
...
...
test/test-multiple.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(in-package :asdf)
(use-package :asdf-test)
...
...
test/test-nested-components.script
View file @
f6832b7a
...
...
@@ -3,7 +3,7 @@
;;; check that added nesting via modules doesn't confuse ASDF
(load-asdf)
(progn
(setf asdf:*central-registry* nil)
...
...
test/test-package.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(in-package :cl-user)
(asdf-test::with-test ()
(defun module () 1)
...
...
test/test-program.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(progn
...
...
test/test-redundant-recompile.asd
deleted
100644 → 0
View file @
16223e47
;;; -*- Lisp -*-
(
asdf:defsystem
test-redundant-recompile
:components
((
:file
"file2"
:in-order-to
((
compile-op
(
load-op
"file1"
))
(
load-op
(
load-op
"file1"
))))
(
:file
"file1"
)))
#|
;;;This test system definition attempts to replicate the excess dependencies
;;;that seem to give rise to launchpad bug 590517
;;;(https://bugs.launchpad.net/asdf/+bug/590517)
1) from clean, check that all fasl files build and that some function
defined in the second file is present
2) load again. Check to make sure that nothing is recompiled.
|#
test/test-redundant-recompile.script
View file @
f6832b7a
;;; -*- Lisp -*-
#|
;;;This test system definition attempts to replicate the excess dependencies
;;;that seem to give rise to launchpad bug 590517
;;;(https://bugs.launchpad.net/asdf/+bug/590517)
(load-asdf)
1) from clean, check that all fasl files build and that some function
defined in the second file is present
(asdf:operate 'asdf:load-op 'test-redundant-recompile)
2) load again. Check to make sure that nothing is recompiled.
|#
(def-test-system test-redundant-recompile
:components ((:file "file2" :in-order-to ((compile-op (load-op "file1"))
(load-op (load-op "file1"))))
(:file "file1")))
(load-system 'test-redundant-recompile)
;; test that it compiled
(defparameter file1 (test-fasl "file1"))
(defparameter file2 (test-fasl "file2"))
...
...
test/test-retry-loading-component-1.script
View file @
f6832b7a
...
...
@@ -3,7 +3,7 @@
;;; test asdf:try-recompiling restart
(load-asdf)
(defvar *caught-error* nil)
(progn
(DBG "trlc1 1")
...
...
test/test-run-program.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
;;; TODO: write tests for run-program/ instead -- and/or
;;; import those from the original xcvb-driver-test
...
...
test/test-samedir-modules.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(DBG "loading test-samedir-modules")
(asdf:operate 'asdf:load-op 'test-samedir-modules)
...
...
test/test-source-file-type.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
;;(trace asdf::source-file-type asdf::source-file-explicit-type)
...
...
test/test-static-and-serial.script
View file @
f6832b7a
...
...
@@ -4,7 +4,7 @@ make sure that serial t and static-files
don't cause full rebuilds all the time...
|#
(load-asdf)
(in-package :asdf-test)
...
...
test/test-sysdef-asdf.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(progn
(asdf:initialize-source-registry '(:source-registry :ignore-inherited-configuration))
...
...
test/test-system-pathnames.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(progn
(asdf:load-system 'test-system-pathnames)
...
...
test/test-touch-system-1.script
View file @
f6832b7a
...
...
@@ -3,7 +3,7 @@
;;; test system def reloading if touched
;;; system that can be found using *system-definition-search-functions*
(load-asdf)
(defun system-load-time (name)
(if-let (data (asdf::system-registered-p name))
...
...
test/test-touch-system-2.script
View file @
f6832b7a
...
...
@@ -4,7 +4,7 @@
;;; system that canNOT be found using *system-definition-search-functions*
(load-asdf)
(progn
(flet ((system-load-time (name)
(let ((data (asdf::system-registered-p name)))
...
...
test/test-try-recompiling-1.script
View file @
f6832b7a
...
...
@@ -3,7 +3,7 @@
;;; test asdf:try-recompiling restart
(load-asdf)
(defparameter *caught-error* nil)
(delete-file-if-exists (test-fasl "try-recompiling-1"))
...
...
test/test-urls-1.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
#+scl
(require :http-library)
...
...
test/test-urls-2.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
#+scl
(require :http-library)
...
...
test/test-utilities.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(in-package :asdf)
(use-package :asdf-test)
...
...
test/test-version.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(progn
(def-test-system :versioned-system-1
...
...
test/test-weakly-depends-on-present.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
;;;---------------------------------------------------------------------------
;;; Check to see if a weakly-depended-on system, which is present in the
...
...
test/test-weakly-depends-on-unpresent.script
View file @
f6832b7a
...
...
@@ -7,7 +7,7 @@
;;;---------------------------------------------------------------------------
(load-asdf)
(asdf:load-system 'test-weakly-depends-on-unpresent)
;; test that it compiled
...
...
test/test-xach-update-bug.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
#+gcl (trace load compile-file asdf:perform asdf::perform-plan)
(progn
...
...
test/test1.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(touch-file (test-source "test1.asd") :offset -3600) ;; touch test1.asd an hour ago.
(defparameter *date* (file-write-date (test-source "test1.asd")))
...
...
test/test2.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(DBG "test2: loading test2b1")
(asdf:load-system 'test2b1)
...
...
test/test3.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(defparameter *fasl1* (test-fasl "file1.lisp"))
(defparameter *fasl2* (test-fasl "file2.lisp"))
...
...
test/test8.script
View file @
f6832b7a
...
...
@@ -3,7 +3,7 @@
;;; make sure we get a missing-component error
(load-asdf)
(in-package :asdf-test)
(progn
...
...
test/test9.script
View file @
f6832b7a
...
...
@@ -3,7 +3,7 @@
;;; make sure we get a missing-component-of-version error
(load-asdf)
(progn
(handler-case
...
...
test/wild-module.script
View file @
f6832b7a
;;; -*- Lisp -*-
(load-asdf)
(progn
(load (asdf::subpathname *asdf-directory* "contrib/wild-modules.lisp"))
(def-test-system :wild-module
...
...
upgrade.lisp
View file @
f6832b7a
...
...
@@ -35,7 +35,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.1
29
"
)
(
asdf-version
"2.26.1
30
"
)
(
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 @
f6832b7a
"2.26.1
29
"
"2.26.1
30
"
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