January 2025 - cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][issue-363-add-version-number] 2 commits: Forcibly create symlink for lisp
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: b4d0c2b7 by Raymond Toy at 2025-01-05T13:30:06-08:00 Forcibly create symlink for lisp - - - - - 5b45c46f by Raymond Toy at 2025-01-05T13:30:24-08:00 Install src and tests dir in share/cmucl/<version/ - - - - - 2 changed files: - bin/make-main-dist.sh - bin/make-src-dist.sh Changes: ===================================== bin/make-main-dist.sh ===================================== @@ -141,7 +141,7 @@ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${DOCDIR} install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR} install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/lisp-$VERSION # Install symlink for lisp -(cd $DESTDIR/bin; ln -s lisp-$VERSION lisp) +(cd $DESTDIR/bin; ln -fs lisp-$VERSION lisp) if [ "$EXECUTABLE" = "true" ] then ===================================== bin/make-src-dist.sh ===================================== @@ -52,12 +52,18 @@ else VERSION="`date '+%Y-%m-%d-%H:%M:%S'`" fi +DESTDIR=${INSTALL_DIR:-release-$$} + echo Creating source distribution +set -x GTAR_OPTIONS="--exclude=.git --exclude='*.pot.~*~'" +install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/share/cmucl/$VERSION/ +${GTAR} ${GTAR_OPTIONS} -cf - src tests | (cd $DESTDIR/share/cmucl/$VERSION; ${GTAR} xf -) if [ -z "$INSTALL_DIR" ]; then # echo " Compressing with $ZIP" - ${GTAR} ${GTAR_OPTIONS} ${COMPRESS} -cf cmucl-src-$VERSION.tar.$COMPRESS_EXT bin src tests + ls $DESTDIR/share/cmucl/$VERSION/ + ${GTAR} ${GTAR_OPTIONS} ${COMPRESS} -C $DESTDIR -cf cmucl-src-$VERSION.tar.$COMPRESS_EXT share/cmucl/$VERSION/src else # Install in the specified directory - ${GTAR} ${GTAR_OPTIONS} -cf - bin src tests | (cd $INSTALL_DIR; ${GTAR:-tar} xf -) + ${GTAR} ${GTAR_OPTIONS} -cf - src tests | (cd $DESTDIR/share/cmucl/$VERSION; ${GTAR:-tar} xf -) fi View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/1232e93a9f7d33a32c2a92… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/1232e93a9f7d33a32c2a92… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Specify lib path when doing build using the cross-compiler
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 1232e93a by Raymond Toy at 2025-01-05T08:57:59-08:00 Specify lib path when doing build using the cross-compiler Because we don't install the result of the cross-compilation (should we?), we need to use the `-lib` option to tell lisp where the core file is. Or maybe use `-core` instead?. We'll use `-lib` since that's what we use everywhere else. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -80,7 +80,7 @@ linux:cross-build: - bin/create-target.sh xtarget - bin/create-target.sh xcross - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp - - bin/build.sh -b xlinux $bootstrap -R -C "" -o xtarget/lisp/lisp + - bin/build.sh -b xlinux $bootstrap -R -C "" -o "xtarget/lisp/lisp -lib xtarget/lisp" - bin/make-dist.sh -I xdist xlinux-4 linux:test: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1232e93a9f7d33a32c2a922… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1232e93a9f7d33a32c2a922… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] For now, don't use -V for make-dist.sh in the build stage
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 4d3a4fa3 by Raymond Toy at 2025-01-05T07:48:50-08:00 For now, don't use -V for make-dist.sh in the build stage Forgot to remove -V from the other build stages. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -81,7 +81,7 @@ linux:cross-build: - bin/create-target.sh xcross - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp - bin/build.sh -b xlinux $bootstrap -R -C "" -o xtarget/lisp/lisp - - bin/make-dist.sh -V `git describe --dirty` -I xdist xlinux-4 + - bin/make-dist.sh -I xdist xlinux-4 linux:test: stage: test @@ -194,9 +194,9 @@ osx:build: # Regular build using the cross-compiled result or snapshot. # Need /opt/local/bin to get msgmerge and msgfmt programs. - PATH=/opt/local/bin:$PATH bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - # Use -V to specify the version in case some tag makes git + # If needed use -V to specify the version in case some tag makes git # describe return something that make-dist.sh doesn't like. - - bin/make-dist.sh -V `git describe --dirty` -I dist darwin-4 + - bin/make-dist.sh -I dist darwin-4 osx:test: stage: test @@ -319,9 +319,9 @@ opensuse:build: # instead of clang. - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - # Use -V to specify the version in case some tag makes git + # If needed use -V to specify the version in case some tag makes git # describe return something that make-dist.sh doesn't like. - - bin/make-dist.sh -V `git describe --dirty` -I dist linux-4 + - bin/make-dist.sh -I dist linux-4 opensuse:test: stage: test View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/4d3a4fa3ee815f5a495a2c0… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/4d3a4fa3ee815f5a495a2c0… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] For now, don't use -V for make-dist.sh in the build stage
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 8ed108a6 by Raymond Toy at 2025-01-04T21:04:35-08:00 For now, don't use -V for make-dist.sh in the build stage By using -V we get the incorrect version that's built into the lisp runtime so we can't find core file. Probably need to revisit this later? - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -51,9 +51,9 @@ linux:build: # instead of clang. - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - # Use -V to specify the version in case some tag makes git + # If needed use -V to specify the version in case some tag makes git # describe return something that make-dist.sh doesn't like. - - bin/make-dist.sh -V `git describe --dirty` -I dist linux-4 + - bin/make-dist.sh -I dist linux-4 linux:cross-build: stage: build View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8ed108a611ac74a30fc1ecb… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8ed108a611ac74a30fc1ecb… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Install main items in the correct places.
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: e0b1282a by Raymond Toy at 2025-01-04T19:46:06-08:00 Install main items in the correct places. Very important that we install a symlink for bin/lisp to the actual lisp binary. Update directories so that install puts the items in the correct versioned names and directories. - - - - - 1 changed file: - bin/make-main-dist.sh Changes: ===================================== bin/make-main-dist.sh ===================================== @@ -64,16 +64,24 @@ then exit 2 fi -DESTDIR=${INSTALL_DIR:-release-$$} -DOCDIR=${DOCDIR:-doc/cmucl} -MANDIR=${MANDIR:-man/man1} -TARGET="`echo $1 | sed 's:/*$::'`" VERSION=$2 ARCH=$3 OS=$4 +# Where to install the main library of cmucl files CMUCLLIBVER="lib/cmucl/$VERSION" +# Where to install everything +DESTDIR=${INSTALL_DIR:-release-$$} + +# Where to install docs +DOCDIR=${DOCDIR:-share/cmucl/$VERSION/doc} + +# Where to install man pages +MANDIR=${MANDIR:-share/man/man1} + +TARGET="`echo $1 | sed 's:/*$::'`" + # Core file to look for. CORE=lisp.core case $ARCH in @@ -132,6 +140,9 @@ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/$CMUCLLIBVER/lib/ext-formats install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${DOCDIR} install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR} install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/lisp-$VERSION +# Install symlink for lisp +(cd $DESTDIR/bin; ln -s lisp-$VERSION lisp) + if [ "$EXECUTABLE" = "true" ] then install ${GROUP} ${OWNER} -m 0644 $TARGET/lisp/lisp.a $DESTDIR/$CMUCLLIBVER/lib/ @@ -203,16 +214,17 @@ do done install ${GROUP} ${OWNER} -m 0644 src/general-info/cmucl.1 \ - $DESTDIR/${MANDIR}/ + $DESTDIR/${MANDIR}/cmucl-$VERSION.1 install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \ - $DESTDIR/${MANDIR}/ + $DESTDIR/${MANDIR}/lisp-$VERSION.1 +set -x install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/${DOCDIR} if [ -f src/general-info/release-$VERSION.txt ] then install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt \ $DESTDIR/${DOCDIR} fi - +set +x if [ -z "$INSTALL_DIR" ]; then sync ; sleep 1 ; sync ; sleep 1 ; sync echo Tarring main components View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e0b1282a50cf24511f37732… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e0b1282a50cf24511f37732… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Fix building lisp
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 9b12f4ae by Raymond Toy at 2025-01-04T18:34:59-08:00 Fix building lisp For build.sh, first, echo out the command used to build each stage so that we can see that we're using the correct args. Second, we incorrectly used the wrong core file with the stage 3 lisp; it was using the core from stage 2. Third, we forgot to pass the `-lib` option for building stage 4 so it couldn't find the core file. For build-utils.sh, we need to add a `-lib` option so lisp can find the core file. - - - - - 2 changed files: - bin/build-utils.sh - bin/build.sh Changes: ===================================== bin/build-utils.sh ===================================== @@ -16,7 +16,7 @@ TARGET="`echo $1 | sed 's:/*$::'`" shift $TARGET/lisp/lisp \ - -noinit -nositeinit -batch "$@" <<EOF || exit 3 + -lib $TARGET/lisp -noinit -nositeinit -batch "$@" <<EOF || exit 3 (in-package :cl-user) (setf lisp::*enable-package-locked-errors* nil) ===================================== bin/build.sh ===================================== @@ -141,7 +141,9 @@ buildit () if [ "$ENABLE" = "yes" ]; then $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; } + set -x time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } + set +x if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET fi @@ -152,11 +154,15 @@ buildit () if [ "$BUILD_WORLD2" = "yes" ]; then + set -x $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } + set +x fi $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; } + set -x $TARGET/lisp/lisp -lib $TARGET/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; } + set +x return 0; fi } @@ -244,7 +250,7 @@ buildit TARGET=$BASE-4 CLEAN_FLAGS="-K all" -OLDLISP="${BASE}-3/lisp/lisp -lib ${BASE}-2/lisp $OLDLISPFLAGS" +OLDLISP="${BASE}-3/lisp/lisp -lib ${BASE}-3/lisp $OLDLISPFLAGS" ENABLE=$ENABLE4 if [ "${BUILD_POT}" = "yes" ]; then @@ -262,7 +268,7 @@ buildit # Asdf and friends are part of the base install, so we need to build # them now. -$TARGET/lisp/lisp -noinit -nositeinit -batch << EOF || exit 3 +$TARGET/lisp/lisp -lib $TARGET/lisp -noinit -nositeinit -batch << EOF || exit 3 (in-package :cl-user) (setf (ext:search-list "target:") '("$TARGET/" "src/")) @@ -282,7 +288,7 @@ EOF if [ "$SKIPUTILS" = "no" ]; then - OLDLISP="${BASE}-4/lisp/lisp $OLDLISPFLAGS" + OLDLISP="${BASE}-4/lisp/lisp -lib ${BASE}-4/lisp $OLDLISPFLAGS" time $TOOLDIR/build-utils.sh $TARGET fi View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9b12f4ae827cb54bf9d0aa3… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9b12f4ae827cb54bf9d0aa3… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-363-add-version-number
by Raymond Toy (＠rtoy) 04 Jan '25

04 Jan '25

Raymond Toy pushed new branch issue-363-add-version-number at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-363-add-version-num… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] mkdtemp needs to encode/decode Lisp strings
by Raymond Toy (＠rtoy) 03 Jan '25

03 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 3d4af597 by Raymond Toy at 2025-01-03T13:35:21-08:00 mkdtemp needs to encode/decode Lisp strings Before calling `mkdtemp`, we need to convert the Lisp string to octets. On return, the octets that were passed to `mkdtemp` have been modified to hold the directory name. These octets need to be converted back to a Lisp string. Tested with the template "/tmp/α-dir-XXXXXX". The result was "/tmp/α-dir-jSt2SC". I verified that this directory was actually created. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2932,27 +2932,12 @@ which must have \"XXXXXX\" as the last six characters. The directory is created with permissions 0700. The name of the directory is returned." - (let* ((new-template (copy-seq template)) + (let* ((octets (%name->file template)) (result (alien-funcall (extern-alien "mkdtemp" (function (* char) c-call:c-string)) - new-template))) - (if (zerop (deref result 0)) - (values nil (unix-errno)) - (cast result c-call:c-string)))) - -(defun unix-mkdtemp (template) - _N"Generate a uniquely named temporary directory from Template, - which must have \"XXXXXX\" as the last six characters. The - directory is created with permissions 0700. The name of the - directory is returned." - (let* ((new-template (copy-seq template)) - (result (alien-funcall - (extern-alien "mkdtemp" - (function (* char) - c-call:c-string)) - new-template))) + octets))) (if (zerop (sap-int (alien-sap result))) (values nil (unix-errno)) - (cast result c-string)))) + (%file->name octets)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3d4af597c0f721644199648… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3d4af597c0f721644199648… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] unix-mkstemp returns the file descriptor and the file name
by Raymond Toy (＠rtoy) 03 Jan '25

