To: vim_dev@googlegroups.com Subject: Patch 7.4.2302 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ 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. Files: src/bigvim.bat, src/bigvim64.bat *** ../vim-7.4.2301/src/bigvim.bat 2016-01-02 15:06:59.571330038 +0100 --- src/bigvim.bat 2016-09-01 20:48:05.689249907 +0200 *************** *** 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 --- 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%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 *** ../vim-7.4.2301/src/bigvim64.bat 2012-08-29 17:32:55.000000000 +0200 --- src/bigvim64.bat 2016-09-01 19:54:43.163505365 +0200 *************** *** 1,7 **** ! :: command to build big Vim 64 bit with OLE, Perl, Python, Ruby and Tcl :: 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 --- 1,7 ---- ! :: 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:\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 *** ../vim-7.4.2301/src/Make_mvc.mak 2016-07-19 16:38:45.507086996 +0200 --- src/Make_mvc.mak 2016-09-01 20:50:25.109513054 +0200 *************** *** 934,940 **** !else # CPU RUBY_PLATFORM = x64-mswin64 !endif # CPU ! !if $(MSVCRT_VER) >= 70 RUBY_PLATFORM = $(RUBY_PLATFORM)_$(MSVCRT_VER) !endif # MSVCRT_VER !endif # RUBY_PLATFORM --- 934,940 ---- !else # CPU RUBY_PLATFORM = x64-mswin64 !endif # CPU ! !if $(MSVCRT_VER) >= 70 && $(RUBY_VER) > 19 RUBY_PLATFORM = $(RUBY_PLATFORM)_$(MSVCRT_VER) !endif # MSVCRT_VER !endif # RUBY_PLATFORM *** ../vim-7.4.2301/src/version.c 2016-09-01 18:32:05.302122915 +0200 --- src/version.c 2016-09-01 20:48:37.136726475 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2302, /**/ -- I'm writing a book. I've got the page numbers done. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///