[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 8aad80d: Fix installer build
From: |
Phillip Lord |
Subject: |
emacs-27 8aad80d: Fix installer build |
Date: |
Thu, 26 Dec 2019 17:02:19 -0500 (EST) |
branch: emacs-27
commit 8aad80d6613576faa8910336863474d485e1c030
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Fix installer build
* admin/nt/dist-build/build-zips.sh: Ensure that NSIS build always
uses the actual build number to locate its files.
---
admin/nt/dist-build/build-zips.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/admin/nt/dist-build/build-zips.sh
b/admin/nt/dist-build/build-zips.sh
index cff6fde..d8cbee3 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 8aad80d: Fix installer build,
Phillip Lord <=