Commit 6a7f5896 authored by Robert P. Goldman's avatar Robert P. Goldman
Browse files
parents e1eb73db 178b344b
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ t: test-lisp

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-all-lisps:
@@ -147,7 +147,7 @@ test-all: doc test-all-lisps
test-all-no-stop:
	-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

# Note that the debian git at git://git.debian.org/git/pkg-common-lisp/cl-asdf.git is stale,
+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@
  :licence "MIT"
  :description "Another System Definition Facility"
  :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 ()
  #+asdf3 :encoding #+asdf3 :utf-8
  ;; For most purposes, asdf itself specially counts as a builtin system.
+9 −11
Original line number Diff line number Diff line
@@ -70,15 +70,12 @@
    ;; On "normal" Lisps: produce an image file from system and dependencies.
    ((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.
    ((selfward-operation :initform 'load-fasl-op)))
  (defclass monolithic-fasl-op (monolithic-bundle-op basic-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.
    ((bundle-type :initform :lib)
     (selfward-operation :initform 'lib-op)
     (sideway-operation :initform 'lib-op)))
    ((bundle-type :initform :lib)))

  (defclass monolithic-dll-op (monolithic-bundle-op basic-compile-op sideway-operation selfward-operation)
    ((bundle-type :initform :dll)
@@ -215,7 +212,8 @@

  (defmethod component-depends-on ((o monolithic-fasl-op) (c system))
    (declare (ignorable o))
    `((fasl-op ,@(required-components c :other-systems t :component-type 'system
    `((#-(or ecl mkcl) fasl-op #+(or ecl mkcl) lib-op
         ,@(required-components c :other-systems t :component-type 'system
                                  :goal-operation (find-operation o 'load-fasl-op)
                                  :keep-operation 'fasl-op))
      ,@(call-next-method)))
@@ -460,7 +458,7 @@
  (defmethod perform ((o basic-fasl-op) (s system))
    (apply #'compiler::build-bundle (output-file o c) ;; second???
           :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)
    (declare (ignore force verbose version))
    (apply #'operate 'binary-op system args)))
+1 −1
Original line number Diff line number Diff line
;;; -*- 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:
;;; please mail to <asdf-devel@common-lisp.net>.
+12 −5
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ fi


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 () {
    if [ -n "$ASDF_UPGRADE_TEST_TAGS" ] ; then
@@ -269,6 +270,8 @@ upgrade_methods () {
EOF
}
extract_tagged_asdf () {
    cd ${ASDFDIR}
    mkdir -p build/
    tag=$1
    if [ REQUIRE = "$tag" ] ; then return 0 ; fi
    file=build/asdf-${tag}.lisp ;
@@ -326,7 +329,7 @@ valid_upgrade_test_p () {
}
run_upgrade_tests () {
    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
    ASDF_OUTPUT_TRANSLATIONS="(:output-translations (\"${ASDFDIR}\" (\"${ASDFDIR}/build/fasls/\" :implementation \"asdf/\")) (t (\"${ASDFDIR}/build/fasls/\" :implementation \"root/\")) :ignore-inherited-configuration)"
    export ASDF_OUTPUT_TRANSLATIONS
@@ -349,9 +352,8 @@ run_upgrade_tests () {
    fi ; done ; done 2>&1 | tee build/results/${lisp}-upgrade.text
}
run_tests () {
  cd ${ASDFDIR}/test
  create_config
  mkdir -p ../build/results
  cd ./test/
  echo failure > ../build/results/status
    thedate=`date "+%Y-%m-%d"`
    do_tests "$@" 2>&1 | \
@@ -373,7 +375,8 @@ test_clean_load () {
    case $lisp in
        gcl|cmucl) return 0 ;; # These are hopeless
    esac
    mkdir -p build/results
    cd ${ASDFDIR}
    mkdir -p build/results/
    nop=build/results/${lisp}-nop.text
    load=build/results/${lisp}-load.text
    ${cmd} ${eval} \
@@ -392,12 +395,16 @@ test_load_systems () {
    case $lisp in
        gcl) return 0 ;; # This one is hopeless
    esac
    cd ${ASDFDIR}
    mkdir -p build/results/
    echo "Loading all these systems: $*"
    ${cmd} ${eval} \
      "(or #.(load \"test/script-support.lisp\") #.(asdf-test::with-test () (asdf-test::test-load-systems $*)))" \
        2>&1 | tee build/results/${lisp}-systems.text
}
test_interactively () {
    cd ${ASDFDIR}
    mkdir -p build/results/
    rlwrap $cmd $eval "(or #.(load \"test/script-support.lisp\") #.(asdf-test::interactive-test '($*)))"
}

Loading