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

[Git][cmucl/cmucl][issue-363-add-version-number] Remove version string option from load-world.sh
by Raymond Toy (＠rtoy) 09 Feb '25

09 Feb '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: ddf7b66b by Raymond Toy at 2025-02-08T18:38:02-08:00 Remove version string option from load-world.sh Since the version is baked into lisp now and since `*lisp-implementation-version*` is set in lisp.c, remove the ability to specify a version in bin/load-world.sh. This also means updating tools/worldload.lisp needs to remove the bit of code that asks for the version. - - - - - 2 changed files: - bin/load-world.sh - src/tools/worldload.lisp Changes: ===================================== bin/load-world.sh ===================================== @@ -2,30 +2,14 @@ usage() { - echo "load-world.sh [-?p] target-directory [version-string]" + echo "load-world.sh [-?p] target-directory" echo " -p Skip loading of PCL (Mostly for cross-compiling)" echo " -? This help" - echo " If the version-string is not given, the current date and time is used" exit 1 } SKIP_PCL= NO_PCL_FEATURE= -# Default version is the date with the git hash. Older versions of -# git don't support --dirty, but the output in that case is what we -# want (except for ending with "dirty"), so we're set. -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`" - -# If the git hash looks like a snapshot tag or release, don't add the date. -VERSION="`date '+%Y-%m-%d %H:%M:%S'`${GIT_HASH:+ $GIT_HASH}" -if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - VERSION="${GIT_HASH}" -fi - -if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - VERSION="${GIT_HASH}" -fi -echo $VERSION while getopts "p" arg do ===================================== src/tools/worldload.lisp ===================================== @@ -31,12 +31,6 @@ ;(setf lisp::*enable-dynamic-space-code* t) -;;; Get some data on this core. -;;; -(write-string "What is the current lisp-implementation-version? ") -(force-output) -(set '*lisp-implementation-version* (read-line)) - ;;; Load the rest of the reader (maybe byte-compiled.) (maybe-byte-load "target:code/sharpm") (maybe-byte-load "target:code/backq") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ddf7b66b29d1796c2ca9bf7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ddf7b66b29d1796c2ca9bf7… 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: Set *lisp-implementation-version* from cmucl_version
by Raymond Toy (＠rtoy) 09 Feb '25

