diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-01 20:50:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-01 20:50:54 +0200 |
| commit | f1b512a0b62d0fa47ee9b2612556f375e1f22fc2 (patch) | |
| tree | df4f95a3c2382db12569d3e040b02760508c3386 | |
| parent | 641ad6c7ac7367f95fd927b8efa4bf74ddb9ccf3 (diff) | |
| download | vim-git-f1b512a0b62d0fa47ee9b2612556f375e1f22fc2.tar.gz | |
patch 7.4.2302v7.4.2302
Problem: Default interface versions for MS-Windows are outdated.
Solution: Use Active Perl 5.24, Python 3.5.2. Could only make it work with
Ruby 1.9.2.
| -rw-r--r-- | src/Make_mvc.mak | 2 | ||||
| -rw-r--r-- | src/bigvim.bat | 2 | ||||
| -rw-r--r-- | src/bigvim64.bat | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 52862cabf..453ccd94f 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -934,7 +934,7 @@ RUBY_PLATFORM = i386-mswin32 !else # CPU RUBY_PLATFORM = x64-mswin64 !endif # CPU -!if $(MSVCRT_VER) >= 70 +!if $(MSVCRT_VER) >= 70 && $(RUBY_VER) > 19 RUBY_PLATFORM = $(RUBY_PLATFORM)_$(MSVCRT_VER) !endif # MSVCRT_VER !endif # RUBY_PLATFORM diff --git a/src/bigvim.bat b/src/bigvim.bat index 08bb68542..1992ad8df 100644 --- a/src/bigvim.bat +++ b/src/bigvim.bat @@ -1,5 +1,5 @@ :: command to build big Vim with OLE, Perl, Python, Ruby and Tcl SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\" SET TOOLDIR=E:\ -%VCDIR%nmake -f Make_mvc.mak GUI=yes OLE=yes PERL=%TOOLDIR%perl522\perl DYNAMIC_PERL=yes PERL_VER=522 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python34 DYNAMIC_PYTHON3=yes PYTHON3_VER=34 RUBY=%TOOLDIR%ruby192 DYNAMIC_RUBY=yes RUBY_VER=19 RUBY_VER_LONG=1.9.2 TCL=%TOOLDIR%tcl TCL_VER=86 TCL_VER_LONG=8.6 DYNAMIC_TCL=yes %1 IME=yes CSCOPE=yes +%VCDIR%nmake -f Make_mvc.mak GUI=yes OLE=yes PERL=%TOOLDIR%perl524 DYNAMIC_PERL=yes PERL_VER=524 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python35 DYNAMIC_PYTHON3=yes PYTHON3_VER=35 RUBY=%TOOLDIR%ruby192 DYNAMIC_RUBY=yes RUBY_VER=19 RUBY_VER_LONG=1.9.2 RUBY_MSVCRT_NAME=msvcrt TCL=%TOOLDIR%tcl TCL_VER=86 TCL_VER_LONG=8.6 DYNAMIC_TCL=yes %1 IME=yes CSCOPE=yes diff --git a/src/bigvim64.bat b/src/bigvim64.bat index 6b58fa0d6..8d5fba0f6 100644 --- a/src/bigvim64.bat +++ b/src/bigvim64.bat @@ -1,7 +1,7 @@ -:: command to build big Vim 64 bit with OLE, Perl, Python, Ruby and Tcl +:: command to build big Vim 64 bit with OLE, Perl and Python. :: First run: %VCDIR%\vcvarsall.bat x86_amd64 :: Ruby and Tcl are excluded, doesn't seem to work. SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\" SET TOOLDIR=E:\ -%VCDIR%\bin\nmake -f Make_mvc.mak CPU=AMD64 GUI=yes OLE=yes PERL=E:\perl514 DYNAMIC_PERL=yes PERL_VER=514 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python32 DYNAMIC_PYTHON3=yes PYTHON3_VER=32 %1 IME=yes CSCOPE=yes +%VCDIR%\bin\nmake -f Make_mvc.mak CPU=AMD64 GUI=yes OLE=yes PERL=E:\perl524 DYNAMIC_PERL=yes PERL_VER=524 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python35 DYNAMIC_PYTHON3=yes PYTHON3_VER=35 %1 IME=yes CSCOPE=yes diff --git a/src/version.c b/src/version.c index fbe8d571d..d2296c4b3 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2302, +/**/ 2301, /**/ 2300, |