diff options
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | README_dos.txt | 10 | ||||
| -rw-r--r-- | README_extra.txt | 4 | ||||
| -rw-r--r-- | README_os2.txt | 8 | ||||
| -rw-r--r-- | README_src.txt | 4 | ||||
| -rw-r--r-- | src/INSTALLpc.txt | 8 | ||||
| -rw-r--r-- | uninstal.txt | 4 |
7 files changed, 31 insertions, 27 deletions
@@ -403,7 +403,7 @@ dosrt_unix2dos: dist prepare no_title.vim $(RT_AMI_DOS) \ $(LANG_GEN) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; tar cf - \ $(RT_UNIX_DOS_BIN) \ $(RT_ALL_BIN) \ @@ -432,7 +432,7 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM) tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe @@ -451,7 +451,7 @@ dosbin_w32: dist no_title.vim dist/$(COMMENT_W32) tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; cp vimw32.exe dist/vim/$(VIMRTDIR)/vim.exe cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe @@ -468,7 +468,7 @@ dosbin_d32: dist no_title.vim dist/$(COMMENT_D32) tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; cp vimd32.exe dist/vim/$(VIMRTDIR)/vim.exe cp xxdd32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp installd32.exe dist/vim/$(VIMRTDIR)/install.exe @@ -485,7 +485,7 @@ dosbin_d16: dist no_title.vim dist/$(COMMENT_D16) tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; cp vimd16.exe dist/vim/$(VIMRTDIR)/vim.exe cp xxdd16.exe dist/vim/$(VIMRTDIR)/xxd.exe cp installd16.exe dist/vim/$(VIMRTDIR)/install.exe @@ -501,7 +501,7 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE) tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; cp gvim_ole.exe dist/vim/$(VIMRTDIR)/gvim.exe cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe @@ -523,7 +523,7 @@ dosbin_s: dist no_title.vim dist/$(COMMENT_W32S) tar cf - \ $(BIN_DOS) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; cp gvim_w32s.exe dist/vim/$(VIMRTDIR)/gvim.exe cp xxdd32.exe dist/vim/$(VIMRTDIR)/xxd.exe cp README_w32s.txt dist/vim/$(VIMRTDIR) @@ -539,7 +539,7 @@ doslang: dist prepare no_title.vim dist/$(COMMENT_LANG) mkdir dist/vim/$(VIMRTDIR) mkdir dist/vim/$(VIMRTDIR)/lang cd src && MAKEMO=yes $(MAKE) languages - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; # Add the message translations. Trick: skip ja.mo and use ja.sjis.mo instead. # Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, sk.mo / sk.cp1250.mo, # zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and ru.mo / ru.cp1251.mo. @@ -569,7 +569,7 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt | (cd dist/vim/$(VIMRTDIR); tar xf -) mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) rmdir dist/vim/$(VIMRTDIR)/runtime - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; tar cf - \ $(SRC_DOS_BIN) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) @@ -586,7 +586,7 @@ os2bin: dist no_title.vim dist/$(COMMENT_OS2) tar cf - \ $(BIN_OS2) \ | (cd dist/vim/$(VIMRTDIR); tar xf -) - find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \; + find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \; cp vimos2.exe dist/vim/$(VIMRTDIR)/vim.exe cp xxdos2.exe dist/vim/$(VIMRTDIR)/xxd.exe cp teeos2.exe dist/vim/$(VIMRTDIR)/tee.exe diff --git a/README_dos.txt b/README_dos.txt index 1f37cbb42b..c427217a75 100644 --- a/README_dos.txt +++ b/README_dos.txt @@ -93,7 +93,7 @@ Remarks: won't show a menubar. Then you need to set the $VIM environment variable to point to the top directory of your Vim files. Example: set VIM=C:\editors\vim - Vim version 6.0 will look for your vimrc file in $VIM, and for the runtime + Vim version 7.2 will look for your vimrc file in $VIM, and for the runtime files in $VIM/vim72. See ":help $VIM" for more information. - To avoid confusion between distributed files of different versions and your @@ -105,10 +105,10 @@ Remarks: C:\vim\vimfiles\ftplugin\*.vim Filetype plugins C:\vim\... Other files you made. Distributed files: - C:\vim\vim72\vim.exe The Vim version 6.0 executable. - C:\vim\vim72\doc\*.txt The version 6.0 documentation files. - C:\vim\vim72\bugreport.vim A Vim version 6.0 script. - C:\vim\vim72\... Other version 6.0 distributed files. + C:\vim\vim72\vim.exe The Vim version 7.2 executable. + C:\vim\vim72\doc\*.txt The version 7.2 documentation files. + C:\vim\vim72\bugreport.vim A Vim version 7.2 script. + C:\vim\vim72\... Other version 7.2 distributed files. In this case the $VIM environment variable would be set like this: set VIM=C:\vim Then $VIMRUNTIME will automatically be set to "$VIM\vim72". Don't add diff --git a/README_extra.txt b/README_extra.txt index ef3c412d9d..7347add491 100644 --- a/README_extra.txt +++ b/README_extra.txt @@ -1,10 +1,10 @@ README_extra.txt for version 7.2 of Vim: Vi IMproved. The extra archive of Vim is to be used in combination with the source archive -(vim-7.0-src.tar.gz). The extra archive is useless without it. +(vim-7.2-src.tar.gz). The extra archive is useless without it. For more information, see the "README.txt" file that comes with the runtime -archive (vim-7.0-rt.tar.gz). To be able to run Vim you MUST get the runtime +archive (vim-7.2-rt.tar.gz). To be able to run Vim you MUST get the runtime archive too! The extra archive plus the source and runtime achives make up the complete diff --git a/README_os2.txt b/README_os2.txt index a8822c39d8..5ebce692e6 100644 --- a/README_os2.txt +++ b/README_os2.txt @@ -41,10 +41,10 @@ Extra remarks: C:\vim\_viminfo Dynamic info for 'viminfo'. C:\vim\... Other files you made. Distributed files: - C:\vim\vim72\vim.exe The Vim version 7.1 executable. - C:\vim\vim72\doc\*.txt The version 7.1 documentation files. - C:\vim\vim72\bugreport.vim A Vim version 7.1 script. - C:\vim\vim72\... Other version 7.1 distributed files. + C:\vim\vim72\vim.exe The Vim version 7.2 executable. + C:\vim\vim72\doc\*.txt The version 7.2 documentation files. + C:\vim\vim72\bugreport.vim A Vim version 7.2 script. + C:\vim\vim72\... Other version 7.2 distributed files. In this case the $VIM environment variable would be set like this: set VIM=C:\vim diff --git a/README_src.txt b/README_src.txt index 0e732c062d..341b07c236 100644 --- a/README_src.txt +++ b/README_src.txt @@ -2,9 +2,9 @@ README_src.txt for version 7.2 of Vim: Vi IMproved. The source archive contains the files needed to compile Vim on Unix systems. It is packed for Unix systems (NL line separator). It is also used for other -systems in combination with the extra archive (vim-7.0-extra.tar.gz, in the +systems in combination with the extra archive (vim-7.2-extra.tar.gz, in the "extra" directory of ftp.vim.org). For more information, see the README.txt file that comes with the runtime -archive (vim-7.0-rt.tar.gz). To be able to run Vim you MUST get the runtime +archive (vim-7.2-rt.tar.gz). To be able to run Vim you MUST get the runtime archive too! diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index 755ea3b50c..ae65be04e4 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -215,8 +215,9 @@ directory. You should not need to do *any* editing of any files to get vim compiled this way. If, for some reason, you want the console-mode-only version of vim (this -is NOT recommended on Win32, especially on '95/'98!!!), you need only change -the 'gvim.exe' to 'vim.exe' in the 'make' commands given above. +is NOT recommended on Win32, especially on '95/'98!!!), you need can use: + + make -f Make_ming.mak GUI=no vim.exe If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX' (also free!) and compress the file (typical compression is 50%). UPX can be @@ -259,10 +260,13 @@ Use Make_bc5.mak with Borland C++ 5.x. See If you like, you can compile the 'mingw' Win32 version from the comfort of your Linux (or other unix) box. To do this, you need to follow a few steps: 1) Install the mingw32 cross-compiler. See + http://www.mingw.org/wiki/LinuxCrossMinGW http://www.libsdl.org/extras/win32/cross/README.txt 2) Get and unpack both the Unix sources and the extra archive 3) in 'Make_ming.mak', set 'CROSS' to 'yes' instead of 'no'. Make further changes to 'Make_ming.mak' as you wish. + If your cross-compiler prefix differs from the predefined value, + set 'CROSS_COMPILE' corresponding. 4) make -f Make_ming.mak gvim.exe Now you have created the Windows binary from your Linux box! Have fun... diff --git a/uninstal.txt b/uninstal.txt index bb06c9935a..62cd6585bd 100644 --- a/uninstal.txt +++ b/uninstal.txt @@ -55,8 +55,8 @@ Here are guidelines for removing Vim by hand: skip the next step. 5. Delete the distributed files. If you followed the directions, these will - be located in a directory like "C:\vim\vim54". If the $VIM environment - variable is set, the directory will be $VIM\vim54. Delete the "vim54" + be located in a directory like "C:\vim\vim72". If the $VIM environment + variable is set, the directory will be $VIM\vim72. Delete the "vim72" directory and all that is in it. Warning: If you changed any of the distributed files, or added some of your own files, you might want to save these first. But normally you would not have changed or added files here. |