aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

updated for version 7.3.620

Browse Source 
Problem:    Building with recent Ruby on Win32 doesn't work.
Solution:   Add a separate argument for the API version. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2012-08-02 21:21:47 +02:00
parent e4195c5d84
commit da3cb831e9
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Make_ming.mak
View File

@@ -260,7 +260,9 @@ endif
# DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
# RUBY_VER=[Ruby version, eg 16, 17] (default is 16) # RUBY_VER=[Ruby version, eg 16, 17] (default is 16)
# RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.6) # 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 #RUBY=c:/ruby
ifdef RUBY ifdef RUBY
ifndef DYNAMIC_RUBY ifndef DYNAMIC_RUBY
@@ -273,6 +275,9 @@ endif
ifndef RUBY_VER_LONG ifndef RUBY_VER_LONG
RUBY_VER_LONG = 1.6 RUBY_VER_LONG = 1.6
endif endif
ifndef RUBY_API_VER
RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG))
endif
ifndef RUBY_PLATFORM ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16) ifeq ($(RUBY_VER), 16)
@@ -288,9 +293,9 @@ endif
ifndef RUBY_INSTALL_NAME ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16) ifeq ($(RUBY_VER), 16)
RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
else else
RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
endif endif
endif endif

13
src/Make_mvc.mak
View File

@@ -63,6 +63,8 @@
# RUBY_VER=[Ruby version, eg 16, 17] (default is 18) # RUBY_VER=[Ruby version, eg 16, 17] (default is 18)
# RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.8) # 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_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 interface:
# TCL=[Path to Tcl directory] # TCL=[Path to Tcl directory]
@@ -807,28 +809,31 @@ RUBY_VER = 18
!ifndef RUBY_VER_LONG !ifndef RUBY_VER_LONG
RUBY_VER_LONG = 1.8 RUBY_VER_LONG = 1.8
!endif !endif
!ifndef RUBY_API_VER
RUBY_API_VER = $(RUBY_VER_LONG:.=)
!endif
!if $(RUBY_VER) >= 18 !if $(RUBY_VER) >= 18
!ifndef RUBY_PLATFORM !ifndef RUBY_PLATFORM
RUBY_PLATFORM = i386-mswin32 RUBY_PLATFORM = i386-mswin32
!endif !endif
!ifndef RUBY_INSTALL_NAME !ifndef RUBY_INSTALL_NAME
RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
!endif !endif
!else !else
!ifndef RUBY_PLATFORM !ifndef RUBY_PLATFORM
RUBY_PLATFORM = i586-mswin32 RUBY_PLATFORM = i586-mswin32
!endif !endif
!ifndef RUBY_INSTALL_NAME !ifndef RUBY_INSTALL_NAME
RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
!endif !endif
!endif # $(RUBY_VER) >= 18 !endif # $(RUBY_VER) >= 18
!message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)" !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)"
CFLAGS = $(CFLAGS) -DFEAT_RUBY CFLAGS = $(CFLAGS) -DFEAT_RUBY
RUBY_OBJ = $(OUTDIR)\if_ruby.obj RUBY_OBJ = $(OUTDIR)\if_ruby.obj
!if $(RUBY_VER) >= 190 !if $(RUBY_VER) >= 19
RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)" 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 !else
RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)"
!endif !endif

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
620,
/**/ /**/
619, 619,
/**/ /**/