Mercurial > vim
changeset 3722:a6ebae140d89 v7.3.620
updated for version 7.3.620
Problem: Building with recent Ruby on Win32 doesn't work.
Solution: Add a separate argument for the API version. (Yasuhiro Matsumoto)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 02 Aug 2012 21:21:47 +0200 |
| parents | ba2679965d9c |
| children | 3f17b871bfee |
| files | src/Make_ming.mak src/Make_mvc.mak src/version.c |
| diffstat | 3 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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