Skip to content
Snippets Groups Projects
Commit 6a7f5896 authored by Robert P. Goldman's avatar Robert P. Goldman
Browse files
parents e1eb73db 178b344b
No related branches found
No related tags found
No related merge requests found
...@@ -122,7 +122,7 @@ t: test-lisp ...@@ -122,7 +122,7 @@ t: test-lisp
test: test-lisp test-clean-load test-load-systems doc test: test-lisp test-clean-load test-load-systems doc
test-load-systems: test-load-systems: build/asdf.lisp
./test/run-tests.sh -l ${l} ${s} ./test/run-tests.sh -l ${l} ${s}
test-all-lisps: test-all-lisps:
...@@ -147,7 +147,7 @@ test-all: doc test-all-lisps ...@@ -147,7 +147,7 @@ test-all: doc test-all-lisps
test-all-no-stop: test-all-no-stop:
-make doc ; for l in ${lisps} ; do make t l=$$l ; make u l=$$l ; done ; true -make doc ; for l in ${lisps} ; do make t l=$$l ; make u l=$$l ; done ; true
extract-all-tagged-asdf: extract-all-tagged-asdf: build/asdf.lisp
./test/run-tests.sh -H ./test/run-tests.sh -H
# Note that the debian git at git://git.debian.org/git/pkg-common-lisp/cl-asdf.git is stale, # Note that the debian git at git://git.debian.org/git/pkg-common-lisp/cl-asdf.git is stale,
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.32.18" ;; to be automatically updated by make bump-version :version "2.32.20" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8 #+asdf3 :encoding #+asdf3 :utf-8
;; For most purposes, asdf itself specially counts as a builtin system. ;; For most purposes, asdf itself specially counts as a builtin system.
......
...@@ -70,15 +70,12 @@ ...@@ -70,15 +70,12 @@
;; On "normal" Lisps: produce an image file from system and dependencies. ;; On "normal" Lisps: produce an image file from system and dependencies.
((selfward-operation :initform '(monolithic-fasl-op monolithic-lib-op)))) ((selfward-operation :initform '(monolithic-fasl-op monolithic-lib-op))))
(defclass monolithic-fasl-op (monolithic-bundle-op basic-fasl-op selfward-operation) ;; Create a single fasl for the system and its dependencies.
;; Create a single fasl for the system and its dependencies. (defclass monolithic-fasl-op (monolithic-bundle-op basic-fasl-op) ())
((selfward-operation :initform 'load-fasl-op)))
(defclass monolithic-lib-op (monolithic-bundle-op basic-compile-op sideway-operation selfward-operation) (defclass monolithic-lib-op (monolithic-bundle-op basic-compile-op)
;; ECL: Create a single linkable library for the system and its dependencies. ;; ECL: Create a single linkable library for the system and its dependencies.
((bundle-type :initform :lib) ((bundle-type :initform :lib)))
(selfward-operation :initform 'lib-op)
(sideway-operation :initform 'lib-op)))
(defclass monolithic-dll-op (monolithic-bundle-op basic-compile-op sideway-operation selfward-operation) (defclass monolithic-dll-op (monolithic-bundle-op basic-compile-op sideway-operation selfward-operation)
((bundle-type :initform :dll) ((bundle-type :initform :dll)
...@@ -215,9 +212,10 @@ ...@@ -215,9 +212,10 @@
(defmethod component-depends-on ((o monolithic-fasl-op) (c system)) (defmethod component-depends-on ((o monolithic-fasl-op) (c system))
(declare (ignorable o)) (declare (ignorable o))
`((fasl-op ,@(required-components c :other-systems t :component-type 'system `((#-(or ecl mkcl) fasl-op #+(or ecl mkcl) lib-op
:goal-operation (find-operation o 'load-fasl-op) ,@(required-components c :other-systems t :component-type 'system
:keep-operation 'fasl-op)) :goal-operation (find-operation o 'load-fasl-op)
:keep-operation 'fasl-op))
,@(call-next-method))) ,@(call-next-method)))
(defmethod component-depends-on ((o lib-op) (c system)) (defmethod component-depends-on ((o lib-op) (c system))
...@@ -460,7 +458,7 @@ ...@@ -460,7 +458,7 @@
(defmethod perform ((o basic-fasl-op) (s system)) (defmethod perform ((o basic-fasl-op) (s system))
(apply #'compiler::build-bundle (output-file o c) ;; second??? (apply #'compiler::build-bundle (output-file o c) ;; second???
:lisp-object-files (input-files o s) (bundle-op-build-args o))) :lisp-object-files (input-files o s) (bundle-op-build-args o)))
}
(defun bundle-system (system &rest args &key force (verbose t) version &allow-other-keys) (defun bundle-system (system &rest args &key force (verbose t) version &allow-other-keys)
(declare (ignore force verbose version)) (declare (ignore force verbose version))
(apply #'operate 'binary-op system args))) (apply #'operate 'binary-op system args)))
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.32.18: Another System Definition Facility. ;;; This is ASDF 2.32.20: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
......
...@@ -239,7 +239,8 @@ fi ...@@ -239,7 +239,8 @@ fi
create_config () { create_config () {
mkdir -p ../build/test-source-registry-conf.d ../build/test-asdf-output-translations-conf.d cd ${ASDFDIR}
mkdir -p build/results/ build/test-source-registry-conf.d build/test-asdf-output-translations-conf.d
} }
upgrade_tags () { upgrade_tags () {
if [ -n "$ASDF_UPGRADE_TEST_TAGS" ] ; then if [ -n "$ASDF_UPGRADE_TEST_TAGS" ] ; then
...@@ -269,6 +270,8 @@ upgrade_methods () { ...@@ -269,6 +270,8 @@ upgrade_methods () {
EOF EOF
} }
extract_tagged_asdf () { extract_tagged_asdf () {
cd ${ASDFDIR}
mkdir -p build/
tag=$1 tag=$1
if [ REQUIRE = "$tag" ] ; then return 0 ; fi if [ REQUIRE = "$tag" ] ; then return 0 ; fi
file=build/asdf-${tag}.lisp ; file=build/asdf-${tag}.lisp ;
...@@ -326,7 +329,7 @@ valid_upgrade_test_p () { ...@@ -326,7 +329,7 @@ valid_upgrade_test_p () {
} }
run_upgrade_tests () { run_upgrade_tests () {
cd ${ASDFDIR} cd ${ASDFDIR}
mkdir -p build/results mkdir -p build/results/
rm -f build/*.*f* uiop/*.*f* test/*.*f* ## Remove stale FASLs from ASDF 1.x, especially when different implementations have same name rm -f build/*.*f* uiop/*.*f* test/*.*f* ## Remove stale FASLs from ASDF 1.x, especially when different implementations have same name
ASDF_OUTPUT_TRANSLATIONS="(:output-translations (\"${ASDFDIR}\" (\"${ASDFDIR}/build/fasls/\" :implementation \"asdf/\")) (t (\"${ASDFDIR}/build/fasls/\" :implementation \"root/\")) :ignore-inherited-configuration)" ASDF_OUTPUT_TRANSLATIONS="(:output-translations (\"${ASDFDIR}\" (\"${ASDFDIR}/build/fasls/\" :implementation \"asdf/\")) (t (\"${ASDFDIR}/build/fasls/\" :implementation \"root/\")) :ignore-inherited-configuration)"
export ASDF_OUTPUT_TRANSLATIONS export ASDF_OUTPUT_TRANSLATIONS
...@@ -349,9 +352,8 @@ run_upgrade_tests () { ...@@ -349,9 +352,8 @@ run_upgrade_tests () {
fi ; done ; done 2>&1 | tee build/results/${lisp}-upgrade.text fi ; done ; done 2>&1 | tee build/results/${lisp}-upgrade.text
} }
run_tests () { run_tests () {
cd ${ASDFDIR}/test
create_config create_config
mkdir -p ../build/results cd ./test/
echo failure > ../build/results/status echo failure > ../build/results/status
thedate=`date "+%Y-%m-%d"` thedate=`date "+%Y-%m-%d"`
do_tests "$@" 2>&1 | \ do_tests "$@" 2>&1 | \
...@@ -373,7 +375,8 @@ test_clean_load () { ...@@ -373,7 +375,8 @@ test_clean_load () {
case $lisp in case $lisp in
gcl|cmucl) return 0 ;; # These are hopeless gcl|cmucl) return 0 ;; # These are hopeless
esac esac
mkdir -p build/results cd ${ASDFDIR}
mkdir -p build/results/
nop=build/results/${lisp}-nop.text nop=build/results/${lisp}-nop.text
load=build/results/${lisp}-load.text load=build/results/${lisp}-load.text
${cmd} ${eval} \ ${cmd} ${eval} \
...@@ -392,12 +395,16 @@ test_load_systems () { ...@@ -392,12 +395,16 @@ test_load_systems () {
case $lisp in case $lisp in
gcl) return 0 ;; # This one is hopeless gcl) return 0 ;; # This one is hopeless
esac esac
cd ${ASDFDIR}
mkdir -p build/results/
echo "Loading all these systems: $*" echo "Loading all these systems: $*"
${cmd} ${eval} \ ${cmd} ${eval} \
"(or #.(load \"test/script-support.lisp\") #.(asdf-test::with-test () (asdf-test::test-load-systems $*)))" \ "(or #.(load \"test/script-support.lisp\") #.(asdf-test::with-test () (asdf-test::test-load-systems $*)))" \
2>&1 | tee build/results/${lisp}-systems.text 2>&1 | tee build/results/${lisp}-systems.text
} }
test_interactively () { test_interactively () {
cd ${ASDFDIR}
mkdir -p build/results/
rlwrap $cmd $eval "(or #.(load \"test/script-support.lisp\") #.(asdf-test::interactive-test '($*)))" rlwrap $cmd $eval "(or #.(load \"test/script-support.lisp\") #.(asdf-test::interactive-test '($*)))"
} }
......
...@@ -52,7 +52,7 @@ Note that ASDF ALWAYS raises an error if it fails to create an output file when ...@@ -52,7 +52,7 @@ Note that ASDF ALWAYS raises an error if it fails to create an output file when
(defun get-optimization-settings () (defun get-optimization-settings ()
"Get current compiler optimization settings, ready to PROCLAIM again" "Get current compiler optimization settings, ready to PROCLAIM again"
#-(or clisp clozure cmu ecl sbcl scl) #-(or clisp clozure cmu ecl sbcl scl)
(warn "~S does not support ~S. Please help me fix that." 'get-optimization-settings (lisp-implementation)) (warn "~S does not support ~S. Please help me fix that." 'get-optimization-settings (implementation-type))
#+clozure (ccl:declaration-information 'optimize nil) #+clozure (ccl:declaration-information 'optimize nil)
#+(or clisp cmu ecl sbcl scl) #+(or clisp cmu ecl sbcl scl)
(let ((settings '(speed space safety debug compilation-speed #+(or cmu scl) c::brevity))) (let ((settings '(speed space safety debug compilation-speed #+(or cmu scl) c::brevity)))
......
...@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO ...@@ -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.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.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 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "2.32.18") (asdf-version "2.32.20")
(existing-version (asdf-version))) (existing-version (asdf-version)))
(setf *asdf-version* asdf-version) (setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version))) (when (and existing-version (not (equal asdf-version existing-version)))
......
"2.32.18" "2.32.20"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment