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

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] Update sed regexp for macos
by Raymond Toy (＠rtoy) 16 Jan '26

16 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 377248f2 by Raymond Toy at 2026-01-16T08:15:20-08:00 Update sed regexp for macos Use "*" instead of "+" in sed regex because macos sed doesn't recognize "+". - - - - - 1 changed file: - bin/git-version.sh Changes: ===================================== bin/git-version.sh ===================================== @@ -41,7 +41,7 @@ else # we have to remove everything before the first slash which # contains things like "tag/" or "head/". GIT_DESC="`git describe --all --dirty || git describe 2>/dev/null`" - GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]\+/;;' 2>/dev/null`" + GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]*/;;' 2>/dev/null`" BRANCH="`git rev-parse --abbrev-ref HEAD`*" case "$GIT_HASH" in View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/377248f29a553f46b5f64e8… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/377248f29a553f46b5f64e8… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] Replace backtick with single quote; add some double quotes
by Raymond Toy (＠rtoy) 16 Jan '26

16 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 6dac9de2 by Raymond Toy at 2026-01-15T18:18:23-08:00 Replace backtick with single quote; add some double quotes We aren't trying to run a command so use single quotes instead of backticks in the comment. Add some double quotes around shell var. - - - - - 1 changed file: - bin/git-version.sh Changes: ===================================== bin/git-version.sh ===================================== @@ -8,7 +8,7 @@ git-version.sh [-hfv] -f The version is printed as a C file #define expression. Otherwise, the version is just printed to stdout - -v Use this as the version instead of using `git describe`, which + -v Use this as the version instead of using 'git describe', which is the default Determine the version of cmucl. By @@ -40,7 +40,7 @@ else # name as appropriate. This is much more informative. However, # we have to remove everything before the first slash which # contains things like "tag/" or "head/". - GIT_DESC="`(git describe --all --dirty || git describe 2>/dev/null)`" + GIT_DESC="`git describe --all --dirty || git describe 2>/dev/null`" GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]\+/;;' 2>/dev/null`" BRANCH="`git rev-parse --abbrev-ref HEAD`*" @@ -75,7 +75,7 @@ else fi if [ -z "$FILE" ]; then - echo $DEFAULT_VERSION + echo "$DEFAULT_VERSION" else cat <<EOF /* View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/6dac9de2d8325668589140d… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/6dac9de2d8325668589140d… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] 2 commits: Prefix the version with CI if it was built via CI
by Raymond Toy (＠rtoy) 16 Jan '26

16 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 47db53d7 by Raymond Toy at 2026-01-15T18:08:03-08:00 Prefix the version with CI if it was built via CI - - - - - f41a1277 by Raymond Toy at 2026-01-15T18:13:10-08:00 Use CASE statement instead of sequence of if/elif This makes it easier to read and lets us do some globbing to match the git hash which is easier than using regexp with `expr`. - - - - - 1 changed file: - bin/git-version.sh Changes: ===================================== bin/git-version.sh ===================================== @@ -44,22 +44,29 @@ else GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]\+/;;' 2>/dev/null`" BRANCH="`git rev-parse --abbrev-ref HEAD`*" - if [ `expr "X$GIT_HASH" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]'` != 0 ]; then - # The git hash looks like snapshot-yyyy-mm-<stuff>. Remove the - # "snapshot-" part. - DEFAULT_VERSION=`expr "$GIT_HASH" : "snapshot-$.*$"` - elif [ `expr "X$GIT_HASH" : 'X[0-9][0-9][a-f]'` != 0 ]; then - # The git hash looks like a release which is 3 hex digits. Use it as is. - DEFAULT_VERSION="${GIT_HASH}" - elif [ `expr "${GIT_HASH}" : "${BRANCH}"` != 0 ]; then - # The hash looks like the current branch with possibly more - # stuff at the end. Use the hash as the version. - DEFAULT_VERSION="${GIT_HASH}" - elif [ `expr "${GIT_HASH}" : "[0-9]*"` != 0 ]; then - # Assuming this is CI which seems to produce a githash like - # "pipeline/<digits>". - DEFAULT_VERSION="${GIT_HASH}" - fi + case "$GIT_HASH" in + snapshot-[0-9][0-9][0-9][0-9]-[01][0-9]) + # The git hash looks like snapshot-yyyy-mm-<stuff>. Remove the + # "snapshot-" part. + DEFAULT_VERSION=`expr "$GIT_HASH" : "snapshot-$.*$"` + ;; + [0-9][0-9][a-f]) + # The git hash looks like a release which is 3 hex digits. + # Use it as is. + DEFAULT_VERSION="${GIT_HASH}" + ;; + ${BRANCH}*) + # The hash looks like the current branch with possibly more + # stuff at the end. Use the hash as the version. + DEFAULT_VERSION="${GIT_HASH}" + ;; + [0-9]*) + # Assuming this is CI which seems to produce a githash like + # "pipeline/<digits>". Make the version include "ci-" so we + # know this was done via CI. + DEFAULT_VERSION="ci-${GIT_HASH}" + ;; + esac if [ -z "$DEFAULT_VERSION" ]; then echo "Unable to determine a default version from git describe: $GIT_DESC" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/800cf0dbf497725bbb432f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/800cf0dbf497725bbb432f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] Fix another typo
by Raymond Toy (＠rtoy) 16 Jan '26

16 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 800cf0db by Raymond Toy at 2026-01-15T17:57:49-08:00 Fix another typo - - - - - 1 changed file: - bin/git-version.sh Changes: ===================================== bin/git-version.sh ===================================== @@ -55,7 +55,7 @@ else # The hash looks like the current branch with possibly more # stuff at the end. Use the hash as the version. DEFAULT_VERSION="${GIT_HASH}" - elif [ `expr "${GIT_HASH}" : "[0-9]*"` != 0]; then + elif [ `expr "${GIT_HASH}" : "[0-9]*"` != 0 ]; then # Assuming this is CI which seems to produce a githash like # "pipeline/<digits>". DEFAULT_VERSION="${GIT_HASH}" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/800cf0dbf497725bbb432fd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/800cf0dbf497725bbb432fd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] Fix typo: Missing closing backtick
by Raymond Toy (＠rtoy) 16 Jan '26

16 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 3aac13e4 by Raymond Toy at 2026-01-15T17:51:44-08:00 Fix typo: Missing closing backtick - - - - - 1 changed file: - bin/git-version.sh Changes: ===================================== bin/git-version.sh ===================================== @@ -41,7 +41,7 @@ else # we have to remove everything before the first slash which # contains things like "tag/" or "head/". GIT_DESC="`(git describe --all --dirty || git describe 2>/dev/null)`" - GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]\+/;;' 2>/dev/null" + GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]\+/;;' 2>/dev/null`" BRANCH="`git rev-parse --abbrev-ref HEAD`*" if [ `expr "X$GIT_HASH" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]'` != 0 ]; then View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3aac13e4f4841970bd2b163… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3aac13e4f4841970bd2b163… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] More debugging of git-version on CI
by Raymond Toy (＠rtoy) 15 Jan '26

15 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 9f682acc by Raymond Toy at 2026-01-15T15:11:09-08:00 More debugging of git-version on CI Let GIT_DESC be the result of git describe, so we know exactly what we're getting. GIT_HASH is the slightly massaged version of GIT_DESC that we want to use as the lisp version. If we can't determine the version, the error message prints out GIT_DESC so we know exactly what git describe is returning. - - - - - 1 changed file: - bin/git-version.sh Changes: ===================================== bin/git-version.sh ===================================== @@ -40,7 +40,8 @@ else # name as appropriate. This is much more informative. However, # we have to remove everything before the first slash which # contains things like "tag/" or "head/". - GIT_HASH="`(git describe --all --dirty | sed 's;^[^/]\+/;;' 2>/dev/null || git describe 2>/dev/null)`" + GIT_DESC="`(git describe --all --dirty || git describe 2>/dev/null)`" + GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]\+/;;' 2>/dev/null" BRANCH="`git rev-parse --abbrev-ref HEAD`*" if [ `expr "X$GIT_HASH" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]'` != 0 ]; then @@ -54,14 +55,14 @@ else # The hash looks like the current branch with possibly more # stuff at the end. Use the hash as the version. DEFAULT_VERSION="${GIT_HASH}" - elif [ `expr "${GIT_HASH}" : "pipelines/[0-9]*"` != 0]; then + elif [ `expr "${GIT_HASH}" : "[0-9]*"` != 0]; then # Assuming this is CI which seems to produce a githash like # "pipeline/<digits>". DEFAULT_VERSION="${GIT_HASH}" fi if [ -z "$DEFAULT_VERSION" ]; then - echo "Unable to determine a default version from hash $GIT_HASH" + echo "Unable to determine a default version from git describe: $GIT_DESC" exit 1; fi fi View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9f682acc69fc425fa62c7a2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9f682acc69fc425fa62c7a2… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] Handle the git version returned for CI
by Raymond Toy (＠rtoy) 15 Jan '26

15 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 88eb2721 by Raymond Toy at 2026-01-15T09:22:30-08:00 Handle the git version returned for CI On CI, git-version --all seems to return things like "pipeline/<digits>", so we need to recognize that as a valid version and use it. - - - - - 1 changed file: - bin/git-version.sh Changes: ===================================== bin/git-version.sh ===================================== @@ -54,6 +54,10 @@ else # The hash looks like the current branch with possibly more # stuff at the end. Use the hash as the version. DEFAULT_VERSION="${GIT_HASH}" + elif [ `expr "${GIT_HASH}" : "pipelines/[0-9]*"` != 0]; then + # Assuming this is CI which seems to produce a githash like + # "pipeline/<digits>". + DEFAULT_VERSION="${GIT_HASH}" fi if [ -z "$DEFAULT_VERSION" ]; then View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/88eb2721e2c86542fbe7d65… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/88eb2721e2c86542fbe7d65… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Update cmucl.pot for new docstrings
by Raymond Toy (＠rtoy) 15 Jan '26

15 Jan '26

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 336b9322 by Raymond Toy at 2026-01-15T09:13:30-08:00 Update cmucl.pot for new docstrings Forgot to update this when accurate complex division was committed. [skip-ci] - - - - - 1 changed file: - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -4385,6 +4385,20 @@ msgstr "" msgid "Returns NUMBER - 1." msgstr "" +#: src/code/numbers.lisp +msgid "Accurate division of complex double-float numbers x and y." +msgstr "" + +#: src/code/numbers.lisp +msgid "Accurate division of complex single-float numbers x and y." +msgstr "" + +#: src/code/numbers.lisp +msgid "" +"Complex division of generic numbers x and y. One of x or y should be\n" +" a complex." +msgstr "" + #: src/code/numbers.lisp msgid "" "Returns number (or number/divisor) as an integer, rounded toward 0.\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/336b9322330eee9a4b44d99… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/336b9322330eee9a4b44d99… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] Fix typo in command
by Raymond Toy (＠rtoy) 15 Jan '26

15 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 5f5285de by Raymond Toy at 2026-01-15T09:07:43-08:00 Fix typo in command - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -47,7 +47,7 @@ variables: # Save this so we can see the generated errno - src/code/errno.lisp script: - bin/git-version.sh + - bin/git-version.sh # Do cross compile first #- bin/create-target.sh xtarget x86_linux_clang #- bin/create-target.sh xcross x86_linux_clang View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5f5285de03dbfec030cd2b0… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5f5285de03dbfec030cd2b0… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-464-lisp-version-uses-branch-name] Run git-version.sh to print version
by Raymond Toy (＠rtoy) 15 Jan '26

15 Jan '26

Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl Commits: 47aa0697 by Raymond Toy at 2026-01-15T09:06:11-08:00 Run git-version.sh to print version For debugging why CI is not working on this branch. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -47,6 +47,7 @@ variables: # Save this so we can see the generated errno - src/code/errno.lisp script: + bin/git-version.sh # Do cross compile first #- bin/create-target.sh xtarget x86_linux_clang #- bin/create-target.sh xcross x86_linux_clang View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/47aa0697fb2fc79c39d3d7c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/47aa0697fb2fc79c39d3d7c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0