diff --git a/asdf.lisp b/asdf.lisp index ea6ddfc26b7a8c3d517ba3e7038bb0f6ed0c09e7..859d93c3fbc6d02a1f7dd0bf05adb846f44343f3 100644 --- a/asdf.lisp +++ b/asdf.lisp @@ -70,7 +70,7 @@ :test 'equalp :key 'car)) (let* ((asdf-version ;; the 1+ helps the version bumping script discriminate - (subseq "VERSION:1.728" (1+ (length "VERSION")))) + (subseq "VERSION:2.000" (1+ (length "VERSION")))) (existing-asdf (find-package :asdf)) (vername '#:*asdf-version*) (versym (and existing-asdf @@ -337,7 +337,7 @@ (defun asdf-version () "Exported interface to the version of ASDF currently installed. A string. You can compare this string with e.g.: -(ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSION) \"1.704\")." +(ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSION) \"2.000\")." *asdf-version*) (defvar *resolve-symlinks* t @@ -3361,7 +3361,7 @@ with a different configuration, so the configuration would be re-read then." (setf excl:*warn-on-nested-reader-conditionals* *acl-warn-save*))) (pushnew :asdf *features*) -(pushnew :asdf2 *features*) ;; this is a release candidate for ASDF 2.0 +(pushnew :asdf2 *features*) (provide :asdf) diff --git a/doc/asdf.texinfo b/doc/asdf.texinfo index 4499b53067f213bc642dd0153c7c1164303f2fb8..75843ccd0c465524d525a70648d9c0e65cba0506 100644 --- a/doc/asdf.texinfo +++ b/doc/asdf.texinfo @@ -170,11 +170,9 @@ to learn how to define a system of your own. the ASDF internals and how to extend ASDF. @emph{Nota Bene}: -We are preparing for a release of ASDF 2, hopefully for May 2010, -which will have version 2.000 and later. -Current releases, in the 1.700 series and beyond, -should be considered as release candidates. -We're still working on polishing the code and documentation. +We have released ASDF 2.000 on May 31st 2010. +It hopefully will have been it included +in all CL maintained implementations shortly afterwards. @xref{FAQ,,``What has changed between ASDF 1 and ASDF 2?''}. @@ -241,7 +239,7 @@ If it returns the keyword @code{:OLD}, then you're using an old version of ASDF (from before 1.635). If it returns @code{NIL} then ASDF is not installed. -If you are running a version older than 1.711, +If you are running a version older than 2.000, we recommend that you load a newer ASDF using the method below. @@ -2522,26 +2520,21 @@ use the @url{http://common-lisp.net/cgi-bin/mailman/listinfo/asdf-devel,asdf-dev @subsection What are ASDF 1 and ASDF 2? -We are preparing for a release of ASDF 2, -which will have version 2.000 and later. -While the code and documentation are essentially complete -we are still working on polishing them before release. +On May 31st 2010, we have released ASDF 2. +ASDF 2 refers to release 2.000 and later. +(Releases between 1.656 and 1.728 were development releases for ASDF 2.) +ASDF 1 to any release earlier than 1.369 or so. +If your ASDF doesn't sport a version, it's an old ASDF 1. -Releases in the 1.700 series and beyond -should be considered as release candidates. -For all practical purposes, -ASDF 2 refers to releases later than 1.656, -and ASDF 1 to any release earlier than 1.369 or so. -If your ASDF doesn't have a version, it's old. - -ASDF 2 release candidates and beyond will have +ASDF 2 and its release candidates push @code{:asdf2} onto @code{*features*} so that if you are writing ASDF-dependent code you may check for this feature to see if the new API is present. @emph{All} versions of ASDF should have the @code{:asdf} feature. If you are experiencing problems or limitations of any sort with ASDF 1, -we recommend that you should upgrade to ASDF 2 or its latest release candidate. +we recommend that you should upgrade to ASDF 2, +or whatever is the latest release. @subsection ASDF can portably name files in subdirectories @@ -2689,7 +2682,7 @@ or take great pains to have the correct version of ASDF installed. With ASDF 2, we provide a new stable set of working features that everyone can rely on from now on. Use @code{#+asdf2} to detect presence of ASDF 2, -@code{(asdf:version-satisfies (asdf:asdf-version) "1.711")} +@code{(asdf:version-satisfies (asdf:asdf-version) "2.000")} to check the availability of a version no earlier than required. diff --git a/test/test-utilities.script b/test/test-utilities.script index 5be682f6f909f50b37ceecde874ad2a1212197b1..45084d609d632480d1371d5239670f9e9239aed6 100644 --- a/test/test-utilities.script +++ b/test/test-utilities.script @@ -39,8 +39,7 @@ (assert (asdf::version-satisfies (asdf:asdf-version) (asdf:asdf-version))) (assert - (asdf::version-satisfies (asdf:asdf-version) "1.608")) + (asdf::version-satisfies (asdf:asdf-version) "2.000")) (assert (not (asdf::version-satisfies (asdf:asdf-version) "666"))) - )