Skip to content

Commit f1b512a

Browse files
committed
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.
1 parent 641ad6c commit f1b512a

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/Make_mvc.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ RUBY_PLATFORM = i386-mswin32
934934
!else # CPU
935935
RUBY_PLATFORM = x64-mswin64
936936
!endif # CPU
937-
!if $(MSVCRT_VER) >= 70
937+
!if $(MSVCRT_VER) >= 70 && $(RUBY_VER) > 19
938938
RUBY_PLATFORM = $(RUBY_PLATFORM)_$(MSVCRT_VER)
939939
!endif # MSVCRT_VER
940940
!endif # RUBY_PLATFORM

src/bigvim.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:: command to build big Vim with OLE, Perl, Python, Ruby and Tcl
22
SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\"
33
SET TOOLDIR=E:\
4-
%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
4+
%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
55

src/bigvim64.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
:: command to build big Vim 64 bit with OLE, Perl, Python, Ruby and Tcl
1+
:: command to build big Vim 64 bit with OLE, Perl and Python.
22
:: First run: %VCDIR%\vcvarsall.bat x86_amd64
33
:: Ruby and Tcl are excluded, doesn't seem to work.
44
SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\"
55
SET TOOLDIR=E:\
6-
%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
6+
%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
77

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2302,
766768
/**/
767769
2301,
768770
/**/

0 commit comments

Comments
 (0)