To: vim_dev@googlegroups.com Subject: Patch 7.4.2340 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2340 Problem: MS-Windows: Building with Ruby uses old version. Solution: Update to 2.2.X. Use clearer name for the API version. (Ken Takata) Files: Makefile, src/INSTALLpc.txt, src/Make_cyg_ming.mak, src/Make_mvc.mak, src/bigvim.bat *** ../vim-7.4.2339/Makefile 2016-08-28 20:14:09.535635736 +0200 --- Makefile 2016-09-06 21:53:43.932183552 +0200 *************** *** 158,164 **** # - Move gvim.pdb to here. # - Copy "GvimExt/gvimext.dll" to here. # - Delete vimrun.exe, install.exe and uninstal.exe. ! # Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME: # - Install the interfaces you want, see src/INSTALLpc.txt # - Build: # > cd src --- 158,164 ---- # - Move gvim.pdb to here. # - Copy "GvimExt/gvimext.dll" to here. # - Delete vimrun.exe, install.exe and uninstal.exe. ! # Win32 GUI version with OLE, PERL, Ruby, TCL, PYTHON and dynamic IME: # - Install the interfaces you want, see src/INSTALLpc.txt # - Build: # > cd src *** ../vim-7.4.2339/src/INSTALLpc.txt 2016-07-31 14:17:22.907502194 +0200 --- src/INSTALLpc.txt 2016-09-06 21:57:36.506164115 +0200 *************** *** 598,608 **** When building, you need to set the following variables at least: ! RUBY: Where ruby is installed. E.g. C:\Ruby22 ! DYNAMIC_RUBY: Whether dynamic linking is used. Usually, set to yes. ! RUBY_VER: Ruby version. E.g. 22 for Ruby 2.2.X. ! RUBY_VER_LONG: Ruby API version in a long format. ! E.g. 2.2.0 for Ruby 2.2.X. Ruby version vs. Ruby API version: --- 598,608 ---- When building, you need to set the following variables at least: ! RUBY: Where ruby is installed. E.g. C:\Ruby22 ! DYNAMIC_RUBY: Whether dynamic linking is used. Usually, set to yes. ! RUBY_VER: Ruby version. E.g. 22 for Ruby 2.2.X. ! RUBY_API_VER_LONG: Ruby API version in a long format. ! E.g. 2.2.0 for Ruby 2.2.X. Ruby version vs. Ruby API version: *************** *** 653,659 **** 4) Build Vim. Note that you need to adjust some variables (as one line): nmake -f Make_mvc.mak ! RUBY=C:\Ruby22 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_VER_LONG=2.2.0 RUBY_MSVCRT_NAME=msvcrt WINVER=0x501 --- 653,659 ---- 4) Build Vim. Note that you need to adjust some variables (as one line): nmake -f Make_mvc.mak ! RUBY=C:\Ruby22 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_API_VER_LONG=2.2.0 RUBY_MSVCRT_NAME=msvcrt WINVER=0x501 *************** *** 668,674 **** After you install RubyInstaller, just type this (as one line): mingw32-make -f Make_ming.mak ! RUBY=C:/Ruby22 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_VER_LONG=2.2.0 WINVER=0x501 If you set WINVER explicitly, it must be set to >=0x500, when building with --- 668,674 ---- After you install RubyInstaller, just type this (as one line): mingw32-make -f Make_ming.mak ! RUBY=C:/Ruby22 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_API_VER_LONG=2.2.0 WINVER=0x501 If you set WINVER explicitly, it must be set to >=0x500, when building with *** ../vim-7.4.2339/src/Make_cyg_ming.mak 2016-07-19 16:38:45.507086996 +0200 --- src/Make_cyg_ming.mak 2016-09-06 22:05:43.957943459 +0200 *************** *** 348,383 **** # Ruby interface: # RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak) # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) ! # RUBY_VER=[Ruby version, eg 18, 19, 20] (default is 18) ! # RUBY_VER_LONG=[Ruby version, eg 1.8, 1.9.1, 2.0.0] (default is 1.8) ! # You must set RUBY_VER_LONG when changing RUBY_VER. ! # RUBY_API_VER is derived from RUBY_VER_LONG. # Note: If you use Ruby 1.9.3, set as follows: # RUBY_VER=19 ! # RUBY_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.) ifdef RUBY ifndef DYNAMIC_RUBY DYNAMIC_RUBY=yes endif # Set default value ifndef RUBY_VER ! RUBY_VER = 18 endif ifndef RUBY_VER_LONG ! RUBY_VER_LONG = 1.8 endif ifndef RUBY_API_VER ! RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG)) endif ifndef RUBY_PLATFORM ifeq ($(RUBY_VER), 16) RUBY_PLATFORM = i586-mswin32 else ! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),) RUBY_PLATFORM = i386-mingw32 else ! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/x64-mingw32),) RUBY_PLATFORM = x64-mingw32 else RUBY_PLATFORM = i386-mswin32 --- 348,386 ---- # Ruby interface: # RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak) # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) ! # RUBY_VER=[Ruby version, eg 19, 22] (default is 22) ! # RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0] ! # (default is 2.2.0) ! # You must set RUBY_API_VER_LONG when changing RUBY_VER. # Note: If you use Ruby 1.9.3, set as follows: # RUBY_VER=19 ! # RUBY_API_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.) ifdef RUBY ifndef DYNAMIC_RUBY DYNAMIC_RUBY=yes endif # Set default value ifndef RUBY_VER ! RUBY_VER = 22 endif ifndef RUBY_VER_LONG ! RUBY_VER_LONG = 2.2.0 ! endif ! ifndef RUBY_API_VER_LONG ! RUBY_API_VER_LONG = $(RUBY_API_VER_LONG) endif ifndef RUBY_API_VER ! RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG)) endif ifndef RUBY_PLATFORM ifeq ($(RUBY_VER), 16) RUBY_PLATFORM = i586-mswin32 else ! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),) RUBY_PLATFORM = i386-mingw32 else ! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),) RUBY_PLATFORM = x64-mingw32 else RUBY_PLATFORM = i386-mswin32 *************** *** 406,414 **** RUBY_19_OR_LATER = 1 endif ! RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) ifdef RUBY_19_OR_LATER ! RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM) endif ifeq (no, $(DYNAMIC_RUBY)) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) --- 409,417 ---- RUBY_19_OR_LATER = 1 endif ! RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) ifdef RUBY_19_OR_LATER ! RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) endif ifeq (no, $(DYNAMIC_RUBY)) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) *** ../vim-7.4.2339/src/Make_mvc.mak 2016-09-01 20:50:51.023640683 +0200 --- src/Make_mvc.mak 2016-09-06 22:02:38.955543511 +0200 *************** *** 67,79 **** # Ruby interface: # RUBY=[Path to Ruby directory] # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) ! # RUBY_VER=[Ruby version, eg 18, 19, 20] (default is 18) ! # RUBY_VER_LONG=[Ruby version, eg 1.8, 1.9.1, 2.0.0] (default is 1.8) ! # You must set RUBY_VER_LONG when change RUBY_VER. ! # RUBY_API_VER is derived from RUBY_VER_LONG. # Note: If you use Ruby 1.9.3, set as follows: # RUBY_VER=19 ! # RUBY_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.) # # Tcl interface: # TCL=[Path to Tcl directory] --- 67,79 ---- # Ruby interface: # RUBY=[Path to Ruby directory] # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) ! # RUBY_VER=[Ruby version, eg 19, 22] (default is 22) ! # RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0] ! # (default is 2.2.0) ! # You must set RUBY_API_VER_LONG when change RUBY_VER. # Note: If you use Ruby 1.9.3, set as follows: # RUBY_VER=19 ! # RUBY_API_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.) # # Tcl interface: # TCL=[Path to Tcl directory] *************** *** 917,929 **** !ifdef RUBY # Set default value !ifndef RUBY_VER ! RUBY_VER = 18 !endif !ifndef RUBY_VER_LONG ! RUBY_VER_LONG = 1.8 !endif !ifndef RUBY_API_VER ! RUBY_API_VER = $(RUBY_VER_LONG:.=) !endif !if $(RUBY_VER) >= 18 --- 917,932 ---- !ifdef RUBY # Set default value !ifndef RUBY_VER ! RUBY_VER = 22 !endif !ifndef RUBY_VER_LONG ! RUBY_VER_LONG = 2.2.0 ! !endif ! !ifndef RUBY_API_VER_LONG ! RUBY_API_VER_LONG = $(RUBY_VER_LONG) !endif !ifndef RUBY_API_VER ! RUBY_API_VER = $(RUBY_API_VER_LONG:.=) !endif !if $(RUBY_VER) >= 18 *************** *** 966,974 **** CFLAGS = $(CFLAGS) -DFEAT_RUBY RUBY_OBJ = $(OUTDIR)\if_ruby.obj !if $(RUBY_VER) >= 19 ! RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" !else ! RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" !endif RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib # Do we want to load Ruby dynamically? --- 969,977 ---- CFLAGS = $(CFLAGS) -DFEAT_RUBY RUBY_OBJ = $(OUTDIR)\if_ruby.obj !if $(RUBY_VER) >= 19 ! RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" !else ! RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" !endif RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib # Do we want to load Ruby dynamically? *** ../vim-7.4.2339/src/bigvim.bat 2016-09-01 20:50:51.023640683 +0200 --- src/bigvim.bat 2016-09-06 22:00:17.588767642 +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%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 --- 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%rubyw2 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_API_VER_LONG=2.2.0 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.2339/src/version.c 2016-09-06 21:33:48.058246940 +0200 --- src/version.c 2016-09-06 22:03:22.859163601 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2340, /**/ -- hundred-and-one symptoms of being an internet addict: 185. You order fast food over the Internet /// 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 ///