From f66917e8af133c557fb1ed44515035c02c116232 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Sat, 4 Feb 2017 23:58:04 -0500 Subject: [PATCH] Fix warnings in tools Rename asdf-tools:next-version to asdf-tools:compute-next-version not to clash with the new uiop:next-version. Stop using the deprecated asdf:traverse. --- tools/build.lisp | 3 +-- tools/test-environment.lisp | 2 +- tools/version.lisp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/build.lisp b/tools/build.lisp index 2ecf9c187..3571c4b59 100644 --- a/tools/build.lisp +++ b/tools/build.lisp @@ -7,8 +7,7 @@ (deftestcmd build-asdf-tools () "build a binary for asdf-tools" - (when (asdf:traverse :program-op :asdf-tools) - (asdf:operate :program-op :asdf-tools)) + (asdf:operate :program-op :asdf-tools) (success)) ;;; Documentation diff --git a/tools/test-environment.lisp b/tools/test-environment.lisp index 3508ccbab..a4e48802a 100644 --- a/tools/test-environment.lisp +++ b/tools/test-environment.lisp @@ -136,7 +136,7 @@ and which systems to test loading with ASDF_TEST_SYSTEMS or s= (upgrade-methods ((upgrade-methods *upgrade-test-methods*)) (setf upgrade-methods (get-upgrade-methods upgrade-methods))) (new-version (new-version) - (setf new-version (or new-version (next-version (version-from-file)))))) + (setf new-version (or new-version (compute-next-version (version-from-file)))))) :for arg :in args :for (found larg init) = (assoc arg argmap) :append (if found larg (list arg)) :into largs diff --git a/tools/version.lisp b/tools/version.lisp index cf53e7f9f..9440b2c36 100644 --- a/tools/version.lisp +++ b/tools/version.lisp @@ -51,7 +51,7 @@ (defparameter *old-version* :default) (defparameter *new-version* :default) -(defun next-version (v) +(defun compute-next-version (v) (let ((pv (parse-version v 'error))) (assert (first pv)) (assert (second pv)) @@ -70,7 +70,7 @@ (v1 (check (version-from-file) v1)) ((not (eq *new-version* :default)) *new-version*) ;; Ugly passing of argument from Makefile. (t (let ((old (version-from-file))) - (check old (next-version old))))))) + (check old (compute-next-version old))))))) (deftype byte-vector () '(array (unsigned-byte 8) (*))) -- GitLab