[Emacs-diffs] trunk r114079: Update nt installation instructions to point to supported method

[Glenn Morris]

------------------------------------------------------------
revno: 114079
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-08-31 11:26:59 -0700
message:
  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.
renamed:
  nt/INSTALL => nt/INSTALL.OLD install-20091113204419-o5vbwnq5f7feedwu-1546
  nt/INSTALL.MSYS => nt/INSTALL install.msys-20130416132004-cxmtwcclsy15p2r8-1
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  make-dist                      makedist-20091113204419-o5vbwnq5f7feedwu-476
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/configure.bat               
configure.bat-20091113204419-o5vbwnq5f7feedwu-1913
  nt/INSTALL.OLD                 install-20091113204419-o5vbwnq5f7feedwu-1546
  nt/INSTALL                     install.msys-20130416132004-cxmtwcclsy15p2r8-1

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-28 06:01:52 +0000
+++ b/ChangeLog 2013-08-31 18:26:59 +0000
@@ -1,3 +1,7 @@
+2013-08-31  Glenn Morris  <address@hidden>
+
+       * make-dist: Update for nt/INSTALL* changes.
+
 2013-08-28  Paul Eggert  <address@hidden>
 
        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-08-16 06:33:08 +0000
+++ b/etc/NEWS  2013-08-31 18:26:59 +0000
@@ -762,12 +762,10 @@
 
 * 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

=== modified file 'make-dist'
--- a/make-dist 2013-08-15 06:31:14 +0000
+++ b/make-dist 2013-08-31 18:26:59 +0000
@@ -404,7 +404,7 @@
  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"

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-08-25 20:11:56 +0000
+++ b/nt/ChangeLog      2013-08-31 18:26:59 +0000
@@ -1,3 +1,9 @@
+2013-08-31  Glenn Morris  <address@hidden>
+
+       * INSTALL: Rename from INSTALL.MSYS.
+       * INSTALL.OLD: Rename from INSTALL.
+       * configure.bat: Update for INSTALL name changes.
+
 2013-08-25  Vincent Belaïche  <address@hidden>
 
        * configure.bat: Rather than disabling, make configure.bat produce

=== renamed file 'nt/INSTALL.MSYS' => 'nt/INSTALL'
--- a/nt/INSTALL.MSYS   2013-06-08 15:01:45 +0000
+++ b/nt/INSTALL        2013-08-31 18:26:59 +0000
@@ -19,9 +19,6 @@
   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.
 

=== renamed file 'nt/INSTALL' => 'nt/INSTALL.OLD'
--- a/nt/INSTALL        2013-08-25 19:46:41 +0000
+++ b/nt/INSTALL.OLD    2013-08-31 18:26:59 +0000
@@ -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

=== modified file 'nt/configure.bat'
--- a/nt/configure.bat  2013-08-25 20:11:56 +0000
+++ b/nt/configure.bat  2013-08-31 18:26:59 +0000
@@ -60,7 +60,7 @@
 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. 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 ----------------------------------------------------------------------