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

[Git][cmucl/cmucl] Pushed new branch issue-365-add-strerror
by Raymond Toy (＠rtoy) 08 Jan '25

08 Jan '25

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

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] 2 commits: Yet another version of unix-mkstemp
by Raymond Toy (＠rtoy) 08 Jan '25

08 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 36f7ed64 by Raymond Toy at 2025-01-08T08:17:56-08:00 Yet another version of unix-mkstemp This is more in line with what we do for unix-mkdtemp. - - - - - 7bca4800 by Raymond Toy at 2025-01-08T08:21:43-08:00 Revert changes to exports.lisp and extensions.lisp We're not going to define macros for temporary files and directories in this MR. That's for another later MR. - - - - - 3 changed files: - src/code/exports.lisp - src/code/extensions.lisp - src/code/unix.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -1717,11 +1717,7 @@ "DESCRIBE-EXTERNAL-FORMAT" "LIST-ALL-EXTERNAL-FORMATS" "STRING-ENCODE" "STRING-DECODE" - "SET-SYSTEM-EXTERNAL-FORMAT") - ;; Temporary files/directories - (:export - "WITH-TEMPORARY-FILE" - "WITH-TEMPORARY-DIRECTORY")) + "SET-SYSTEM-EXTERNAL-FORMAT")) (defpackage "STREAM" (:import-from "SYSTEM" "LISP-STREAM") ===================================== src/code/extensions.lisp ===================================== @@ -22,8 +22,7 @@ read-char-no-edit listen-skip-whitespace concat-pnames iterate once-only collect do-anonymous undefined-value required-argument define-hash-cache defun-cached - cache-hash-eq do-hash - with-temporary-file)) + cache-hash-eq do-hash)) (import 'lisp::whitespace-char-p) @@ -613,73 +612,3 @@ "Return an EQ hash of X. The value of this hash for any given object can (of course) change at arbitary times." `(lisp::pointer-hash ,x)) - -;;; WITH-TEMPORARY-FILE -- Public -(defmacro with-temporary-file ((var template-prefix - &key - (element-type 'base-char) - (external-format :default) - (buffering :full) - decoding-error - encoding-error) - &parse-body (forms decls)) - _N"A temporary file is opened using the Open-args and bound to the - variable Var. The name of the temporary file uses Template-prefix - for the name. If the temporary file cannot be opened, the forms are - not evaluated. The Forms are executed, and when they terminate, - normally or otherwise, the file is closed. - - Defined keywords: - :element-type - Type of object to read or write. Default BASE-CHAR - :external-format - An external format name - :buffering - Buffering to use for the file. Must be one of - :NONE, :LINE, :FULL - :decoding-error - How to handle decoding errors. See OPEN - :encoding-error - How to handle encoding errors. See OPEN" - (let ((abortp (gensym)) - (template (gensym "TEMPLATE-")) - (fd (gensym "FD-"))) - - `(let* ((,template (concatenate 'string - ,template-prefix - "XXXXXX")) - (,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) - &parse-body (forms decls)) - _N"Create a temporary directory using Template-prefix as the name of the directory." - (let ((template (gensym "TEMPLATE-"))) - `(let ((,template (concatenate 'string ,template-prefix - "XXXXXX"))) - ,@decls - (let ((,var (unix::unix-mkdtemp ,template))) - (unless ,var - (error "Could not create temporary directory using template ~A" - ,template)) - (unwind-protect - (multiple-value-prog1 - (progn ,@forms))) - ;; Remove the directory - (unix:unix-rmdir ,var))))) ===================================== src/code/unix.lisp ===================================== @@ -2927,6 +2927,20 @@ (%file->name (cast buf c-call:c-string))) (cast buf (* c-call:unsigned-char)))))) +(defun unix-mkstemp (template) + _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\"." + ;; Hope this buffer is large enough! + (let ((octets (%name->file template))) + (syscall ("mkstemp" c-call:c-string) + (values result + ;; Convert the file name back to a Lisp string. + (%file->name octets)) + octets))) + (defun unix-mkdtemp (template) _N"Generate a uniquely named temporary directory from Template, which must have \"XXXXXX\" as the last six characters. The View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3d4af597c0f72164419964… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3d4af597c0f72164419964… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Use cmucl-version.sh to get the version
by Raymond Toy (＠rtoy) 06 Jan '25

06 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 659b14d6 by Raymond Toy at 2025-01-05T19:27:30-08:00 Use cmucl-version.sh to get the version Previously, we just implemented the code to extract the version in each file as needed. This, of course, is bad. Use the script `cmucl-version.sh` to get the version so that all the various places agree on the version. - - - - - 3 changed files: - bin/build.sh - bin/make-dist.sh - src/lisp/GNUmakefile Changes: ===================================== bin/build.sh ===================================== @@ -49,17 +49,7 @@ GIT_FILE_COMMENT="yes" export GIT_FILE_COMMENT SKIPUTILS=no -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`" -echo GIT_HASH = ${GIT_HASH} - -if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` -fi - -if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - DEFAULT_VERSION="${GIT_HASH}" -fi - +DEFAULT_VERSION="`bin/cmucl-version.sh`" export DEFAULT_VERISON # If gmake exists, assume it is GNU make and use it. ===================================== bin/make-dist.sh ===================================== @@ -97,17 +97,7 @@ def_arch_os # Choose a version based on the git hash as the default version. We # only compute a default if the git hash looks like a snapshot # ("snapshot-yyyy-mm") or a release number.. -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" - -echo GIT_HASH = ${GIT_HASH} - -if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` -fi - -if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - DEFAULT_VERSION="${GIT_HASH}" -fi +DEFAULT_VERSION="`bin/cmucl-version.sh`" # Default compression is -J (xz). These variables are passed to the # other scripts via the environmen, so export them. ===================================== src/lisp/GNUmakefile ===================================== @@ -41,8 +41,7 @@ OBJS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(patsubst %.s,%.o,$(SRCS)))) ### Don't look in RCS for the files, because we might not want the latest. %: RCS/%,v -GIT_HASH = $(shell git describe --dirty) -DEFAULT_VERSION = $(subst snapshot-,,${GIT_HASH}) +DEFAULT_VERSION = $(shell ../../bin/cmucl-version.sh) lisp.nm: lisp lisp.a echo 'Map file for lisp version ' `cat version` > ,lisp.nm View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/659b14d6e400659672e81ca… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/659b14d6e400659672e81ca… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Add script to determine the appropriate version for cmucl.
by Raymond Toy (＠rtoy) 05 Jan '25

05 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: b76f49af by Raymond Toy at 2025-01-05T13:37:37-08:00 Add script to determine the appropriate version for cmucl. This is based on the value from `git describe --dirty`. If it looks like "snapshot-*", we use everything after "snapshot-". Typically it looks something like "snapshot-2024-08" if a snapshot has been made. Otherwise, current HEAD looks something "2024-08-46-g5b45c46fe-dirty". If a release has been made, it should be something like "21e". Otherwise, we get the actual value from git describe. - - - - - 1 changed file: - + bin/cmucl-version.sh Changes: ===================================== bin/cmucl-version.sh ===================================== @@ -0,0 +1,18 @@ +#!/bin/sh + +# Script to determine the cmucl version based on git describe +GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`" +# echo GIT_HASH = ${GIT_HASH} + +if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then + # The git hash looks like snapshot-yyyy-mm-<stuff>. Remove the + # "snapshot-" part. + DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` +fi + +if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then + # The git hash looks like a release which is 3 hex digits. Use it as is. + DEFAULT_VERSION="${GIT_HASH}" +fi + +echo $DEFAULT_VERSION View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b76f49afd8c8e57cfae3b35… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b76f49afd8c8e57cfae3b35… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[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