diff --git a/Makefile b/Makefile index 59ca17c20e7f94ff11ed9773ae9d02b991337aaa..a47813b253c3a085d32f381d8d76ef2cc205cfb5 100644 --- a/Makefile +++ b/Makefile @@ -102,11 +102,12 @@ clean: done; \ fi; \ done - rm -rf build/ LICENSE test/try-reloading-dependency.asd + rm -rf build/ LICENSE test/try-reloading-dependency.asd test/hello-world-example + rm -rf .pc/ build-stamp debian/patches/ debian/debhelper.log debian/cl-asdf/ # debian crap ${MAKE} -C doc clean -mrproper: clean - rm -rf .pc/ build-stamp debian/patches/ debian/debhelper.log debian/cl-asdf/ # debian crap +mrproper: + git clean -xfd test-upgrade: build/asdf.lisp ./test/run-tests.sh -u ${l} diff --git a/TODO b/TODO index 2f7e1ae75e11c80c85f7a7fec9227eba68c4003d..60d0236d04db2e368f52c9b5c50af067b0900fad 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ +* fix directory-files to not return directories on CCL, etc. Add tests. * use cl-test-grid to see if asdf-user can :use most of UIOP. Unhappily, on SBCL, sb-grovel uses asdf and sb-ext, which causes a clash with run-program. diff --git a/asdf.asd b/asdf.asd index 025acb6e3197742ecac25d79716801c448ef47cd..9c41bd3e4d81dafc3065f5367f9ab673f740bc36 100644 --- a/asdf.asd +++ b/asdf.asd @@ -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.38" ;; to be automatically updated by make bump-version + :version "2.33" ;; 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. diff --git a/debian/changelog b/debian/changelog index 6d17fd0ccbf4d0264ef4571400f11b9d4917be84..dcf4dbad0520fa027e58b63f5d2646a5834d4d7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,9 @@ cl-asdf (2:2.33-1) unstable; urgency=low ASDF 2.33 is a set of cleanups since 2.32. Since previous release 2.32, it includes the following changes: - * deferred-warning receives yet more improvements for CCL. + * Portability tweaks for ABCL, Allegro, CCL, CLISP, ECL, LispWorks, SBCL. + + * deferred-warning received yet more improvements for CCL. * upgrade is made more robust in many cases, notably for ECL, SBCL, or when using UIOP with an old ASDF<=2.26. @@ -18,16 +20,17 @@ cl-asdf (2:2.33-1) unstable; urgency=low directory-exists-p, file-exists-p were added to UIOP, also better strcat, with reduce/strcat, base-string-p, etc. - * Portability tweaks for Allegro, Clozure, CLISP, ECL, LispWorks, SBCL. - * Recompilation avoided for things already done by defsystem-depends-on. * monolithic-fasl-op was fixed in cases when the main system has components. + * fasl-op and monolithic-fasl-op now work on ABCL trunk and upcoming 1.2.0, + and will eventually replace the ABCL-JAR contrib. + * *uninteresting-conditions* was added as a common list of conditions shared between the compile-time and load-time muffled conditions. - -- Francois-Rene Rideau Thu, 27 Mar 2013 13:30:26 -0500 + -- Francois-Rene Rideau Thu, 04 Apr 2013 01:54:26 -0400 cl-asdf (2:2.32-1) unstable; urgency=low @@ -141,9 +144,9 @@ cl-asdf (2:2.29-1) unstable; urgency=low cl-asdf (2:2.28-1) unstable; urgency=low - ASDF 2.28 is a quick patch to ASDF 2.27 to make it work better with - systems that specify a relative pathname, then at runtime (e.g. in tests) - use merge-pathnames or merge-pathnames* against it expecting a directory. + ASDF 2.28 is a quick patch to ASDF 2.27 to make it work better with + systems that specify a relative pathname, then at runtime (e.g. in tests) + use merge-pathnames or merge-pathnames* against it expecting a directory. -- Francois-Rene Rideau Fri, 01 Feb 2013 17:07:53 -0500 @@ -349,7 +352,7 @@ cl-asdf (2:2.27-1) unstable; urgency=low as per the utility asdf-driver:access-at. For instance, if your file specials.lisp is a defpackage, an in-package and a defparameter of the version, then you could use: - (:read-file-form "specials.lisp" :at (2 2)) + (:read-file-form "specials.lisp" :at (2 2)) This makes it easier for developers to manage versioning of one or multiple systems with a single master version location. @@ -394,8 +397,8 @@ cl-asdf (2:2.27-1) unstable; urgency=low * Tests were updated, notably including support for bundles, encodings, run-program, and more. They were successfully run on - abcl allegro allegromodern ccl clisp cmucl - ecl ecl_bytecodes lispworks sbcl scl xcl + abcl allegro allegromodern ccl clisp cmucl + ecl ecl_bytecodes lispworks sbcl scl xcl Manual tests were run on gcl2.6 genera lispworks-personal-edition. Untested remain cormancl mkcl rmcl. The internal test system itself was massively improved. diff --git a/header.lisp b/header.lisp index 384425f9abe21ccb27d7a4d95261cbd5bc9938f6..511becf318372bf7d86d8ee5510fc6ba9189bd78 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- -;;; This is ASDF 2.32.38: Another System Definition Facility. +;;; This is ASDF 2.33: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to . diff --git a/test/run-tests.sh b/test/run-tests.sh index aa0536c5fc1488f9f4416e061ed0853bfe5b0a17..7e0cc23d26b0b1bb30e9eb857f6731dd71a1663f 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -246,15 +246,33 @@ upgrade_tags () { if [ -n "$ASDF_UPGRADE_TEST_TAGS" ] ; then echo $ASDF_UPGRADE_TEST_TAGS ; return fi - # REQUIRE is a magic tag meaning whatever your implementation provides - # 1.85 is the last release by Daniel Barlow (not 1.37, which is the README revision!) - # 1.97 is the last release before Gary King takes over - # 1.369 is the last release by Gary King - # 2.000 to 2.019 and 2.20 to 2.27 and beyond are Faré's "stable" releases + # REQUIRE is a magic tag meaning whatever your implementation provides, if anything + # + # 1.85 (2004-05-16) is the last release by Daniel Barlow (not 1.37, which is the README revision!) + # 1.97 (2006-05-14) is the last release before Gary King takes over + # 1.369 (2009-10-27) is the last release by Gary King + # + # 2.000 to 2.019 and 2.20 to 2.26 and beyond are Faré's "stable" ASDF 2 releases # 2.26.61 is the last single-file, single-package ASDF. + # 2.27 and beyond are Faré's "stable" ASDF 3 pre-releases + # + # 2.000 (2010-05-31) was the first ASDF 2 release + # 2.008 (2010-09-10) was a somewhat stable ASDF 2 release + # 2.011 (2010-11-28) was used by CLISP 2.49, Debian squeeze, Ubuntu 10.04 LTS + # 2.014.6 (2011-04-06) was used by Quicklisp in 2011 + # 2.019 (2011-11-27) was stable + # 2.20 (2012-01-18) was in CCL 1.8, Ubuntu 12.04 LTS + # 2.22 (2012-06-12) was used by debian wheezy + # 2.26 (2012-10-30) was used by Quicklisp + # 2.27 (2013-02-01) is the first ASDF 3 pre-release + # 2.32 (2013-03-05) is the first really stable ASDF 3 pre-release + # echo REQUIRE 1.85 1.97 1.369 - git tag -l '2.0??' - git tag -l '2.??' + # git tag -l '2.0??' + # git tag -l '2.??' + echo 2.000 2.008 2.011 2.014.6 2.019 2.20 2.22 2.26 + echo 2.27 + git tag -l '2.3[2-9]' } upgrade_methods () { if [ -n "$ASDF_UPGRADE_TEST_METHODS" ] ; then diff --git a/upgrade.lisp b/upgrade.lisp index 7dc372479f9e4fa7f3c93bb038927d4a960727e9..36a4ef226a9613ba527faf9d8b07877f64ff8519 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -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.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 - (asdf-version "2.32.38") + (asdf-version "2.33") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) diff --git a/version.lisp-expr b/version.lisp-expr index db0f6f367555630991356eb522d80d4edf5a451f..8623b8dcdea306761f2371a8d9b8a92b004b8911 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.32.38" +"2.33"