diff options
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | nt/INSTALL | 5 | ||||
| -rw-r--r-- | nt/INSTALL.W64 | 224 | ||||
| -rw-r--r-- | nt/Makefile.in | 2 | ||||
| -rw-r--r-- | nt/README | 2 | ||||
| -rw-r--r-- | nt/README.W32 | 2 | ||||
| -rw-r--r-- | nt/addpm.c | 2 | ||||
| -rw-r--r-- | nt/cmdproxy.c | 2 | ||||
| -rwxr-xr-x | nt/configure.bat | 2 | ||||
| -rw-r--r-- | nt/ddeclient.c | 2 | ||||
| -rw-r--r-- | nt/emacs.rc.in | 2 | ||||
| -rw-r--r-- | nt/emacsclient.rc.in | 2 | ||||
| -rw-r--r-- | nt/epaths.nt | 2 | ||||
| -rw-r--r-- | nt/gnulib.mk | 9 | ||||
| -rw-r--r-- | nt/icons/README | 6 | ||||
| -rw-r--r-- | nt/inc/grp.h | 2 | ||||
| -rw-r--r-- | nt/inc/inttypes.h | 2 | ||||
| -rw-r--r-- | nt/inc/langinfo.h | 2 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 2 | ||||
| -rw-r--r-- | nt/inc/nl_types.h | 2 | ||||
| -rw-r--r-- | nt/inc/stdint.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/socket.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/stat.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/wait.h | 2 | ||||
| -rw-r--r-- | nt/preprep.c | 2 | ||||
| -rw-r--r-- | nt/runemacs.c | 2 |
26 files changed, 261 insertions, 27 deletions
diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1 index b44988f632b..ed64578f6f8 100644 --- a/nt/ChangeLog.1 +++ b/nt/ChangeLog.1 @@ -3548,7 +3548,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1995-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/INSTALL b/nt/INSTALL index e1d9e0633c7..99a2f3988f9 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -1,7 +1,7 @@ Building and Installing Emacs on MS-Windows using the MSYS and MinGW tools - Copyright (C) 2013-2015 Free Software Foundation, Inc. + Copyright (C) 2013-2016 Free Software Foundation, Inc. See the end of the file for license conditions. The MSYS/MinGW build described here is supported on versions of @@ -12,6 +12,9 @@ build will run on Windows 9X and newer systems). Do not use this recipe with Cygwin. For building on Cygwin, use the normal installation instructions, ../INSTALL. + For building Emacs using the MinGW64/MSYS2 toolchain, see the + instructions in the file INSTALL.W64 in this directory. + * For the brave (a.k.a. "impatient"): For those who have a working MSYS/MinGW development environment and diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64 new file mode 100644 index 00000000000..e109c6f0f23 --- /dev/null +++ b/nt/INSTALL.W64 @@ -0,0 +1,224 @@ + Building and Installing Emacs on 64-bit MS-Windows + using MSYS2 and MinGW-w64 + + Copyright (c) 2015-2016 Free Software Foundation, Inc. + See the end of the file for license conditions. + +This document describes how to compile a 64-bit GNU Emacs using MSYS2 +and MinGW-w64. For instructions for building a 32-bit Emacs using +MSYS and MinGW, see the file INSTALL in this directory. + +Do not use this recipe with Cygwin. For building on Cygwin, use the normal +installation instructions in ../INSTALL. + +* Requirements + +The total space required is 3GB: 1.8GB for MSYS2 / MinGW-w64 and 1.2GB for +Emacs with the full repository, or less if you're using a release tarball. + +* Set up the MinGW-w64 / MSYS2 build environment + +MinGW-w64 provides a complete runtime for projects built with GCC for 64-bit +Windows -- it's located at http://mingw-w64.org/. + +MSYS2 is a Cygwin-derived software distribution for Windows which provides +build tools for MinGW-w64 -- see http://msys2.github.io/. + +** Download and install MinGW-w64 and MSYS2 + +You can download the x86_64 version of MSYS2 (i.e. msys2-x86_64-<date>.exe) +from + + https://sourceforge.net/projects/msys2/files/Base/x86_64 + +Run this file to install MSYS2 in your preferred directory, e.g. the default +C:\msys64 -- this will install MinGW-w64 also. Note that directory names +containing spaces may cause problems. + +Then you'll need to add the following directories to your Windows PATH +environment variable: + + c:\msys64\usr\bin;c:\msys64\mingw64\bin + +you can do this through Control Panel / System and Security / System / +Advanced system settings / Environment Variables / Edit path. + +Adding these directories to your PATH tells Emacs where to find the DLLs it +needs to run, and some optional commands like grep and find. These commands +will also be available at the Windows console. + +** Download and install the necessary packages + +Run msys2_shell.bat in your MSYS2 directory and you will see a BASH window +opened. + +In the BASH prompt, use the following command to install the necessary +packages (you can copy and paste it into the shell with Shift + Insert): + + pacman -S base-devel \ + mingw-w64-x86_64-toolchain \ + mingw-w64-x86_64-xpm-nox \ + mingw-w64-x86_64-libtiff \ + mingw-w64-x86_64-giflib \ + mingw-w64-x86_64-libpng \ + mingw-w64-x86_64-libjpeg-turbo \ + mingw-w64-x86_64-librsvg \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-gnutls + +The packages include the base developer tools (autoconf, automake, grep, make, +etc.), the compiler toolchain (gcc, gdb, etc.), several image libraries, an +XML library, and the GnuTLS (transport layer security) library. Only the +first three packages are required (base-devel, toolchain, xpm-nox); the rest +are optional. + +You now have a complete build environment for Emacs. + +* Install Git (optional) and disable autocrlf + +If you're going to be building the development version of Emacs from the Git +repository, and you don't already have Git on your system, you can install it +in your MSYS2 environment with: + + pacman -S git + +The autocrlf feature of Git may interfere with the configure file, so it is +best to disable this feature by running the command: + + git config core.autocrlf false + +* Get the Emacs source code + +Now you can either get an existing release version of the Emacs source code +from the GNU ftp site, or get the more current version and history from the +Git repository. + +You can always find the most recent information on these sources from the GNU +Savannah Emacs site, https://savannah.gnu.org/projects/emacs. + +** From the FTP site + +The Emacs ftp site is located at http://ftp.gnu.org/gnu/emacs/ - download the +version you want to build and put the file into a location like C:\emacs\, +then uncompress it with tar. This will put the Emacs source into a folder like +C:\emacs\emacs-24.5: + + cd /c/emacs + tar xJf emacs-24.5.tar.xz + +** From the Git repository + +To download the Git repository, do something like the following -- this will +put the Emacs source into C:\emacs\emacs-25: + + mkdir /c/emacs + cd /c/emacs + git clone git://git.sv.gnu.org/emacs.git emacs-25 + +(We recommend using the command shown on Savannah Emacs project page.) + +* Build Emacs + +Now you're ready to build and install Emacs with autogen, configure, make, +and make install. + +First we need to switch to the MinGW-w64 environment. Exit the MSYS2 BASH +console and run mingw64_shell.bat in the C:\msys64 folder, then cd back to +your Emacs source directory, e.g.: + + cd /c/emacs/emacs-25 + +** Run autogen + +If you are building the development sources, run autogen to generate the +configure script (note: this step is not necessary if you are using a +release source tarball, as the configure file is included): + + ./autogen.sh + +** Run configure + +Now you can run configure, which will build the various Makefiles -- note +that the example given here is just a simple one - for more information +on the options available please see the INSTALL file in this directory. + +The '--prefix' option specifies a location for the resulting binary files, +which 'make install' will use - in this example we set it to C:\emacs\emacs-25. +If a prefix is not specified the files will be put in the standard Unix +directories located in your C:\msys64 directory, but this is not recommended. + +Note also that we need to disable Imagemagick because Emacs does not yet +support it on Windows. + + PKG_CONFIG_PATH=/mingw64/lib/pkgconfig \ + ./configure --prefix=/c/emacs/emacs-25 --without-imagemagick + +** Run make + +This will compile Emacs and build the executables, putting them in the src +directory: + + make + +To speed up the process, you can try running + + make -jN + +where N is the number of cores in your system -- if your MSYS2 make supports +parallel execution it will run significantly faster. + +** Run make install + +Now you can run "make install", which will copy the executable and +other files to the location specified in the configure step. This will +create the bin, libexec, share, and var directories: + + make install + +You can also say + + make install prefix=/c/somewhere + +to install them somewhere else. + +* Test Emacs + +To test it out, run + + ./bin/runemacs.exe -Q + +and if all went well, you will have a new 64-bit version of Emacs. + +* Make a shortcut + +To make a shortcut to run the new Emacs, right click on the location where you +want to put it, e.g. the Desktop, select New / Shortcut, then select +runemacs.exe in the bin folder of the new Emacs, and give it a name. + +You can set any command line options by right clicking on the resulting +shortcut, select Properties, then add any options to the Target command, +e.g. --debug-init. + +* Credits + +Thanks to Chris Zheng for the original build outline as used by the +emacsbinw64 project, located at: + + https://sourceforge.net/p/emacsbinw64/wiki/Build%20guideline%20for%20MSYS2-MinGW-w64%20system/ + +* License + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. diff --git a/nt/Makefile.in b/nt/Makefile.in index 86fca5f8e36..28060febadd 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2013-2015 Free Software Foundation, Inc. +# Copyright (C) 2013-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/nt/README b/nt/README index d331e9e50f6..6d00ed43c11 100644 --- a/nt/README +++ b/nt/README @@ -1,6 +1,6 @@ Emacs for Windows NT/2000 and Windows 95/98/ME - Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. This directory contains support for compiling and running GNU Emacs on diff --git a/nt/README.W32 b/nt/README.W32 index a26ca108b2f..71a0738969a 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Emacs for Windows diff --git a/nt/addpm.c b/nt/addpm.c index 8dfb4bd2667..ed5014f44af 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -1,5 +1,5 @@ /* Add entries to the GNU Emacs Program Manager folder. - Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index d4832ea9cef..4ca533b7ef9 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -1,5 +1,5 @@ /* Proxy shell designed for use with Emacs on Windows 95 and NT. - Copyright (C) 1997, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2016 Free Software Foundation, Inc. Accepts subset of Unix sh(1) command-line options, for compatibility with elisp code written for Unix. When possible, executes external diff --git a/nt/configure.bat b/nt/configure.bat index 629bcc84498..b5f659532a2 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -1,7 +1,7 @@ @echo off
rem ----------------------------------------------------------------------
rem This was the old configuration script for MS Windows operating systems
-rem Copyright (C) 1999-2015 Free Software Foundation, Inc.
+rem Copyright (C) 1999-2016 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/ddeclient.c b/nt/ddeclient.c index 3568980c23f..f15c18855ca 100644 --- a/nt/ddeclient.c +++ b/nt/ddeclient.c @@ -1,5 +1,5 @@ /* Simple client interface to DDE servers. - Copyright (C) 1998, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in index da858854999..542af86349c 100644 --- a/nt/emacs.rc.in +++ b/nt/emacs.rc.in @@ -31,7 +31,7 @@ BEGIN VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "Emacs\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2016\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in index c78aa0ae670..147d1457386 100644 --- a/nt/emacsclient.rc.in +++ b/nt/emacsclient.rc.in @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "EmacsClient\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2016\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/epaths.nt b/nt/epaths.nt index f5eba945e31..d2c5c2d7ec3 100644 --- a/nt/epaths.nt +++ b/nt/epaths.nt @@ -12,7 +12,7 @@ the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of the Emacs source tree used to build Emacs. */ /* -Copyright (C) 1993, 1995, 1997, 1999, 2001-2015 Free Software +Copyright (C) 1993, 1995, 1997, 1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/gnulib.mk b/nt/gnulib.mk index 8a57d646e7b..6884bf9f077 100644 --- a/nt/gnulib.mk +++ b/nt/gnulib.mk @@ -22,7 +22,7 @@ ## suitable variables in nt/mingw-cfg.site. ## ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -453,6 +453,13 @@ EXTRA_libgnu_a_SOURCES += group-member.c ## end gnulib module group-member +## begin gnulib module ignore-value + + +EXTRA_DIST += ignore-value.h + +## end gnulib module ignore-value + ## begin gnulib module intprops diff --git a/nt/icons/README b/nt/icons/README index 82c4db2ae90..0b4eb9e9195 100644 --- a/nt/icons/README +++ b/nt/icons/README @@ -2,13 +2,13 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.ico Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> -Copyright (C) 2008-2015 Free Software Foundation, Inc. +Copyright (C) 2008-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2015 Free Software Foundation, Inc. +Copyright (C) 2005-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) @@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico gnu7.ico gnu8.ico gnu9.ico Author: Rob Davenport <rgd at bigfoot.com> -Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) <http://users.adelphia.net/~rob.davenport/gnuicons.html> diff --git a/nt/inc/grp.h b/nt/inc/grp.h index 7d4e6fbbe2f..c4413961d5a 100644 --- a/nt/inc/grp.h +++ b/nt/inc/grp.h @@ -1,6 +1,6 @@ /* Replacement grp.h file for building GNU Emacs on Windows. -Copyright (C) 2003-2015 Free Software Foundation, Inc. +Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h index a07d64e71ac..9abd55daeca 100644 --- a/nt/inc/inttypes.h +++ b/nt/inc/inttypes.h @@ -1,6 +1,6 @@ /* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC. -Copyright (C) 2011-2015 Free Software Foundation, Inc. +Copyright (C) 2011-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h index c9d2e6ed497..646c8cadd12 100644 --- a/nt/inc/langinfo.h +++ b/nt/inc/langinfo.h @@ -1,6 +1,6 @@ /* Replacement langinfo.h file for building GNU Emacs on Windows. -Copyright (C) 2006-2015 Free Software Foundation, Inc. +Copyright (C) 2006-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index e7a94e81c2d..cdbfac03c64 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -1,6 +1,6 @@ /* System description file for Windows NT. -Copyright (C) 1993-1995, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h index 86772b6d8dd..6b22e766b60 100644 --- a/nt/inc/nl_types.h +++ b/nt/inc/nl_types.h @@ -1,6 +1,6 @@ /* Replacement nl_types.h file for building GNU Emacs on Windows. -Copyright (C) 2006-2015 Free Software Foundation, Inc. +Copyright (C) 2006-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h index 43c4be1b5c6..adc6a1e2f2e 100644 --- a/nt/inc/stdint.h +++ b/nt/inc/stdint.h @@ -1,6 +1,6 @@ /* Replacement stdint.h file for building GNU Emacs on Windows. -Copyright (C) 2011-2015 Free Software Foundation, Inc. +Copyright (C) 2011-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 205cb34eb6f..d7ed92d6158 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index 9b493539450..f21086cbf93 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h @@ -1,7 +1,7 @@ /* sys/stat.h supplied with MSVCRT uses too narrow data types for inode and user/group id, so we replace them with our own. -Copyright (C) 2008-2015 Free Software Foundation, Inc. +Copyright (C) 2008-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h index 8f9628f1553..8a77e9881cb 100644 --- a/nt/inc/sys/wait.h +++ b/nt/inc/sys/wait.h @@ -1,6 +1,6 @@ /* A limited emulation of sys/wait.h on Posix systems. -Copyright (C) 2012-2015 Free Software Foundation, Inc. +Copyright (C) 2012-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/preprep.c b/nt/preprep.c index 49532d0dd27..303e2ef0a0c 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -1,5 +1,5 @@ /* Pre-process emacs.exe for profiling by MSVC. - Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/runemacs.c b/nt/runemacs.c index 86644b4dfe7..2685b25c30d 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -1,6 +1,6 @@ /* runemacs --- Simple program to start Emacs with its console window hidden. -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. |