03 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 1beae8cb by Raymond Toy at 2025-01-03T12:00:26-08:00 unix-mkstemp returns the file descriptor and the file name Previously, we only returned the file descriptor. Now we return the descriptor and the file name associated with the file. This is available to us because `mkstemp` modifies the template with the actual file name. Also, we use %name->file to encode the Lisp string into a set of octets to pass to `mkstemp`. This means we need to convert updated template to a Lisp string. Tested this using the template "/tmp/α-XXXXXX" (alpha character followed by "-XXXXXX"). The resulting file name was "/tmp/α-L2egJE" whith the X's appropriately replaced. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2902,13 +2902,30 @@ c-string)) (defun unix-mkstemp (template) - _N"Generates a unique temporary file name from TEMPLATE, creates and - opens the file and returns a file stream for the file. + _N"Generates a unique temporary file name from TEMPLATE, and creates + and opens the file. On success, the corresponding file descriptor + and name of the file is returned. The last six characters of the template must be \"XXXXXX\"." - (syscall ("mkstemp" c-call:c-string) - result - (copy-seq template))) + ;; Hope this buffer is large enough! + (let ((octets (%name->file template))) + (unless (< (length octets) 8192) + (error "Internal buffer is too small for encoded file name of ~D octets" + (length octets))) + (with-alien ((buf (array c-call:unsigned-char 8192))) + ;; Convert the Lisp string and copy it to the alien buffer, being + ;; sure to zero-terminate the buffer. + (loop for k from 0 + for c across octets + do + (setf (deref buf k) (char-code c)) + finally (setf (deref buf k) 0)) + + (syscall ("mkstemp" (* c-call:unsigned-char)) + (values result + ;; Convert the file name back to a Lisp string. + (%file->name (cast buf c-call:c-string))) + (cast buf (* c-call:unsigned-char)))))) (defun unix-mkdtemp (template) _N"Generate a uniquely named temporary directory from Template, View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1beae8cbd0a126b59d7fab9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1beae8cbd0a126b59d7fab9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] Error out if mkstemp fails
by Raymond Toy (＠rtoy) 01 Jan '25

01 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 2ea25988 by Raymond Toy at 2025-01-01T14:17:46-08:00 Error out if mkstemp fails If `mkstemp` can't create a temp file, signal an error about it. - - - - - 1 changed file: - src/code/extensions.lisp Changes: ===================================== src/code/extensions.lisp ===================================== @@ -637,29 +637,34 @@ :decoding-error - How to handle decoding errors. See OPEN :encoding-error - How to handle encoding errors. See OPEN" (let ((abortp (gensym)) - (template (gensym "TEMPLATE-"))) + (template (gensym "TEMPLATE-")) + (fd (gensym "FD-"))) `(let* ((,template (concatenate 'string ,template-prefix "XXXXXX")) - (,var (lisp::make-fd-stream (unix::unix-mkstemp ,template) - :auto-close t - :file ,template - :output t - :input t - :element-type ',element-type - :external-format ,external-format - :decoding-error ,decoding-error - :encoding-error ,encoding-error - :buffering ,buffering)) - (,abortp t)) - ,@decls - (unwind-protect - (multiple-value-prog1 - (progn ,@forms) - (setq ,abortp nil)) - (when ,var - (close ,var :abort ,abortp)))))) + (,fd (unix::unix-mkstemp ,template))) + (unless ,fd + (error "Could not create temporary file using template ~A" + ,template)) + (let ((,var (lisp::make-fd-stream (unix::unix-mkstemp ,template) + :auto-close t + :file ,template + :output t + :input t + :element-type ',element-type + :external-format ,external-format + :decoding-error ,decoding-error + :encoding-error ,encoding-error + :buffering ,buffering)) + (,abortp t)) + ,@decls + (unwind-protect + (multiple-value-prog1 + (progn ,@forms) + (setq ,abortp nil)) + (when ,var + (close ,var :abort ,abortp))))))) ;; WITH-TEMPORARY-DIRECTORY -- Public (defmacro with-temporary-directory ((var template-prefix) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2ea25988f79909ada0f0206… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2ea25988f79909ada0f0206… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0