09 Feb '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 9588b50e by Raymond Toy at 2025-02-08T16:23:26-08:00 Set *lisp-implementation-version* from cmucl_version Make `lisp::*lisp-implementation-version*` have the value of the C string `cmucl_version` that contains the actual version. To do this, we need to make `lisp::*lisp-implementation-version*` a static symbol. Fortunately, there are spare static symbols so we stole `spare-9` for this. Currently only done for x86, but the other OSes have spare symbols too. - - - - - 6d93dd02 by Raymond Toy at 2025-02-08T17:03:48-08:00 Add -print-version commandline switch so -help shows it. Add defswitch for print-version so that -help prints it out to inform the user of it's existence. The switch is never actually run because main() handles it and exits before lisp ever gets a chance to start. Update pot file for the new docstring. - - - - - 4 changed files: - src/code/commandline.lisp - src/compiler/x86/parms.lisp - src/i18n/locale/cmucl.pot - src/lisp/lisp.c Changes: ===================================== src/code/commandline.lisp ===================================== @@ -408,3 +408,10 @@ (defswitch "-version" #'version-switch-demon "Prints the cmucl version and exits; same as -version") +;; This is never actually called from lisp because main() handles it +;; and returns before the lisp initial function is ever run. It's +;; here so that -help will print it out so the user knows about it. +(defswitch "print-version" #'version-switch-demon + "Like -version, but a core file doesn't have to loaded first. The + version is printed and lisp exits immediately before doing any of the + core startup code.") ===================================== src/compiler/x86/parms.lisp ===================================== @@ -380,9 +380,9 @@ :key-or-value lisp::*unidata-path* + lisp::*lisp-implementation-version* ;; Spare symbols. Rename these when you need to add some static ;; symbols and don't want to do a cross-compile. - spare-9 spare-8 spare-7 spare-6 ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -6216,6 +6216,13 @@ msgstr "" msgid "Prints the cmucl version and exits; same as -version" msgstr "" +#: src/code/commandline.lisp +msgid "" +"Like -version, but a core file doesn't have to loaded first. The\n" +" version is printed and lisp exits immediately before doing any of the\n" +" core startup code." +msgstr "" + #: src/code/env-access.lisp msgid "" "Returns information about the symbol VAR in the lexical environment ENV.\n" ===================================== src/lisp/lisp.c ===================================== @@ -913,6 +913,10 @@ main(int argc, const char *argv[], const char *envp[]) } #endif +#ifdef LISP_IMPLEMENTATION_VERSION + SetSymbolValue(LISP_IMPLEMENTATION_VERSION, alloc_string(cmucl_version)); +#endif + /* * Pick off sigint until the lisp system gets far enough along to * install it's own. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/a460d05ff6c4dbfff7bf6e… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/a460d05ff6c4dbfff7bf6e… 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 -print-version option and use it in make-dist.sh to get version
by Raymond Toy (＠rtoy) 08 Feb '25

08 Feb '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: a460d05f by Raymond Toy at 2025-02-08T07:50:42-08:00 Add -print-version option and use it in make-dist.sh to get version make-dist.sh needs to have a version that's consistent with the version used in lisp. To that end, we add a new string `cmucl_version` in lisp.c that has the version string that is used to setup the search list. To make this available, we also add a new commandline option, `-print-version` that just prints this string and exits. In make-dist.sh get the version number from `lisp -print-version`. In this way the created directory versions match what lisp thinks the version is. Without this, we sometimes end up in a situation where we can't find the core file. This can happen when we have a clean repo, do the build and end up with a dirty repo because the build update some pot files or something. Then make-dist ends up putting everything in the wrong directory. - - - - - 2 changed files: - bin/make-dist.sh - src/lisp/lisp.c Changes: ===================================== bin/make-dist.sh ===================================== @@ -94,11 +94,6 @@ def_arch_os () { # Figure out the architecture and OS in case options aren't given 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.. -DEFAULT_VERSION="`bin/git-version.sh`" - # Default compression is -J (xz). These variables are passed to the # other scripts via the environmen, so export them. COMPRESS=-J @@ -149,17 +144,6 @@ if [ -n "$COMPRESS_ARG" ]; then esac fi -if [ -z "$VERSION" ]; then - # If a default version exists, use it. Otherwise this is an - # error---at least one of these must not be empty. - if [ -z "${DEFAULT_VERSION}" ]; then - echo "Version (-V) must be specified because default version cannot be determined." - usage - else - VERSION=${DEFAULT_VERSION} - fi -fi - if [ ! -d "$1" ] then echo "$1 isn't a directory" @@ -180,6 +164,22 @@ fi TARGET="`echo $1 | sed 's:/*$::'`" +# 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.. +DEFAULT_VERSION="`$TARGET/lisp/lisp -print-version`" + +if [ -z "$VERSION" ]; then + # If a default version exists, use it. Otherwise this is an + # error---at least one of these must not be empty. + if [ -z "${DEFAULT_VERSION}" ]; then + echo "Version (-V) must be specified because default version cannot be determined." + usage + else + VERSION=${DEFAULT_VERSION} + fi +fi + echo INSTALL_DIR = $INSTALL_DIR echo cmucl-$VERSION-$ARCH-$OS ===================================== src/lisp/lisp.c ===================================== @@ -95,6 +95,9 @@ alloc_str_list(const char *list[]) } /* Default paths for CMUCLLIB */ + +static char cmucl_version[] = CMUCL_VERSION; + static char *cmucllib_search_list[] = { "./../lib/cmucl/" CMUCL_VERSION "/lib", NULL @@ -676,7 +679,14 @@ main(int argc, const char *argv[], const char *envp[]) debug_lisp_search = TRUE; } else if (strcmp(arg, "-unidata") == 0) { unidata = *++argptr; - } + } else if (strcmp(arg, "-print-version") == 0) { + /* + * Print the version and exit; we don't want to do + * anything else! + */ + printf("%s\n", cmucl_version); + return 0; + } } default_core = arch_init(fpu_mode); View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a460d05ff6c4dbfff7bf6ea… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a460d05ff6c4dbfff7bf6ea… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] Disable some tests on Darwin
by Raymond Toy (＠rtoy) 08 Feb '25

08 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 7698e84e by Raymond Toy at 2025-02-07T17:57:05-08:00 Disable some tests on Darwin I tested these on Darwin, and the templates "test-" and ""test-XXXXXXa" succeed by returning exactly these files. Another call would then generate an error since we can't create new files. So it seems on Darwin, any template will work but the only time we get a filename different from the template is if the template ends in X's. - - - - - 1 changed file: - tests/unix.lisp Changes: ===================================== tests/unix.lisp ===================================== @@ -47,6 +47,8 @@ (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) +;; Darwin accepts this template. It creates the file "test-". +#-darwin (define-test mkstemp.bad-template (:tag :issues) (multiple-value-bind (fd errno) @@ -56,6 +58,9 @@ (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) +;; Darwin accepts this template and just creates the file +;; "test-XXXXXXa". (The next call would return an error.) +#-darwin (define-test mkstemp.bad-template.2 (:tag :issues) (multiple-value-bind (fd errno) @@ -112,6 +117,8 @@ (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) +;; Same issue with mkdtemp as with mkstemp above on Darwin. +#-darwin (define-test mkdtemp.bad-template.2 (:tag :issues) (multiple-value-bind (result errno) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7698e84e6076499d04be7dd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7698e84e6076499d04be7dd… 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 symlink for manpages
by Raymond Toy (＠rtoy) 08 Feb '25

08 Feb '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 3f5a8297 by Raymond Toy at 2025-02-07T16:01:26-08:00 Install symlink for manpages Need to symlink lisp.1 and cmucl.1 manpage to the versioned files. - - - - - 1 changed file: - bin/make-main-dist.sh Changes: ===================================== bin/make-main-dist.sh ===================================== @@ -142,6 +142,10 @@ 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 -fs lisp-$VERSION lisp) +# Install symlink for man pages +(cd $DESTDIR/${MANDIR} + ln -fs lisp-$VERSION.1 lisp.1 + ln -fs cmucl-$VERSION.1 cmucl.1) if [ "$EXECUTABLE" = "true" ] then View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3f5a8297378794133e3239d… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3f5a8297378794133e3239d… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] Remove invalid tests and update pot file
by Raymond Toy (＠rtoy) 07 Feb '25

07 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 5814e20d by Raymond Toy at 2025-02-07T12:50:18-08:00 Remove invalid tests and update pot file On linux, the only requirement on the template is the last 6 chars are X's. There could be more. Hence remove these tests. Update the pot file for the changed docstrings. - - - - - 2 changed files: - src/i18n/locale/cmucl-unix.pot - tests/unix.lisp Changes: ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -1441,9 +1441,7 @@ msgid "" "Generates a unique temporary file name from TEMPLATE, and creates\n" " and opens the file. On success, the corresponding file descriptor\n" " and name of the file is returned. Otherwise, NIL and the UNIX error\n" -" code is returned.\n" -"\n" -" The last six characters of the template must be \"XXXXXX\"." +" code is returned." msgstr "" #: src/code/unix.lisp ===================================== tests/unix.lisp ===================================== @@ -56,18 +56,7 @@ (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) -;; Darwin allows any number of X's. -#-darwin (define-test mkstemp.bad-template.2 - (:tag :issues) - (multiple-value-bind (fd errno) - (unix::unix-mkstemp "test-XXXXXXX") - ;; The template has too many X's so the FD should be NIL, and a - ;; positive Unix errno value should be returned. - (assert-false fd) - (assert-true (and (integerp errno) (plusp errno))))) - -(define-test mkstemp.bad-template.3 (:tag :issues) (multiple-value-bind (fd errno) (unix::unix-mkstemp "test-XXXXXXa") @@ -123,16 +112,6 @@ (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) -;; Darwin allows any number of X's. -#-darwin -(define-test mkdtemp.bad-template.2 - (:tag :issues) - (multiple-value-bind (result errno) - (unix::unix-mkdtemp "dir-XXXXXXX") - ;; Too many X's in template. - (assert-false result) - (assert-true (and (integerp errno) (plusp errno))))) - (define-test mkdtemp.bad-template.2 (:tag :issues) (multiple-value-bind (result errno) @@ -140,4 +119,3 @@ ;; Template doesn't end in X's (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) - View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5814e20dd2ca56c5d9cc517… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5814e20dd2ca56c5d9cc517… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] Remove check on template
by Raymond Toy (＠rtoy) 07 Feb '25

07 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: e9f2fd2d by Raymond Toy at 2025-02-07T10:06:23-08:00 Remove check on template As discussed, we remove the check on the template format. Update the tests because Darwin allows any number of X's in the string. This tests won't be run on Darwin. - - - - - 2 changed files: - src/code/unix.lisp - tests/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2904,26 +2904,11 @@ (function (* char)))) c-string)) -(defun check-template (template) - ;; Make sure the template ends with exactly 6 X's and no more. - (let ((last-non-x (position-if-not #'(lambda (c) - (char= c #\X)) - template - :from-end t))) - (and last-non-x - (= last-non-x (- (length template) 7))))) - (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. Otherwise, NIL and the UNIX error - code is returned. - - The last six characters of the template must be \"XXXXXX\"." - ;; Make sure the template is valid. - (unless (check-template template) - (return-from unix-mkstemp - (values nil einval))) + code is returned." (let* ((format (if (eql *filename-encoding* :null) :iso8859-1 *filename-encoding*)) @@ -2955,10 +2940,6 @@ If the directory cannot be created NIL and the UNIX error code is returned." - ;; Make sure the template is valid. - (unless (check-template template) - (return-from unix-mkdtemp - (values nil einval))) (let* ((format (if (eql *filename-encoding* :null) :iso8859-1 *filename-encoding*)) ===================================== tests/unix.lisp ===================================== @@ -56,6 +56,8 @@ (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) +;; Darwin allows any number of X's. +#-darwin (define-test mkstemp.bad-template.2 (:tag :issues) (multiple-value-bind (fd errno) @@ -111,6 +113,8 @@ (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) +;; Darwin allows any number of X's. +#-darwin (define-test mkdtemp.bad-template (:tag :issues) (multiple-value-bind (result errno) @@ -119,6 +123,8 @@ (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) +;; Darwin allows any number of X's. +#-darwin (define-test mkdtemp.bad-template.2 (:tag :issues) (multiple-value-bind (result errno) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e9f2fd2d72127b06de55ae2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e9f2fd2d72127b06de55ae2… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Need to generate cmucl-version.sh during cross-compile
by Raymond Toy (＠rtoy) 05 Feb '25

05 Feb '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 9ca207aa by Raymond Toy at 2025-02-04T18:34:22-08:00 Need to generate cmucl-version.sh during cross-compile Create the file before we run make. - - - - - 1 changed file: - bin/cross-build-world.sh Changes: ===================================== bin/cross-build-world.sh ===================================== @@ -138,6 +138,7 @@ EOF if [ "$BUILD_RUNTIME" = "yes" ]; then echo Building runtime + bin/git-version.sh -f > src/lisp/cmucl-version.h (cd $TARGET/lisp; ${MAKE}) fi View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9ca207aa6fb1057f508027f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9ca207aa6fb1057f508027f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Remove cmucl-version.h and lisp.o from .PHONY
by Raymond Toy (＠rtoy) 04 Feb '25

04 Feb '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 58ca18dd by Raymond Toy at 2025-02-04T13:33:25-08:00 Remove cmucl-version.h and lisp.o from .PHONY We don't need these files to be recompiled every time because the version is in cmucl-version.h that is autogenerated. - - - - - 1 changed file: - src/lisp/GNUmakefile Changes: ===================================== src/lisp/GNUmakefile ===================================== @@ -120,8 +120,7 @@ translations: rm -f /tmp/$$$$-updated-$$f.po /tmp/$$$$-orig-$$f.po; \ done; done -# Always build lisp.o so that the embedded version is updated. -.PHONY : translations cmucl-version.h lisp.o +.PHONY : translations # Like translations, but we don't compute the diff. We just overwrite # the po files in the repository so that we can tell if the View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/58ca18dd7b253cbfd9a1537… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/58ca18dd7b253cbfd9a1537… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] Remove unneeded rules
by Raymond Toy (＠rtoy) 04 Feb '25

04 Feb '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: d53d3f7d by Raymond Toy at 2025-02-04T13:13:07-08:00 Remove unneeded rules Since build.sh creates cmucl-version.h, we don't need to have a rule to create it here. It's a dependency that better exist when compiling lisp. Also, since we get the version from cmucl-version.h, we don't need to have a special rule for building lisp.o. Remove it. - - - - - 1 changed file: - src/lisp/GNUmakefile Changes: ===================================== src/lisp/GNUmakefile ===================================== @@ -51,12 +51,6 @@ version.o : version.c version mv ,version version $(CC) ${CFLAGS} $(CPPFLAGS) -DVERSION=`cat version` -c $< -lisp.o : lisp.c cmucl-version.h - $(CC) ${CFLAGS} $(CPPFLAGS) -c $< - -cmucl-version.h: - ../../bin/git-version.sh -f > cmucl-version.h - lisp: ${OBJS} version.o $(CC) -g ${OS_LINK_FLAGS} -o ,lisp $^ ${OS_LIBS} -lm mv -f ,lisp lisp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d53d3f7d541aa4c44c61c90… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d53d3f7d541aa4c44c61c90… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0