Mercurial > vim

changeset 10062:103d874ebb96 v7.4.2302

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/f1b512a0b62d0fa47ee9b2612556f375e1f22fc2 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Sep 1 20:50:54 2016 +0200 patch 7.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.
author Christian Brabandt <cb@256bit.org>
date Thu, 01 Sep 2016 21:00:08 +0200
parents a4927f0bb5fb
children b7b9bcaa1e24
files src/Make_mvc.mak src/bigvim.bat src/bigvim64.bat src/version.c
diffstat 4 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
 
--- 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
 
--- 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,