Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 2dcd20b0 by Raymond Toy at 2025-01-09T20:11:18-08:00 Clean up changes Comment out `set -x` things that we don't need but could be useful in the future for debugging. For the make file, remove some unneeded echoes in the rule. - - - - - a8014384 by Raymond Toy at 2025-01-09T20:17:29-08:00 Always rebuild lisp.o to keep version number in sync We need to recompile lisp.o whenever make is run so that we get an updated cmucl version to match what build.sh and friends are using. To do this add lisp.o to the .PHONY target. - - - - - c60a9a25 by Raymond Toy at 2025-01-09T20:18:41-08:00 Don't need to `cd src` before calling git describe As long as we call this somewhere in the git repo, we'll be able to get something. - - - - - 5 changed files: - bin/build.sh - bin/cmucl-version.sh - bin/make-dist.sh - bin/run-unit-tests.sh - src/lisp/GNUmakefile Changes: ===================================== bin/build.sh ===================================== @@ -131,9 +131,9 @@ buildit () if [ "$ENABLE" = "yes" ]; then $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; } - set -x + #set -x time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } - set +x + #set +x if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET fi @@ -144,15 +144,15 @@ buildit () if [ "$BUILD_WORLD2" = "yes" ]; then - set -x + #set -x $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } - set +x + #set +x fi $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; } - set -x + #set -x $TARGET/lisp/lisp -lib $TARGET/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; } - set +x + #set +x return 0; fi } ===================================== bin/cmucl-version.sh ===================================== @@ -1,7 +1,7 @@ #!/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)`" +GIT_HASH="`(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 ===================================== bin/make-dist.sh ===================================== @@ -149,7 +149,7 @@ if [ -n "$COMPRESS_ARG" ]; then esac fi -set -x +#set -x 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. ===================================== bin/run-unit-tests.sh ===================================== @@ -49,7 +49,7 @@ function cleanup { trap cleanup EXIT -set -x +#set -x if [ -n "${TESTDIR}" ]; then TESTDIRARG=" :test-directory \"${TESTDIR}/\"" else ===================================== src/lisp/GNUmakefile ===================================== @@ -54,8 +54,6 @@ version.o : version.c version $(CC) ${CFLAGS} $(CPPFLAGS) -DVERSION=`cat version` -c $< lisp.o : lisp.c - echo GIT_HASH = ${GIT_HASH} - echo DEFAULT_VERSION = ${DEFAULT_VERSION} $(CC) ${CFLAGS} $(CPPFLAGS) -DCMUCL_VERSION="\"${DEFAULT_VERSION}\"" -c $< lisp: ${OBJS} version.o @@ -127,7 +125,8 @@ translations: rm -f /tmp/$$$$-updated-$$f.po /tmp/$$$$-orig-$$f.po; \ done; done -.PHONY : translations +# Always build lisp.o so that the embedded version is updated. +.PHONY : translations lisp.o # 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/-/compare/c16456c663e3fe6ac028312... -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/c16456c663e3fe6ac028312... You're receiving this email because of your account on gitlab.common-lisp.net.