From 7605d081badfac6890d5f34966967bffdc18d715 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 31 Aug 2013 11:26:59 -0700 Subject: [PATCH] Update nt installation instructions to point to supported method * nt/INSTALL: Rename from INSTALL.MSYS. * nt/INSTALL.OLD: Rename from INSTALL. * nt/configure.bat: Update for INSTALL name changes. * make-dist: Update for nt/INSTALL* changes. --- ChangeLog | 4 ++++ etc/NEWS | 10 ++++------ make-dist | 2 +- nt/ChangeLog | 6 ++++++ nt/{INSTALL.MSYS => INSTALL} | 3 --- nt/{INSTALL => INSTALL.OLD} | 6 ++++-- nt/configure.bat | 4 ++-- 7 files changed, 21 insertions(+), 14 deletions(-) rename nt/{INSTALL.MSYS => INSTALL} (99%) rename nt/{INSTALL => INSTALL.OLD} (99%) diff --git a/ChangeLog b/ChangeLog index eda7595123..4fd209d4e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-08-31 Glenn Morris + + * make-dist: Update for nt/INSTALL* changes. + 2013-08-28 Paul Eggert * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, diff --git a/etc/NEWS b/etc/NEWS index 8bf72ddfed..49e1e040fd 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -762,12 +762,10 @@ meant to be used by other packages. * Changes in Emacs 24.4 on Non-Free Operating Systems -** Emacs for MS-Windows can now be built by running the configure script -using the MSYS environment and MinGW development tools. -This is from now on the preferred method of building Emacs on -MS-Windows. The Windows-specific configure.bat and makefile.w32-in -files are deprecated. See the file nt/INSTALL.MSYS for detailed -instructions. +** The procedure for building Emacs on MS-Windows has changed. +It is now built by running the same configure script as on all other +platforms. This requires the MSYS environment and MinGW development +tools. See the updated instructions in nt/INSTALL for details. Using the Posix configure script and Makefile's also means a change in the directory structure of the Emacs installation on Windows. It is diff --git a/make-dist b/make-dist index 920ca2bc78..95e4984a6b 100755 --- a/make-dist +++ b/make-dist @@ -404,7 +404,7 @@ echo "Making links to \`nt'" ln config.nt emacsclient.rc emacs-src.tags ../${tempdir}/nt ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt ln Makefile.in gnulib.mk ../${tempdir}/nt - ln msysconfig.sh mingw-cfg.site epaths.nt INSTALL.MSYS ../${tempdir}/nt + ln msysconfig.sh mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) echo "Making links to \`nt/inc' and its subdirectories" diff --git a/nt/ChangeLog b/nt/ChangeLog index ebc823071a..e7d9ed99e3 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2013-08-31 Glenn Morris + + * INSTALL: Rename from INSTALL.MSYS. + * INSTALL.OLD: Rename from INSTALL. + * configure.bat: Update for INSTALL name changes. + 2013-08-25 Vincent Belaïche * configure.bat: Rather than disabling, make configure.bat produce diff --git a/nt/INSTALL.MSYS b/nt/INSTALL similarity index 99% rename from nt/INSTALL.MSYS rename to nt/INSTALL index 420b8be75f..be36014e3b 100644 --- a/nt/INSTALL.MSYS +++ b/nt/INSTALL @@ -19,9 +19,6 @@ Windows 9X as well). Do not use this recipe with Cygwin. For building on Cygwin, use the normal installation instructions, ../INSTALL. - Do not use these instructions if you don't have MSYS installed; for - that, see the file INSTALL in this directory. - 0. Start the MSYS Bash window. Everything else below is done from that window's Bash prompt. diff --git a/nt/INSTALL b/nt/INSTALL.OLD similarity index 99% rename from nt/INSTALL rename to nt/INSTALL.OLD index 594ff9ff75..20162de8b3 100644 --- a/nt/INSTALL +++ b/nt/INSTALL.OLD @@ -5,7 +5,9 @@ See the end of the file for license conditions. *** This method of building Emacs is no longer supported. *** - Instead, see INSTALL.MSYS. + It may fail to produce a correctly working Emacs. + Do not report bugs associated with this build method. + Instead, follow the new instructions in INSTALL. * For the impatient @@ -18,7 +20,7 @@ Do not use these instructions with MSYS environment. For building the native Windows binary with MinGW and MSYS, follow the - instructions in the file INSTALL.MSYS in this directory. + instructions in the file INSTALL in this directory. For building without MSYS, if you have a Cygwin or MSYS port of Bash on your Path, you will be better off removing it from PATH. (For diff --git a/nt/configure.bat b/nt/configure.bat index 8f717fd416..f98396bb81 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -60,7 +60,7 @@ rem [8] tested only on Windows XP. rem echo **************************************************************** echo *** THIS METHOD OF BUILDING EMACS IS NO LONGER SUPPORTED. ** -echo *** INSTEAD, FOLLOW THE INSTRUCTIONS FROM INSTALL.MSYS. ** +echo *** INSTEAD, FOLLOW THE INSTRUCTIONS FROM INSTALL. ** echo **************************************************************** :confirm_continue set /p answer=Continue running this script at your own risks ? (Y/N) @@ -191,7 +191,7 @@ echo. echo. IMPORTANT: This method of building Emacs for MS-Windows is deprecated, echo. and could be removed in a future version of Emacs. The preferred way echo to build Emacs for MS-Windows from now on is using the MSYS environment -echo. and MinGW development tools. Please see nt/INSTALL.MSYS for details. +echo. and MinGW development tools. Please see nt/INSTALL for details. goto end rem ---------------------------------------------------------------------- -- 2.20.1