Commit 6b4a914e authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.26.133: more removal of debug statements and fixing of scripts

New script for deferred warnings.
parent b44a8731
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,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.26.132" ;; to be automatically updated by make bump-version :version "2.26.133" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
:components ((:module "build" :components ((:file "asdf")))) :components ((:module "build" :components ((:file "asdf"))))
:in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem)))) :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem))))
......
...@@ -20,14 +20,13 @@ ...@@ -20,14 +20,13 @@
#:build-args #:name-suffix #:prologue-code #:epilogue-code #:static-library #:build-args #:name-suffix #:prologue-code #:epilogue-code #:static-library
#:component-translate-output-p #:translate-output-p #:component-translate-output-p #:translate-output-p
#:component-bundle-pathname #:bundle-pathname #:component-bundle-pathname #:bundle-pathname
#:component-bundle-operation #:bundle-operation
#:component-entry-point #:entry-point)) #:component-entry-point #:entry-point))
(in-package :asdf/bundle) (in-package :asdf/bundle)
(defclass bundle-op (operation) (defclass bundle-op (operation)
((build-args :initarg :args :initform nil :accessor bundle-op-build-args) ((build-args :initarg :args :initform nil :accessor bundle-op-build-args)
(name-suffix :initarg :name-suffix :initform nil) (name-suffix :initarg :name-suffix :initform nil)
(bundle-type :reader bundle-type) (bundle-type :initform :no-output-file :reader bundle-type)
#+ecl (lisp-files :initform nil :accessor bundle-op-lisp-files) #+ecl (lisp-files :initform nil :accessor bundle-op-lisp-files)
#+mkcl (do-fasb :initarg :do-fasb :initform t :reader bundle-op-do-fasb-p) #+mkcl (do-fasb :initarg :do-fasb :initform t :reader bundle-op-do-fasb-p)
#+mkcl (do-static-library :initarg :do-static-library :initform t :reader bundle-op-do-static-library-p))) #+mkcl (do-static-library :initarg :do-static-library :initform t :reader bundle-op-do-static-library-p)))
...@@ -97,8 +96,6 @@ ...@@ -97,8 +96,6 @@
(defclass bundle-system (system) (defclass bundle-system (system)
((bundle-pathname ((bundle-pathname
:initform nil :initarg :bundle-pathname :accessor component-bundle-pathname) :initform nil :initarg :bundle-pathname :accessor component-bundle-pathname)
(bundle-operation
:initarg :bundle-operation :accessor component-bundle-operation)
(entry-point (entry-point
:initform nil :initarg :entry-point :accessor component-entry-point) :initform nil :initarg :entry-point :accessor component-entry-point)
(translate-output-p (translate-output-p
...@@ -264,7 +261,7 @@ ...@@ -264,7 +261,7 @@
(defmethod component-depends-on :around ((o bundle-op) (c component)) (defmethod component-depends-on :around ((o bundle-op) (c component))
(declare (ignorable o c)) (declare (ignorable o c))
(if-let (op (and (eq (type-of o) 'bundle-op) (component-bundle-operation c))) (if-let (op (and (eq (type-of o) 'bundle-op) (component-build-operation c)))
`((,op ,c)) `((,op ,c))
(call-next-method))) (call-next-method)))
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.132: Another System Definition Facility. ;;; This is ASDF 2.26.133: 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>.
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#:operation #:operation
#:operation-original-initargs ;; backward-compatibility only. DO NOT USE. #:operation-original-initargs ;; backward-compatibility only. DO NOT USE.
#:build-op ;; THE generic operation #:build-op ;; THE generic operation
#:*operations*
#:make-operation #:make-operation
#:find-operation)) #:find-operation))
(in-package :asdf/operation) (in-package :asdf/operation)
......
...@@ -196,8 +196,6 @@ the action of OPERATION on COMPONENT in the PLAN")) ...@@ -196,8 +196,6 @@ the action of OPERATION on COMPONENT in the PLAN"))
(latest-stamp-f stamp (funcall dependency-stamper dep-o dep-c))))) (latest-stamp-f stamp (funcall dependency-stamper dep-o dep-c)))))
stamp) stamp)
(asdf-debug)
(defmethod compute-action-stamp (plan (o operation) (c component) &key just-done) (defmethod compute-action-stamp (plan (o operation) (c component) &key just-done)
;; In a distant future, safe-file-write-date and component-operation-time ;; In a distant future, safe-file-write-date and component-operation-time
;; shall also be parametrized by the plan, or by a second model object. ;; shall also be parametrized by the plan, or by a second model object.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(defsystem :hello-world-example (defsystem :hello-world-example
:class :bundle-system :class :bundle-system
:build-operation program-op :build-operation program-op
:entry-point "hello:main" :entry-point "hello:entry-point"
:depends-on (:asdf-driver) :depends-on (:asdf-driver)
:translate-output-p nil :translate-output-p nil
:components ((:file "hello"))) :components ((:file "hello")))
(defpackage :hello (defpackage :hello
(:use :cl :asdf/driver) (:use :cl :asdf/driver)
(:export #:main)) (:export #:main #:entry-point))
(in-package :hello) (in-package :hello)
...@@ -8,3 +8,6 @@ ...@@ -8,3 +8,6 @@
(format t "hello, world~%") (format t "hello, world~%")
(when arguments (when arguments
(format t "You passed ~D arguments:~%~{ ~S~%~}" (length arguments) arguments))) (format t "You passed ~D arguments:~%~{ ~S~%~}" (length arguments) arguments)))
(defun entry-point ()
(apply 'main *command-line-arguments*))
...@@ -14,4 +14,3 @@ ...@@ -14,4 +14,3 @@
(load-system 'test-compile-file-failure :force t) (load-system 'test-compile-file-failure :force t)
nil) nil)
(compile-file-error () t))) (compile-file-error () t)))
;;; -*- Lisp -*-
(clear-system :test-deferred-warnings)
(def-test-system :test-deferred-warnings
:serial t
:components ((:file "undefined-function")
(:file "file1")))
(assert
(handler-case
(let ((*compile-file-warnings-behaviour* :ignore))
(load-system :test-deferred-warnings :force t)
t)
(compile-file-error () nil)))
#-ecl
(assert
(handler-case
(let ((*compile-file-warnings-behaviour* :error))
(load-system :test-deferred-warnings :force t)
nil)
(compile-warned-error () t)))
#+(or clozure sbcl)
(assert
(handler-case
(let ((*compile-file-warnings-behaviour* :error))
(perform 'compile-op :test-deferred-warnings)
nil)
(compile-warned-error () t)))
...@@ -33,5 +33,12 @@ ...@@ -33,5 +33,12 @@
:load (native-namestring (subpathname *test-directory* "make-hello-world.lisp")))) :load (native-namestring (subpathname *test-directory* "make-hello-world.lisp"))))
(assert (probe-file* exe)) (assert (probe-file* exe))
(assert-equal (run-program/ (native-namestring exe) :output :lines) (assert-equal (run-program/ `(,(native-namestring exe)) :output :lines)
'("hello, world")) '("hello, world"))
(assert-equal (run-program/ `(,(native-namestring exe) "a" "b c" "d") :output :lines)
'("hello, world"
"You passed 3 arguments:"
" \"a\""
" \"b c\""
" \"d\""))
(in-package :asdf)
(defun using-some-undefined-function ()
(some-undefined-function))
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
;; "2.345.6" would be a development version in the official upstream ;; "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.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 ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.26.132") (asdf-version "2.26.133")
(existing-asdf (find-class (find-symbol* :component :asdf nil) nil)) (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
(existing-version *asdf-version*) (existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)) (already-there (equal asdf-version existing-version))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment