aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPhillip Lord2019-12-26 23:01:02 +0100
committerPhillip Lord2019-12-26 23:01:02 +0100
commit8aad80d6613576faa8910336863474d485e1c030 (patch)
tree2600806085de393d845b135813dd6c7e439df955 /admin
parent47a73e3e142bc816872cf66c5e95b867d3ad49b7 (diff)
downloademacs-8aad80d6613576faa8910336863474d485e1c030.tar.gz
emacs-8aad80d6613576faa8910336863474d485e1c030.zip
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')
-rwxr-xr-xadmin/nt/dist-build/build-zips.sh14
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
160 esac 160 esac
161done 161done
162 162
163if [ -z $VERSION ]; 163
164## ACTUAL_VERSION is the version declared by emacs
165if [ -z $ACTUAL_VERSION ];
164then 166then
165 VERSION=` 167 ACTUAL_VERSION=`
166 sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' < ../../../configure.ac 168 sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' < ../../../configure.ac
167` 169`
168fi 170fi
169 171
170if [ -z $VERSION ]; 172if [ -z $ACTUAL_VERSION ];
171then 173then
172 echo [build] Cannot determine Emacs version 174 echo [build] Cannot determine Emacs version
173 exit 1 175 exit 1
174fi 176fi
175 177
178## VERSION is the version that we want to call Emacs
179VERSION=$ACTUAL_VERSION
180
181
176MAJOR_VERSION="$(echo $VERSION | cut -d'.' -f1)" 182MAJOR_VERSION="$(echo $VERSION | cut -d'.' -f1)"
177 183
178## ACTUAL VERSION is the version declared by emacs
179ACTUAL_VERSION=$VERSION
180 184
181## VERSION includes the word snapshot if necessary 185## VERSION includes the word snapshot if necessary
182VERSION=$VERSION$SNAPSHOT 186VERSION=$VERSION$SNAPSHOT