Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl
Commits:
-
659b14d6
by Raymond Toy at 2025-01-05T19:27:30-08:00
3 changed files:
Changes:
| ... | ... | @@ -49,17 +49,7 @@ GIT_FILE_COMMENT="yes" |
| 49 | 49 | export GIT_FILE_COMMENT
|
| 50 | 50 | |
| 51 | 51 | SKIPUTILS=no
|
| 52 | -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`"
|
|
| 53 | -echo GIT_HASH = ${GIT_HASH}
|
|
| 54 | - |
|
| 55 | -if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then
|
|
| 56 | - DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-\(.*\)"`
|
|
| 57 | -fi
|
|
| 58 | - |
|
| 59 | -if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then
|
|
| 60 | - DEFAULT_VERSION="${GIT_HASH}"
|
|
| 61 | -fi
|
|
| 62 | - |
|
| 52 | +DEFAULT_VERSION="`bin/cmucl-version.sh`"
|
|
| 63 | 53 | export DEFAULT_VERISON
|
| 64 | 54 | |
| 65 | 55 | # If gmake exists, assume it is GNU make and use it.
|
| ... | ... | @@ -97,17 +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 | -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`"
|
|
| 101 | - |
|
| 102 | -echo GIT_HASH = ${GIT_HASH}
|
|
| 103 | - |
|
| 104 | -if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then
|
|
| 105 | - DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-\(.*\)"`
|
|
| 106 | -fi
|
|
| 107 | - |
|
| 108 | -if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then
|
|
| 109 | - DEFAULT_VERSION="${GIT_HASH}"
|
|
| 110 | -fi
|
|
| 100 | +DEFAULT_VERSION="`bin/cmucl-version.sh`"
|
|
| 111 | 101 | |
| 112 | 102 | # Default compression is -J (xz). These variables are passed to the
|
| 113 | 103 | # other scripts via the environmen, so export them.
|
| ... | ... | @@ -41,8 +41,7 @@ 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 | -GIT_HASH = $(shell git describe --dirty)
|
|
| 45 | -DEFAULT_VERSION = $(subst snapshot-,,${GIT_HASH})
|
|
| 44 | +DEFAULT_VERSION = $(shell ../../bin/cmucl-version.sh)
|
|
| 46 | 45 | |
| 47 | 46 | lisp.nm: lisp lisp.a
|
| 48 | 47 | echo 'Map file for lisp version ' `cat version` > ,lisp.nm
|