[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 046cde2: Add date to snapshot file
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] master 046cde2: Add date to snapshot file |
Date: |
Mon, 20 Nov 2017 14:57:33 -0500 (EST) |
branch: master
commit 046cde2d66ed044eb7eb71cd9e69206ee59e12fe
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Add date to snapshot file
* admin/nt/dist-build/build-zips.sh: Add date to all out files.
* admin/nt/dist-build/emacs.nsi: Lower case and date installer.
---
admin/nt/dist-build/build-zips.sh | 33 ++++++++++++++++++++++++---------
admin/nt/dist-build/emacs.nsi | 3 +--
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/admin/nt/dist-build/build-zips.sh
b/admin/nt/dist-build/build-zips.sh
index ce4a11d..d41f6d9 100755
--- a/admin/nt/dist-build/build-zips.sh
+++ b/admin/nt/dist-build/build-zips.sh
@@ -47,21 +47,28 @@ function build_zip {
cd $HOME/emacs-build/build/emacs-$VERSION/$ARCH
export PKG_CONFIG_PATH=$PKG
+
+ ## Running configure forces a rebuild of the C core which takes
+ ## time that is not always needed
+ if (($CONFIG))
+ then
../../../git/$BRANCH/configure \
--without-dbus \
--host=$HOST --without-compress-install \
$CACHE \
CFLAGS="-O2 -static -g3"
+ fi
+
make -j 16 install \
prefix=$HOME/emacs-build/install/emacs-$VERSION/$ARCH
cd $HOME/emacs-build/install/emacs-$VERSION/$ARCH
cp $HOME/emacs-build/deps/libXpm/$ARCH/libXpm-noX4.dll bin
- zip -r -9 emacs-$VERSION-$ARCH-no-deps.zip *
- mv emacs-$VERSION-$ARCH-no-deps.zip $HOME/emacs-upload
+ zip -r -9 emacs-$OF_VERSION-$ARCH-no-deps.zip *
+ mv emacs-$OF_VERSION-$ARCH-no-deps.zip $HOME/emacs-upload
rm bin/libXpm-noX4.dll
unzip $HOME/emacs-build/deps/emacs-26-$ARCH-deps.zip
- zip -r -9 emacs-$VERSION-$ARCH.zip *
- mv emacs-$VERSION-$ARCH.zip ~/emacs-upload
+ zip -r -9 emacs-$OF_VERSION-$ARCH.zip *
+ mv emacs-$OF_VERSION-$ARCH.zip ~/emacs-upload
}
function build_installer {
@@ -72,9 +79,9 @@ function build_installer {
makensis -v4 \
-DARCH=$ARCH -DEMACS_VERSION=$ACTUAL_VERSION \
- -DOUT_VERSION=$VERSION emacs.nsi
+ -DOUT_VERSION=$OF_VERSION emacs.nsi
rm emacs.nsi
- mv Emacs-$ARCH-$VERSION-installer.exe ~/emacs-upload
+ mv Emacs-$OF_VERSION-$ARCH-installer.exe ~/emacs-upload
}
set -o errexit
@@ -86,8 +93,9 @@ BUILD=1
BUILD_32=1
BUILD_64=1
GIT_UP=0
+CONFIG=1
-while getopts "36ghsiV:" opt; do
+while getopts "36ghnsiV:" opt; do
case $opt in
3)
BUILD_32=1
@@ -105,6 +113,9 @@ while getopts "36ghsiV:" opt; do
BUILD_64=0
GIT_UP=1
;;
+ n)
+ CONFIG=0
+ ;;
i)
BUILD=0
;;
@@ -143,16 +154,20 @@ fi
MAJOR_VERSION="$(echo $VERSION | cut -d'.' -f1)"
+ACTUAL_VERSION=$VERSION
+VERSION=$VERSION$SNAPSHOT
+OF_VERSION=$VERSION
+
if [ -z $SNAPSHOT ];
then
BRANCH=emacs-$VERSION
else
BRANCH=master
CACHE=-C
+ OF_VERSION="$VERSION-`date +%Y-%m-%d`"
fi
-ACTUAL_VERSION=$VERSION
-VERSION=$VERSION$SNAPSHOT
+
if (($GIT_UP))
then
diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi
index 8138272..dce8f3d 100644
--- a/admin/nt/dist-build/emacs.nsi
+++ b/admin/nt/dist-build/emacs.nsi
@@ -2,7 +2,7 @@
!include LogicLib.nsh
!include x64.nsh
-Outfile "Emacs-${ARCH}-${OUT_VERSION}-installer.exe"
+Outfile "emacs-${OUT_VERSION}-${ARCH}-installer.exe"
SetCompressor /solid lzma
@@ -49,7 +49,6 @@ function .onInit
StrCpy $INSTDIR "$PROGRAMFILES\Emacs"
${Endif}
${EndIf}
-
functionend
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 046cde2: Add date to snapshot file,
Phillip Lord <=