From: Phillip Lord Date: Mon, 27 Nov 2017 22:13:41 +0000 (+0000) Subject: Update Build files for Emacs-27 X-Git-Tag: emacs-27.0.90~6121 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=405b9cb7c3fba7206ebbd173dc6b9d0ec8dd6e1e;p=emacs.git Update Build files for Emacs-27 * admin/nt/dist-build/README-windows-binaries, admin/nt/dist-build/build-dep-zips.py, admin/nt/dist-build/build-zips.sh: Update Version --- diff --git a/admin/nt/dist-build/README-windows-binaries b/admin/nt/dist-build/README-windows-binaries index 27a5483c02b..39a5871b6a0 100644 --- a/admin/nt/dist-build/README-windows-binaries +++ b/admin/nt/dist-build/README-windows-binaries @@ -27,17 +27,17 @@ Contains a 32-bit build of Emacs without dependencies In addition, we provide the following files which will not be useful for most end-users. -emacs-26-x86_64-deps.zip +emacs-27-x86_64-deps.zip The dependencies. Unzipping this file on top of emacs-$VERSION-x86_64-no-deps.zip should result in the same install as emacs-$VERSION-x86_64.zip. -emacs-26-i686-deps.zip +emacs-27-i686-deps.zip The 32-bit version of the dependencies. -emacs-26-deps-mingw-w64-src.zip +emacs-27-deps-mingw-w64-src.zip The source for the dependencies. Source for Emacs itself is available in the main distribution tarball. These dependencies were produced diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py index 9573bf3abcc..f71988692c1 100755 --- a/admin/nt/dist-build/build-dep-zips.py +++ b/admin/nt/dist-build/build-dep-zips.py @@ -26,7 +26,7 @@ import re from subprocess import check_output ## Constants -EMACS_MAJOR_VERSION="26" +EMACS_MAJOR_VERSION="27" ## Options @@ -103,7 +103,8 @@ def gather_deps(deps, arch, directory): ## And package them up os.chdir(directory) print("Zipping: {}".format(arch)) - check_output_maybe("zip -9r ../../emacs-26-{}-deps.zip *".format(arch), + check_output_maybe("zip -9r ../../emacs-{}-{}-deps.zip *" + .format(EMACS_MAJOR_VERSION, arch), shell=True) os.chdir("../../") diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index 28451c0063c..2c7b56866ff 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh @@ -66,7 +66,7 @@ function build_zip { 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 + unzip $HOME/emacs-build/deps/emacs-$MAJOR_VERSION-$ARCH-deps.zip zip -r -9 emacs-$OF_VERSION-$ARCH.zip * mv emacs-$OF_VERSION-$ARCH.zip ~/emacs-upload }