Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl
Commits:
-
1eb057e6
by Raymond Toy at 2025-02-04T11:44:42-08:00
-
2d25c77d
by Raymond Toy at 2025-02-04T11:47:38-08:00
-
bf47121d
by Raymond Toy at 2025-02-04T13:05:59-08:00
7 changed files:
- bin/build.sh
- bin/cmucl-version.sh → bin/git-version.sh
- bin/make-dist.sh
- bin/make-main-dist.sh
- bin/make-src-dist.sh
- bin/run-unit-tests.sh
- src/lisp/GNUmakefile
Changes:
| ... | ... | @@ -49,9 +49,6 @@ GIT_FILE_COMMENT="yes" |
| 49 | 49 | export GIT_FILE_COMMENT
|
| 50 | 50 | |
| 51 | 51 | SKIPUTILS=no
|
| 52 | -DEFAULT_VERSION="`bin/cmucl-version.sh`"
|
|
| 53 | -export DEFAULT_VERISON
|
|
| 54 | -echo DEFAULT_VERSION = $DEFAULT_VERSION
|
|
| 55 | 52 | |
| 56 | 53 | # If gmake exists, assume it is GNU make and use it.
|
| 57 | 54 | if [ -z "$MAKE" ]; then
|
| ... | ... | @@ -113,6 +110,13 @@ case `uname -s` in |
| 113 | 110 | esac ;;
|
| 114 | 111 | esac
|
| 115 | 112 | |
| 113 | +# Set default version and generate lisp/cmucl-version.h
|
|
| 114 | +DEFAULT_VERSION="`bin/git-version.sh`"
|
|
| 115 | +export DEFAULT_VERISON
|
|
| 116 | +echo DEFAULT_VERSION = $DEFAULT_VERSION
|
|
| 117 | + |
|
| 118 | +bin/git-version.sh -f > src/lisp/cmucl-version.h
|
|
| 119 | + |
|
| 116 | 120 | export LANG=en_US.UTF-8
|
| 117 | 121 | |
| 118 | 122 | buildit ()
|
| ... | ... | @@ -132,9 +136,7 @@ buildit () |
| 132 | 136 | if [ "$ENABLE" = "yes" ];
|
| 133 | 137 | then
|
| 134 | 138 | $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; }
|
| 135 | - #set -x
|
|
| 136 | 139 | time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
|
| 137 | - #set +x
|
|
| 138 | 140 | if [ "$REBUILD_LISP" = "yes" ]; then
|
| 139 | 141 | $TOOLDIR/rebuild-lisp.sh $TARGET
|
| 140 | 142 | fi
|
| ... | ... | @@ -145,15 +147,12 @@ buildit () |
| 145 | 147 | |
| 146 | 148 | if [ "$BUILD_WORLD2" = "yes" ];
|
| 147 | 149 | then
|
| 148 | - #set -x
|
|
| 149 | 150 | $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
|
| 150 | - #set +x
|
|
| 151 | 151 | fi
|
| 152 | 152 | $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
|
| 153 | 153 | |
| 154 | - #set -x
|
|
| 155 | 154 | $TARGET/lisp/lisp -lib $TARGET/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; }
|
| 156 | - #set +x
|
|
| 155 | + |
|
| 157 | 156 | return 0;
|
| 158 | 157 | fi
|
| 159 | 158 | }
|
| ... | ... | @@ -35,7 +35,7 @@ else |
| 35 | 35 | /*
|
| 36 | 36 | * Cmucl version
|
| 37 | 37 | *
|
| 38 | - * DO NOT EDIT! This file is auto-generated via bin/cmucl-version.sh.
|
|
| 38 | + * DO NOT EDIT! This file is auto-generated via bin/git-version.sh.
|
|
| 39 | 39 | */
|
| 40 | 40 | |
| 41 | 41 | #define CMUCL_VERSION "$DEFAULT_VERSION"
|
| ... | ... | @@ -97,7 +97,7 @@ def_arch_os |
| 97 | 97 | # Choose a version based on the git hash as the default version. We
|
| 98 | 98 | # only compute a default if the git hash looks like a snapshot
|
| 99 | 99 | # ("snapshot-yyyy-mm") or a release number..
|
| 100 | -DEFAULT_VERSION="`bin/cmucl-version.sh`"
|
|
| 100 | +DEFAULT_VERSION="`bin/git-version.sh`"
|
|
| 101 | 101 | |
| 102 | 102 | # Default compression is -J (xz). These variables are passed to the
|
| 103 | 103 | # other scripts via the environmen, so export them.
|
| ... | ... | @@ -149,7 +149,6 @@ if [ -n "$COMPRESS_ARG" ]; then |
| 149 | 149 | esac
|
| 150 | 150 | fi
|
| 151 | 151 | |
| 152 | -#set -x
|
|
| 153 | 152 | if [ -z "$VERSION" ]; then
|
| 154 | 153 | # If a default version exists, use it. Otherwise this is an
|
| 155 | 154 | # error---at least one of these must not be empty.
|
| ... | ... | @@ -217,14 +217,13 @@ install ${GROUP} ${OWNER} -m 0644 src/general-info/cmucl.1 \ |
| 217 | 217 | $DESTDIR/${MANDIR}/cmucl-$VERSION.1
|
| 218 | 218 | install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \
|
| 219 | 219 | $DESTDIR/${MANDIR}/lisp-$VERSION.1
|
| 220 | -set -x
|
|
| 221 | 220 | install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/${DOCDIR}
|
| 222 | 221 | if [ -f src/general-info/release-$VERSION.txt ]
|
| 223 | 222 | then
|
| 224 | 223 | install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt \
|
| 225 | 224 | $DESTDIR/${DOCDIR}
|
| 226 | 225 | fi
|
| 227 | -set +x
|
|
| 226 | + |
|
| 228 | 227 | if [ -z "$INSTALL_DIR" ]; then
|
| 229 | 228 | sync ; sleep 1 ; sync ; sleep 1 ; sync
|
| 230 | 229 | echo Tarring main components
|
| ... | ... | @@ -55,7 +55,6 @@ fi |
| 55 | 55 | DESTDIR=${INSTALL_DIR:-release-$$}
|
| 56 | 56 | |
| 57 | 57 | echo Creating source distribution
|
| 58 | -set -x
|
|
| 59 | 58 | GTAR_OPTIONS="--exclude=.git --exclude='*.pot.~*~'"
|
| 60 | 59 | install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/share/cmucl/$VERSION/
|
| 61 | 60 | install ${GROUP} ${OWNER} -m 0755 bin/run-unit-tests.sh $DESTDIR/bin
|
| ... | ... | @@ -49,7 +49,6 @@ function cleanup { |
| 49 | 49 | |
| 50 | 50 | trap cleanup EXIT
|
| 51 | 51 | |
| 52 | -#set -x
|
|
| 53 | 52 | if [ -n "${TESTDIR}" ]; then
|
| 54 | 53 | TESTDIRARG=" :test-directory \"$TESTDIR/\""
|
| 55 | 54 | else
|
| ... | ... | @@ -41,8 +41,6 @@ OBJS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(patsubst %.s,%.o,$(SRCS)))) |
| 41 | 41 | ### Don't look in RCS for the files, because we might not want the latest.
|
| 42 | 42 | %: RCS/%,v
|
| 43 | 43 | |
| 44 | -#DEFAULT_VERSION = $(shell ../../bin/cmucl-version.sh)
|
|
| 45 | - |
|
| 46 | 44 | lisp.nm: lisp lisp.a
|
| 47 | 45 | echo 'Map file for lisp version ' `cat version` > ,lisp.nm
|
| 48 | 46 | $(NM) lisp | grep -v " [F] " >> ,lisp.nm
|
| ... | ... | @@ -57,7 +55,7 @@ lisp.o : lisp.c cmucl-version.h |
| 57 | 55 | $(CC) ${CFLAGS} $(CPPFLAGS) -c $<
|
| 58 | 56 | |
| 59 | 57 | cmucl-version.h:
|
| 60 | - ../../bin/cmucl-version.sh -f > cmucl-version.h
|
|
| 58 | + ../../bin/git-version.sh -f > cmucl-version.h
|
|
| 61 | 59 | |
| 62 | 60 | lisp: ${OBJS} version.o
|
| 63 | 61 | $(CC) -g ${OS_LINK_FLAGS} -o ,lisp $^ ${OS_LIBS} -lm
|