Raymond Toy pushed to branch issue-415-add-package-local-nicknames at cmucl / cmucl Commits: d6faeaef by Raymond Toy at 2025-06-09T08:51:48-07:00 Remove extra closing parenthesis There was an extra closing parenthesis at the end of `precompile-ef-slot`. Remove it. [skip-ci] - - - - - 4e6e1afe by Raymond Toy at 2025-06-09T10:39:52-07:00 Update with new resolved issues Add #404 and #405 to the list of fixed issues. - - - - - 852aaef6 by Raymond Toy at 2025-06-10T08:06:34-07:00 Fix typo in docstring for with-string-{glyph,codepoint}-iterator "prodcucing" -> "producing" Update pot file too of course. - - - - - d6a6c40d by Raymond Toy at 2025-06-10T18:21:12-07:00 Update and correct some comments The paths mentioned in the script are wrong so update them. Some the the examples are out-of-date so correct those too. Finally, mention that "bin/build.sh -?" gives help. - - - - - 46bd7cff by Raymond Toy at 2025-06-23T08:45:54-07:00 Fix 418: Update asdf to 3.3.7.4 - - - - - 9e6d1350 by Raymond Toy at 2025-06-23T08:45:54-07:00 Merge branch 'issue-418-update-asdf-to-3.3.7.4' into 'master' Fix 418: Update asdf to 3.3.7.4 See merge request cmucl/cmucl!307 - - - - - c1e52c69 by Raymond Toy at 2025-06-23T10:16:33-07:00 Merge branch 'master' into issue-415-add-package-local-nicknames - - - - - 9 changed files: - bin/build.sh - src/code/extfmts.lisp - src/code/string.lisp - src/contrib/asdf/asdf.lisp - src/contrib/asdf/doc/asdf.html - src/contrib/asdf/doc/asdf.info - src/contrib/asdf/doc/asdf.pdf - src/general-info/release-21f.md - src/i18n/locale/cmucl.pot Changes: ===================================== bin/build.sh ===================================== @@ -1,26 +1,25 @@ #!/bin/sh # Build CMUCL from source. The intent of this script is to make it a -# little easier invoke the other scripts and build CMUCL. In the +# little easier to invoke the other scripts and build CMUCL. In the # simplest case where your lisp is named cmulisp and no special # bootfiles are needed, you would build CMUCL using: # -# src/tools/build.sh -C "" +# bin/build.sh -b build -C "" -o cmulisp # # This will create a set of directories named build-2, build-3, and # build-4 and CMUCL will be built 3 consecutive times, using the # version of CMUCL from the previous build. # -# # You can control which of the builds are done by using the -1, -2, -3 # options, but it is up to you to make sure the previous builds exist. # # A more realistic example would be # -# src/tools/build.sh -v "My build" -B boot-19b.lisp -o "my-lisp -noinit" +# bin/build.sh -C "linux" -B boot-19b.lisp -o "my-lisp" # # where you need to load the bootfile boot-19b.lisp and your lisp is -# not named cmulisp, but my-lisp. +# not named lisp, but my-lisp. # # For more complicated builds, you will need to run create-target.sh # manually, and adjust the bootstrap or setenv files by hand. Once @@ -30,7 +29,7 @@ # Cross compiling is not supported with this script. You will have to # do that by hand. # -# For more information see src/BUILDING. +# For more information run "bin/build.sh -?". Also see BUILDING.md. # # $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/build.sh,v 1.38 2010/11/10 19:17:55 rtoy Exp $ # ===================================== src/code/extfmts.lisp ===================================== @@ -1299,7 +1299,7 @@ character and illegal outputs are replaced by a question mark.") (#.+ef-oc+ (%ef-octet-count ef)))) `(setf (aref (ef-cache (find-external-format ,(ef-name ef))) ,slot) ,(subst (ef-name ef) ef - (function-lambda-expression (aref (ef-cache ef) slot))))))) + (function-lambda-expression (aref (ef-cache ef) slot)))))) ;;; Builtin external formats. ===================================== src/code/string.lisp ===================================== @@ -90,7 +90,7 @@ (defmacro with-string-codepoint-iterator ((next string) &body body) _N"WITH-STRING-CODEPOINT-ITERATOR ((next string) &body body) provides a method of looping through a string from the beginning to - the end of the string prodcucing successive codepoints from the + the end of the string producing successive codepoints from the string. NEXT is bound to a generator macro that, within the scope of the invocation, returns one or two values. The first value tells whether any objects remain in the string. When the first value is @@ -989,7 +989,7 @@ (defmacro with-string-glyph-iterator ((next string) &body body) _N"WITH-STRING-GLYPH-ITERATOR ((next string) &body body) provides a method of looping through a string from the beginning to - the end of the string prodcucing successive glyphs from the string. + the end of the string producing successive glyphs from the string. NEXT is bound to a generator macro that, within the scope of the invocation, returns one or three values. The first value tells whether any objects remain in the string. When the first value is ===================================== src/contrib/asdf/asdf.lisp ===================================== @@ -1,5 +1,5 @@ ;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; Package: CL-USER ; buffer-read-only: t; -*- -;;; This is ASDF 3.3.7: Another System Definition Facility. +;;; This is ASDF 3.3.7.4: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. @@ -1165,7 +1165,7 @@ Return a string made of the parts not omitted or emitted by FROB." (defmacro compatfmt (format) #+(or gcl genera) - (frob-substrings format `("~3i~_" #+genera ,@'("~@<" "~@;" "~@:>" "~:>"))) + (frob-substrings format `("~3i~_" "~@<" "~@;" "~@:>" "~:>")) #-(or gcl genera) format)) ;;;; ------------------------------------------------------------------------- ;;;; General Purpose Utilities for ASDF @@ -1848,7 +1848,7 @@ form suitable for testing with #+." (in-package :uiop/version) (with-upgradability () - (defparameter *uiop-version* "3.3.7") + (defparameter *uiop-version* "3.3.7.4") (defun unparse-version (version-list) "From a parsed version (a list of natural numbers), compute the version string" @@ -2064,7 +2064,7 @@ keywords explicitly." (defun os-unix-p () "Is the underlying operating system some Unix variant?" - (or (featurep '(:or :unix :cygwin :haiku)) (os-macosx-p))) + (or (featurep '(:or :unix :cygwin :haiku :linux)) (os-macosx-p))) (defun os-windows-p () "Is the underlying operating system Microsoft Windows?" @@ -2376,7 +2376,7 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie (error "Could not set current directory to ~A" x)) #+ecl (ext:chdir x) #+clasp (ext:chdir x t) - #+gcl (system:chdir x) + #+gcl (system::chdir x) #+lispworks (hcl:change-directory x) #+mkcl (mk-ext:chdir x) #+sbcl (progn (require :sb-posix) (symbol-call :sb-posix :chdir (sb-ext:native-namestring x))) @@ -2811,6 +2811,7 @@ actually-existing directory." ;;; Parsing filenames (with-upgradability () + #-gcl (declaim (ftype function ensure-pathname)) ; forward reference (defun split-unix-namestring-directory-components @@ -3339,20 +3340,6 @@ or the original (parsed) pathname if it is false (the default)." (when p #+allegro (probe-file p :follow-symlinks truename) - #+gcl - (if truename - (truename* p) - (let ((kind (car (si::stat p)))) - (when (eq kind :link) - (setf kind (ignore-errors (car (si::stat (truename* p)))))) - (ecase kind - ((nil) nil) - ((:file :link) - (cond - ((file-pathname-p p) p) - ((directory-pathname-p p) - (subpathname p (car (last (pathname-directory p))))))) - (:directory (ensure-directory-pathname p))))) #+clisp #.(let* ((fs (or #-os-windows (find-symbol* '#:file-stat :posix nil))) (pp (find-symbol* '#:probe-pathname :ext nil))) @@ -3367,7 +3354,7 @@ or the original (parsed) pathname if it is false (the default)." (t '(or (and (truename* p) p) (if-let (d (ensure-directory-pathname p)) (and (truename* d) d))))))) - #-(or allegro clisp gcl) + #-(or allegro clisp) (if truename (probe-file p) (and @@ -6304,13 +6291,13 @@ MAKE-INSTANCE. Primarily, it is being made available to enable type-checking.")) (not-implemented-error 'process-info-pid))) (defun %process-status (process-info) + #-(or allegro clozure cmucl ecl lispworks mkcl sbcl scl) + (not-implemented-error '%process-status) (if-let (exit-code (slot-value process-info 'exit-code)) (return-from %process-status (if-let (signal-code (slot-value process-info 'signal-code)) (values :signaled signal-code) (values :exited exit-code)))) - #-(or allegro clasp clozure cmucl ecl lispworks mkcl sbcl scl) - (not-implemented-error '%process-status) (if-let (process (slot-value process-info 'process)) (multiple-value-bind (status code) (progn @@ -6322,13 +6309,13 @@ MAKE-INSTANCE. Primarily, it is being made available to enable type-checking.")) (symbol-call :ext '#:external-process-status process) (not-implemented-error '%process-status)) #+clozure (ccl:external-process-status process) - #+(or cmucl scl) (let ((status (ext:process-status process))) - (if (member status '(:exited :signaled)) - ;; Calling ext:process-exit-code on - ;; processes that are still alive - ;; yields an undefined result - (values status (ext:process-exit-code process)) - status)) + #+cmucl (let ((status (ext:process-status process))) + (if (member status '(:exited :signaled :stopped)) + ;; ext:process-exit-code can also be called + ;; for stopped processes to determine the + ;; signal that stopped them + (values status (ext:process-exit-code process)) + status)) #+ecl (ext:external-process-status process) #+lispworks ;; a signal is only returned on LispWorks 7+ @@ -6353,7 +6340,14 @@ MAKE-INSTANCE. Primarily, it is being made available to enable type-checking.")) ;; sb-ext:process-exit-code can also be ;; called for stopped processes to determine ;; the signal that stopped them - (values status (sb-ext:process-exit-code process))))) + (values status (sb-ext:process-exit-code process)))) + #+scl (let ((status (ext:process-status process))) + (if (member status '(:exited :signaled)) + ;; Calling ext:process-exit-code on + ;; processes that are still alive + ;; yields an undefined result + (values status (ext:process-exit-code process)) + status))) (case status (:exited (setf (slot-value process-info 'exit-code) code)) (:signaled (let ((%code (%signal-to-exit-code code))) @@ -6663,7 +6657,7 @@ could block because its output buffers are full." (not-implemented-error 'launch-program)) #+clozure 'ccl:run-program #+(or cmucl ecl scl) 'ext:run-program - + #+lispworks ,@'('system:run-shell-command `("/usr/bin/env" ,@command)) ; full path needed #+mkcl 'mk-ext:run-program #+sbcl 'sb-ext:run-program @@ -6751,7 +6745,6 @@ could block because its output buffers are full." ;; returns (io err pid) of which we keep io. (t (prop 'process io-or-pid))))) process-info))) - ;;;; ------------------------------------------------------------------------- ;;;; run-program initially from xcvb-driver. @@ -7966,7 +7959,7 @@ previously-loaded version of ASDF." ;; "3.4.5.67" would be a development version in the official branch, on top 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 "3.3.7") + (asdf-version "3.3.7.4") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) @@ -14111,7 +14104,8 @@ system or its dependencies if it has already been loaded." (setf excl:*warn-on-nested-reader-conditionals* uiop/common-lisp::*acl-warn-save*)) #+(and allegro allegro-v10.1) ;; check for patch needed for upgradeability - (unless (assoc "ma040" (cdr (assoc :lisp sys:*patches*)) :test 'equal) + (when (and (not (member :developer excl::.build-mode. :test #'eq)) + (not (assoc "ma040" (cdr (assoc :lisp sys:*patches*)) :test 'equal))) (warn 'asdf-install-warning :format-control "On Allegro Common Lisp 10.1, patch pma040 is ~ needed for correct ASDF upgrading. Please update your Allegro image ~ ===================================== src/contrib/asdf/doc/asdf.html ===================================== The diff for this file was not included because it is too large. ===================================== src/contrib/asdf/doc/asdf.info ===================================== The diff for this file was not included because it is too large. ===================================== src/contrib/asdf/doc/asdf.pdf ===================================== Binary files a/src/contrib/asdf/doc/asdf.pdf and b/src/contrib/asdf/doc/asdf.pdf differ ===================================== src/general-info/release-21f.md ===================================== @@ -23,7 +23,7 @@ public domain. * Add support for Gray streams implementation of file-length via `ext:stream-file-length` generic function. * Changes: - * Update to ASDF 3.3.7 + * Update to ASDF 3.3.7.4 * The RNG has changed from an old version of xoroshiro128+ to xoroshiro128**. This means sequences of random numbers will be different from before. See ~~#276~~. @@ -131,6 +131,8 @@ public domain. * #398 Update mk:defsystem to v3.9.2 * #400 `unix-resolve-links` no longer breaks on some lengths * #401 `file-position` now returns the correct value + * #404 Use `realpath(3)` to implement `unix::unix-resolve-links` + * #405 `unix::unix-resolve-links` has been removed. * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -3716,7 +3716,7 @@ msgstr "" msgid "" "WITH-STRING-CODEPOINT-ITERATOR ((next string) &body body)\n" " provides a method of looping through a string from the beginning to\n" -" the end of the string prodcucing successive codepoints from the\n" +" the end of the string producing successive codepoints from the\n" " string. NEXT is bound to a generator macro that, within the scope\n" " of the invocation, returns one or two values. The first value tells\n" " whether any objects remain in the string. When the first value is\n" @@ -3985,7 +3985,7 @@ msgstr "" msgid "" "WITH-STRING-GLYPH-ITERATOR ((next string) &body body)\n" " provides a method of looping through a string from the beginning to\n" -" the end of the string prodcucing successive glyphs from the string.\n" +" the end of the string producing successive glyphs from the string.\n" " NEXT is bound to a generator macro that, within the scope of the\n" " invocation, returns one or three values. The first value tells\n" " whether any objects remain in the string. When the first value is\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/66c4a529989259ef3596a9a... -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/66c4a529989259ef3596a9a... You're receiving this email because of your account on gitlab.common-lisp.net.