GitLab

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,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

@@ -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")

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl

Commits:

2 changed files:

Changes: