diff options
| author | Phillip Lord <phillip.lord@russet.org.uk> | 2019-12-26 23:01:02 +0100 |
|---|---|---|
| committer | Phillip Lord <phillip.lord@russet.org.uk> | 2019-12-26 23:01:02 +0100 |
| commit | 8aad80d6613576faa8910336863474d485e1c030 (patch) | |
| tree | 2600806085de393d845b135813dd6c7e439df955 /admin/nt/dist-build | |
| parent | 47a73e3e142bc816872cf66c5e95b867d3ad49b7 (diff) | |
| download | emacs-8aad80d6613576faa8910336863474d485e1c030.tar.gz | |
Fix installer build
* admin/nt/dist-build/build-zips.sh: Ensure that NSIS build always
uses the actual build number to locate its files.
Diffstat (limited to 'admin/nt/dist-build')
| -rwxr-xr-x | admin/nt/dist-build/build-zips.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index cff6fdec3e0..d8cbee30754 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh @@ -160,23 +160,27 @@ while getopts "36gb:hnsiV:" opt; do esac done -if [ -z $VERSION ]; + +## ACTUAL_VERSION is the version declared by emacs +if [ -z $ACTUAL_VERSION ]; then - VERSION=` + ACTUAL_VERSION=` sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' < ../../../configure.ac ` fi -if [ -z $VERSION ]; +if [ -z $ACTUAL_VERSION ]; then echo [build] Cannot determine Emacs version exit 1 fi +## VERSION is the version that we want to call Emacs +VERSION=$ACTUAL_VERSION + + MAJOR_VERSION="$(echo $VERSION | cut -d'.' -f1)" -## ACTUAL VERSION is the version declared by emacs -ACTUAL_VERSION=$VERSION ## VERSION includes the word snapshot if necessary VERSION=$VERSION$SNAPSHOT |