thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.2345

Browse Source 
Problem:    For MinGW RUBY_API_VER_LONG isn't set correctly.  Many default
            version numbers are outdated.
Solution:   Set RUBY_API_VER_LONG to RUBY_VER_LONG. Use latest stable releases
            for defaults. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2016-09-08 20:28:45 +02:00
parent 169ebb0804
commit 0eaadec6b2
3 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Make_cyg_ming.mak
View File

@@ -156,10 +156,10 @@ endif
# Perl interface: # Perl interface:
# PERL=[Path to Perl directory] (Set inside Make_cyg.mak or Make_ming.mak) # PERL=[Path to Perl directory] (Set inside Make_cyg.mak or Make_ming.mak)
# DYNAMIC_PERL=yes (to load the Perl DLL dynamically) # DYNAMIC_PERL=yes (to load the Perl DLL dynamically)
# PERL_VER=[Perl version, eg 56, 58, 510] (default is 56) # PERL_VER=[Perl version, eg 56, 58, 510] (default is 524)
ifdef PERL ifdef PERL
ifndef PERL_VER ifndef PERL_VER
PERL_VER=56 PERL_VER=524
endif endif
ifndef DYNAMIC_PERL ifndef DYNAMIC_PERL
DYNAMIC_PERL=yes DYNAMIC_PERL=yes
@@ -188,14 +188,14 @@ endif
# Lua interface: # Lua interface:
# LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak) # LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak)
# DYNAMIC_LUA=yes (to load the Lua DLL dynamically) # DYNAMIC_LUA=yes (to load the Lua DLL dynamically)
# LUA_VER=[Lua version, eg 51, 52] (default is 51) # LUA_VER=[Lua version, eg 51, 52] (default is 53)
ifdef LUA ifdef LUA
ifndef DYNAMIC_LUA ifndef DYNAMIC_LUA
DYNAMIC_LUA=yes DYNAMIC_LUA=yes
endif endif
ifndef LUA_VER ifndef LUA_VER
LUA_VER=51 LUA_VER=53
endif endif
ifeq (no,$(DYNAMIC_LUA)) ifeq (no,$(DYNAMIC_LUA))
@@ -207,7 +207,7 @@ endif
# MzScheme interface: # MzScheme interface:
# MZSCHEME=[Path to MzScheme directory] (Set inside Make_cyg.mak or Make_ming.mak) # MZSCHEME=[Path to MzScheme directory] (Set inside Make_cyg.mak or Make_ming.mak)
# DYNAMIC_MZSCHEME=yes (to load the MzScheme DLL dynamically) # DYNAMIC_MZSCHEME=yes (to load the MzScheme DLL dynamically)
# MZSCHEME_VER=[MzScheme version] (default is 205_000) # MZSCHEME_VER=[MzScheme version] (default is 3m_a0solc (6.6))
# MZSCHEME_DEBUG=no # MZSCHEME_DEBUG=no
ifdef MZSCHEME ifdef MZSCHEME
ifndef DYNAMIC_MZSCHEME ifndef DYNAMIC_MZSCHEME
@@ -215,7 +215,7 @@ DYNAMIC_MZSCHEME=yes
endif endif
ifndef MZSCHEME_VER ifndef MZSCHEME_VER
MZSCHEME_VER=205_000 MZSCHEME_VER=3m_a0solc
endif endif
# for version 4.x we need to generate byte-code for Scheme base # for version 4.x we need to generate byte-code for Scheme base
@@ -263,7 +263,7 @@ endif
# Python interface: # Python interface:
# PYTHON=[Path to Python directory] (Set inside Make_cyg.mak or Make_ming.mak) # PYTHON=[Path to Python directory] (Set inside Make_cyg.mak or Make_ming.mak)
# DYNAMIC_PYTHON=yes (to load the Python DLL dynamically) # DYNAMIC_PYTHON=yes (to load the Python DLL dynamically)
# PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 22) # PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 27)
ifdef PYTHON ifdef PYTHON
ifndef DYNAMIC_PYTHON ifndef DYNAMIC_PYTHON
DYNAMIC_PYTHON=yes DYNAMIC_PYTHON=yes
@@ -296,14 +296,14 @@ endif
# Python3 interface: # Python3 interface:
# PYTHON3=[Path to Python3 directory] (Set inside Make_cyg.mak or Make_ming.mak) # PYTHON3=[Path to Python3 directory] (Set inside Make_cyg.mak or Make_ming.mak)
# DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically) # DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically)
# PYTHON3_VER=[Python3 version, eg 31, 32] (default is 31) # PYTHON3_VER=[Python3 version, eg 31, 32] (default is 35)
ifdef PYTHON3 ifdef PYTHON3
ifndef DYNAMIC_PYTHON3 ifndef DYNAMIC_PYTHON3
DYNAMIC_PYTHON3=yes DYNAMIC_PYTHON3=yes
endif endif
ifndef PYTHON3_VER ifndef PYTHON3_VER
PYTHON3_VER=31 PYTHON3_VER=35
endif endif
ifndef DYNAMIC_PYTHON3_DLL ifndef DYNAMIC_PYTHON3_DLL
DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll
@@ -328,18 +328,18 @@ endif
# TCL interface: # TCL interface:
# TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak) # TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak)
# DYNAMIC_TCL=yes (to load the TCL DLL dynamically) # DYNAMIC_TCL=yes (to load the TCL DLL dynamically)
# TCL_VER=[TCL version, eg 83, 84] (default is 83) # TCL_VER=[TCL version, eg 83, 84] (default is 86)
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3) # TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
# You must set TCL_VER_LONG when you set TCL_VER. # You must set TCL_VER_LONG when you set TCL_VER.
ifdef TCL ifdef TCL
ifndef DYNAMIC_TCL ifndef DYNAMIC_TCL
DYNAMIC_TCL=yes DYNAMIC_TCL=yes
endif endif
ifndef TCL_VER ifndef TCL_VER
TCL_VER = 83 TCL_VER = 86
endif endif
ifndef TCL_VER_LONG ifndef TCL_VER_LONG
TCL_VER_LONG = 8.3 TCL_VER_LONG = 8.6
endif endif
TCLINC += -I$(TCL)/include TCLINC += -I$(TCL)/include
endif endif
@@ -367,7 +367,7 @@ ifndef RUBY_VER_LONG
RUBY_VER_LONG = 2.2.0 RUBY_VER_LONG = 2.2.0
endif endif
ifndef RUBY_API_VER_LONG ifndef RUBY_API_VER_LONG
RUBY_API_VER_LONG = $(RUBY_API_VER_LONG) RUBY_API_VER_LONG = $(RUBY_VER_LONG)
endif endif
ifndef RUBY_API_VER ifndef RUBY_API_VER
RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG)) RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG))

28
src/Make_mvc.mak
View File

@@ -39,12 +39,12 @@
# Lua interface: # Lua interface:
# LUA=[Path to Lua directory] # LUA=[Path to Lua directory]
# DYNAMIC_LUA=yes (to load the Lua DLL dynamically) # DYNAMIC_LUA=yes (to load the Lua DLL dynamically)
# LUA_VER=[Lua version] (default is 51) # LUA_VER=[Lua version] (default is 53)
# #
# MzScheme interface: # MzScheme interface:
# MZSCHEME=[Path to MzScheme directory] # MZSCHEME=[Path to MzScheme directory]
# DYNAMIC_MZSCHEME=yes (to load the MzScheme DLLs dynamically) # DYNAMIC_MZSCHEME=yes (to load the MzScheme DLLs dynamically)
# MZSCHEME_VER=[version, 205_000, ...] # MZSCHEME_VER=[version, 205_000, ...] (default is 3m_a0solc (6.6))
# MZSCHEME_DEBUG=no # MZSCHEME_DEBUG=no
# #
# Perl interface: # Perl interface:
@@ -52,17 +52,17 @@
# DYNAMIC_PERL=yes (to load the Perl DLL dynamically) # DYNAMIC_PERL=yes (to load the Perl DLL dynamically)
# PERL_VER=[Perl version, in the form 55 (5.005), 56 (5.6.x), # PERL_VER=[Perl version, in the form 55 (5.005), 56 (5.6.x),
# 510 (5.10.x), etc] # 510 (5.10.x), etc]
# (default is 56) # (default is 524)
# #
# Python interface: # Python interface:
# PYTHON=[Path to Python directory] # PYTHON=[Path to Python directory]
# DYNAMIC_PYTHON=yes (to load the Python DLL dynamically) # DYNAMIC_PYTHON=yes (to load the Python DLL dynamically)
# PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 22) # PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 27)
# #
# Python3 interface: # Python3 interface:
# PYTHON3=[Path to Python3 directory] # PYTHON3=[Path to Python3 directory]
# DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically) # DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically)
# PYTHON3_VER=[Python3 version, eg 30, 31] (default is 31) # PYTHON3_VER=[Python3 version, eg 30, 31] (default is 35)
# #
# Ruby interface: # Ruby interface:
# RUBY=[Path to Ruby directory] # RUBY=[Path to Ruby directory]
@@ -78,8 +78,8 @@
# Tcl interface: # Tcl interface:
# TCL=[Path to Tcl directory] # TCL=[Path to Tcl directory]
# DYNAMIC_TCL=yes (to load the Tcl DLL dynamically) # DYNAMIC_TCL=yes (to load the Tcl DLL dynamically)
# TCL_VER=[Tcl version, e.g. 80, 83] (default is 83) # TCL_VER=[Tcl version, e.g. 80, 83] (default is 86)
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3) # TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
# You must set TCL_VER_LONG when you set TCL_VER. # You must set TCL_VER_LONG when you set TCL_VER.
# #
# Cscope support: CSCOPE=yes # Cscope support: CSCOPE=yes
@@ -700,8 +700,8 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_GETTEXT
# TCL interface # TCL interface
!ifdef TCL !ifdef TCL
!ifndef TCL_VER !ifndef TCL_VER
TCL_VER = 83 TCL_VER = 86
TCL_VER_LONG = 8.3 TCL_VER_LONG = 8.6
!endif !endif
!message Tcl requested (version $(TCL_VER)) - root dir is "$(TCL)" !message Tcl requested (version $(TCL_VER)) - root dir is "$(TCL)"
!if "$(DYNAMIC_TCL)" == "yes" !if "$(DYNAMIC_TCL)" == "yes"
@@ -723,7 +723,7 @@ TCL_LIB = $(TCL)\lib\tcl$(TCL_VER)vc.lib
# Lua interface # Lua interface
!ifdef LUA !ifdef LUA
!ifndef LUA_VER !ifndef LUA_VER
LUA_VER = 51 LUA_VER = 53
!endif !endif
!message Lua requested (version $(LUA_VER)) - root dir is "$(LUA)" !message Lua requested (version $(LUA_VER)) - root dir is "$(LUA)"
!if "$(DYNAMIC_LUA)" == "yes" !if "$(DYNAMIC_LUA)" == "yes"
@@ -751,7 +751,7 @@ DYNAMIC_PYTHON3=yes
# PYTHON interface # PYTHON interface
!ifdef PYTHON !ifdef PYTHON
!ifndef PYTHON_VER !ifndef PYTHON_VER
PYTHON_VER = 22 PYTHON_VER = 27
!endif !endif
!message Python requested (version $(PYTHON_VER)) - root dir is "$(PYTHON)" !message Python requested (version $(PYTHON_VER)) - root dir is "$(PYTHON)"
!if "$(DYNAMIC_PYTHON)" == "yes" !if "$(DYNAMIC_PYTHON)" == "yes"
@@ -772,7 +772,7 @@ PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib
# PYTHON3 interface # PYTHON3 interface
!ifdef PYTHON3 !ifdef PYTHON3
!ifndef PYTHON3_VER !ifndef PYTHON3_VER
PYTHON3_VER = 31 PYTHON3_VER = 35
!endif !endif
!message Python3 requested (version $(PYTHON3_VER)) - root dir is "$(PYTHON3)" !message Python3 requested (version $(PYTHON3_VER)) - root dir is "$(PYTHON3)"
!if "$(DYNAMIC_PYTHON3)" == "yes" !if "$(DYNAMIC_PYTHON3)" == "yes"
@@ -794,7 +794,7 @@ PYTHON3_LIB = $(PYTHON3)\libs\python$(PYTHON3_VER).lib
!ifdef MZSCHEME !ifdef MZSCHEME
!message MzScheme requested - root dir is "$(MZSCHEME)" !message MzScheme requested - root dir is "$(MZSCHEME)"
!ifndef MZSCHEME_VER !ifndef MZSCHEME_VER
MZSCHEME_VER = 205_000 MZSCHEME_VER = 3m_a0solc
!endif !endif
!ifndef MZSCHEME_COLLECTS !ifndef MZSCHEME_COLLECTS
MZSCHEME_COLLECTS=$(MZSCHEME)\collects MZSCHEME_COLLECTS=$(MZSCHEME)\collects
@@ -852,7 +852,7 @@ MZSCHEME_LIB = $(MZSCHEME_LIB) /STACK:8388608
# Perl interface # Perl interface
!ifdef PERL !ifdef PERL
!ifndef PERL_VER !ifndef PERL_VER
PERL_VER = 56 PERL_VER = 524
!endif !endif
!message Perl requested (version $(PERL_VER)) - root dir is "$(PERL)" !message Perl requested (version $(PERL_VER)) - root dir is "$(PERL)"
!if "$(DYNAMIC_PERL)" == "yes" !if "$(DYNAMIC_PERL)" == "yes"

2
src/version.c
View File

@@ -763,6 +763,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 */
/**/
2345,
/**/ /**/
2344, 2344,
/**/ /**/