diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2014-10-31 11:03:23 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2014-10-31 11:03:23 +0200 |
commit | cac77f92e3861e81d5fe96b4b857fd9d243032e2 (patch) | |
tree | a8a9ae3aebf4c4c2be2957a06a76730b31a879bd /nt | |
parent | 792faabe7a17a8f2fc2dd21076b69de2fc3edb65 (diff) | |
download | emacs-cac77f92e3861e81d5fe96b4b857fd9d243032e2.tar.gz |
Backport changes in preparation for git migration from trunk.
admin: Changes in several documents.
autogen.sh: Neutralize language specific to a repository type.
doc/misc/efaq-w32.texi: Neutralized language specific to a repository type.
doc/misc/gnus-coding.txt: Neutralized language specific to a repository type.
lisp/Makefile.in: Change some production names so they're neutral
about the repository type.
Diffstat (limited to 'nt')
-rw-r--r-- | nt/ChangeLog | 4 | ||||
-rw-r--r-- | nt/INSTALL | 2 | ||||
-rw-r--r-- | nt/INSTALL.OLD | 4 | ||||
-rw-r--r-- | nt/zipdist.bat | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index ff9b588ecf0..5ffab4d0151 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-10-31 Eric S. Raymond <esr@thyrsus.com> + + * Neutralize language specific to a repository type. + 2014-10-26 Dani Moncayo <dmoncayo@gmail.com> * README.W32 (Preliminaries): Don't assume that this file is at diff --git a/nt/INSTALL b/nt/INSTALL index f43912f6a1f..350b1f53310 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -169,7 +169,7 @@ Windows 9X as well). you are building from the repository: . Texinfo (needed to produce the Info manuals when building from - bzr/git, and for "make install") + the repository, and for "make install") Available from http://sourceforge.net/projects/ezwinports/files/. diff --git a/nt/INSTALL.OLD b/nt/INSTALL.OLD index 6e6de220487..a7ce57cc369 100644 --- a/nt/INSTALL.OLD +++ b/nt/INSTALL.OLD @@ -126,7 +126,7 @@ http://sourceforge.net/projects/ezwinports/files/ In addition to this file, if you build a development snapshot, you - should also read INSTALL.BZR in the parent directory. + should also read INSTALL.REPO in the parent directory. * Supported development environments @@ -575,7 +575,7 @@ * Creating binary distributions Binary distributions (full and barebin distributions) can be - automatically built and packaged from source tarballs or a bzr + automatically built and packaged from source tarballs or a repository checkout. When building Emacs binary distributions, the --distfiles argument diff --git a/nt/zipdist.bat b/nt/zipdist.bat index 216949aaddd..d5359c8be5e 100644 --- a/nt/zipdist.bat +++ b/nt/zipdist.bat @@ -36,7 +36,7 @@ goto EXIT rem Build and verify the binary distribution
:ZIP_DIST
-7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%
+7z a -bd -tZIP -mx=9 -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%
7z t emacs-%EMACS_VER%-bin-i386.zip
goto EXIT
|