diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-08-02 21:21:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-08-02 21:21:47 +0200 |
| commit | da3cb831e938d672361995d1dec2de3dae72ee5b (patch) | |
| tree | d030432ac7424097e1171fb3af27abd7a1556866 | |
| parent | e4195c5d84027a3137ad4bc0ba5b6bd14b8a3a04 (diff) | |
| download | vim-git-da3cb831e938d672361995d1dec2de3dae72ee5b.tar.gz | |
updated for version 7.3.620v7.3.620
Problem: Building with recent Ruby on Win32 doesn't work.
Solution: Add a separate argument for the API version. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/Make_ming.mak | 11 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 5b176dc13..de706eacc 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -260,7 +260,9 @@ endif # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) # RUBY_VER=[Ruby version, eg 16, 17] (default is 16) # RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.6) -# You must set RUBY_VER_LONG when change RUBY_VER. +# You must set RUBY_VER_LONG when changing RUBY_VER. +# You must set RUBY_API_VER version to RUBY_VER_LONG. +# Don't set ruby API version to RUBY_VER like 191. #RUBY=c:/ruby ifdef RUBY ifndef DYNAMIC_RUBY @@ -273,6 +275,9 @@ endif ifndef RUBY_VER_LONG RUBY_VER_LONG = 1.6 endif +ifndef RUBY_API_VER +RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG)) +endif ifndef RUBY_PLATFORM ifeq ($(RUBY_VER), 16) @@ -288,9 +293,9 @@ endif ifndef RUBY_INSTALL_NAME ifeq ($(RUBY_VER), 16) -RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) +RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER) else -RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) +RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER) endif endif diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 092e2b571..8b7eb6ad5 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -63,6 +63,8 @@ # RUBY_VER=[Ruby version, eg 16, 17] (default is 18) # RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.8) # You must set RUBY_VER_LONG when change RUBY_VER. +# You must set RUBY_API_VER to RUBY_VER_LONG. +# Don't set ruby API version to RUBY_VER like 191. # # Tcl interface: # TCL=[Path to Tcl directory] @@ -807,28 +809,31 @@ RUBY_VER = 18 !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 !ifndef RUBY_PLATFORM RUBY_PLATFORM = i386-mswin32 !endif !ifndef RUBY_INSTALL_NAME -RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) +RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER) !endif !else !ifndef RUBY_PLATFORM RUBY_PLATFORM = i586-mswin32 !endif !ifndef RUBY_INSTALL_NAME -RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) +RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER) !endif !endif # $(RUBY_VER) >= 18 !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)" CFLAGS = $(CFLAGS) -DFEAT_RUBY RUBY_OBJ = $(OUTDIR)\if_ruby.obj -!if $(RUBY_VER) >= 190 -RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)" +!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 diff --git a/src/version.c b/src/version.c index 285bdfc36..0be8c2b75 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 620, +/**/ 619, /**/ 618, |