diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-29 19:03:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-29 19:03:21 +0100 |
| commit | e292d80bede5cb0b9b1ca95176ad6c3fbaae2e0a (patch) | |
| tree | e2f9ad47fd2735682c585744f783fbe0d48bb183 | |
| parent | 36e294c00c784b9ddd05a4fdbea2e331ab2b1ca8 (diff) | |
| download | vim-git-e292d80bede5cb0b9b1ca95176ad6c3fbaae2e0a.tar.gz | |
patch 7.4.996v7.4.996
Problem: New GDK files and testdir/Make_all.mak missing from distribution.
PC build instructions are outdated.
Solution: Add the file to the list. Update PC build instructions.
| -rw-r--r-- | Filelist | 4 | ||||
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 20 insertions, 1 deletions
@@ -85,6 +85,7 @@ SRC_ALL = \ src/main.aap \ src/testdir/main.aap \ src/testdir/README.txt \ + src/testdir/Make_all.mak \ src/testdir/*.in \ src/testdir/sautest/autoload/*.vim \ src/testdir/runtest.vim \ @@ -169,6 +170,7 @@ SRC_UNIX = \ README_src.txt \ configure \ pixmaps/*.xpm \ + pixmaps/*.png \ pixmaps/gen-inline-pixbufs.sh \ pixmaps/stock_icons.h \ src/INSTALL \ @@ -189,6 +191,7 @@ SRC_UNIX = \ src/gui_gtk_f.c \ src/gui_gtk_f.h \ src/gui_gtk_x11.c \ + src/gui_gtk_gresources.xml \ src/gui_motif.c \ src/gui_xmdlg.c \ src/gui_xmebw.c \ @@ -214,6 +217,7 @@ SRC_UNIX = \ src/proto/gui_athena.pro \ src/proto/gui_gtk.pro \ src/proto/gui_gtk_x11.pro \ + src/proto/gui_gtk_gresources.pro \ src/proto/gui_motif.pro \ src/proto/gui_xmdlg.pro \ src/proto/gui_x11.pro \ @@ -143,18 +143,31 @@ MINOR = 4 # For Windows 98/ME the 2003 version is required, but then the executable # won't work on Windows 7 and 64 bit systems. # - "nmake -f Make_mvc.mak" (use the same path as for vcvars32.bat) -# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output. +# - Run the tests: +# > rm testdir/*.out +# > nmake -f Make_mvc.mak test +# - check the output. # - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe. # - Rename vim.pdb to vimw32.pdb. # - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe. # Win32 GUI version: # - "nmake -f Make_mvc.mak GUI=yes" +# - Run the tests: +# > cd testdir +# > rm *.out +# > nmake -f Make_dos.mak VIMPROG=..\gvim +# - check the output. # - move "gvim.exe" to here (otherwise the OLE version will overwrite it). # - Move gvim.pdb to here. # - Delete vimrun.exe, install.exe and uninstal.exe. # - Copy "GvimExt/gvimext.dll" to here. # Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME: # - Run src/bigvim.bat ("nmake -f Make_mvc.mak GUI=yes OLE=yes IME=yes ...) +# - Run the tests: +# > cd testdir +# > rm *.out +# > nmake -f Make_dos.mak VIMPROG=..\gvim +# - check the output. # - Rename "gvim.exe" to "gvim_ole.exe". # - Rename gvim.pdb to "gvim_ole.pdb". # - Delete install.exe and uninstal.exe. diff --git a/src/version.c b/src/version.c index b438afa29..1df2b6aae 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 996, +/**/ 995, /**/ 994, |