Skip to content

Commit 0eaadec

Browse files
committed
patch 7.4.2345
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)
1 parent 169ebb0 commit 0eaadec

3 files changed

Lines changed: 30 additions & 28 deletions

File tree

src/Make_cyg_ming.mak

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ endif
156156
# Perl interface:
157157
# PERL=[Path to Perl directory] (Set inside Make_cyg.mak or Make_ming.mak)
158158
# DYNAMIC_PERL=yes (to load the Perl DLL dynamically)
159-
# PERL_VER=[Perl version, eg 56, 58, 510] (default is 56)
159+
# PERL_VER=[Perl version, eg 56, 58, 510] (default is 524)
160160
ifdef PERL
161161
ifndef PERL_VER
162-
PERL_VER=56
162+
PERL_VER=524
163163
endif
164164
ifndef DYNAMIC_PERL
165165
DYNAMIC_PERL=yes
@@ -188,14 +188,14 @@ endif
188188
# Lua interface:
189189
# LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak)
190190
# DYNAMIC_LUA=yes (to load the Lua DLL dynamically)
191-
# LUA_VER=[Lua version, eg 51, 52] (default is 51)
191+
# LUA_VER=[Lua version, eg 51, 52] (default is 53)
192192
ifdef LUA
193193
ifndef DYNAMIC_LUA
194194
DYNAMIC_LUA=yes
195195
endif
196196

197197
ifndef LUA_VER
198-
LUA_VER=51
198+
LUA_VER=53
199199
endif
200200

201201
ifeq (no,$(DYNAMIC_LUA))
@@ -207,15 +207,15 @@ endif
207207
# MzScheme interface:
208208
# MZSCHEME=[Path to MzScheme directory] (Set inside Make_cyg.mak or Make_ming.mak)
209209
# DYNAMIC_MZSCHEME=yes (to load the MzScheme DLL dynamically)
210-
# MZSCHEME_VER=[MzScheme version] (default is 205_000)
210+
# MZSCHEME_VER=[MzScheme version] (default is 3m_a0solc (6.6))
211211
# MZSCHEME_DEBUG=no
212212
ifdef MZSCHEME
213213
ifndef DYNAMIC_MZSCHEME
214214
DYNAMIC_MZSCHEME=yes
215215
endif
216216

217217
ifndef MZSCHEME_VER
218-
MZSCHEME_VER=205_000
218+
MZSCHEME_VER=3m_a0solc
219219
endif
220220

221221
# for version 4.x we need to generate byte-code for Scheme base
@@ -263,7 +263,7 @@ endif
263263
# Python interface:
264264
# PYTHON=[Path to Python directory] (Set inside Make_cyg.mak or Make_ming.mak)
265265
# DYNAMIC_PYTHON=yes (to load the Python DLL dynamically)
266-
# PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 22)
266+
# PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 27)
267267
ifdef PYTHON
268268
ifndef DYNAMIC_PYTHON
269269
DYNAMIC_PYTHON=yes
@@ -296,14 +296,14 @@ endif
296296
# Python3 interface:
297297
# PYTHON3=[Path to Python3 directory] (Set inside Make_cyg.mak or Make_ming.mak)
298298
# DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically)
299-
# PYTHON3_VER=[Python3 version, eg 31, 32] (default is 31)
299+
# PYTHON3_VER=[Python3 version, eg 31, 32] (default is 35)
300300
ifdef PYTHON3
301301
ifndef DYNAMIC_PYTHON3
302302
DYNAMIC_PYTHON3=yes
303303
endif
304304

305305
ifndef PYTHON3_VER
306-
PYTHON3_VER=31
306+
PYTHON3_VER=35
307307
endif
308308
ifndef DYNAMIC_PYTHON3_DLL
309309
DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll
@@ -328,18 +328,18 @@ endif
328328
# TCL interface:
329329
# TCL=[Path to TCL directory] (Set inside Make_cyg.mak or Make_ming.mak)
330330
# DYNAMIC_TCL=yes (to load the TCL DLL dynamically)
331-
# TCL_VER=[TCL version, eg 83, 84] (default is 83)
332-
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3)
331+
# TCL_VER=[TCL version, eg 83, 84] (default is 86)
332+
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
333333
# You must set TCL_VER_LONG when you set TCL_VER.
334334
ifdef TCL
335335
ifndef DYNAMIC_TCL
336336
DYNAMIC_TCL=yes
337337
endif
338338
ifndef TCL_VER
339-
TCL_VER = 83
339+
TCL_VER = 86
340340
endif
341341
ifndef TCL_VER_LONG
342-
TCL_VER_LONG = 8.3
342+
TCL_VER_LONG = 8.6
343343
endif
344344
TCLINC += -I$(TCL)/include
345345
endif
@@ -367,7 +367,7 @@ ifndef RUBY_VER_LONG
367367
RUBY_VER_LONG = 2.2.0
368368
endif
369369
ifndef RUBY_API_VER_LONG
370-
RUBY_API_VER_LONG = $(RUBY_API_VER_LONG)
370+
RUBY_API_VER_LONG = $(RUBY_VER_LONG)
371371
endif
372372
ifndef RUBY_API_VER
373373
RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG))

src/Make_mvc.mak

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,30 @@
3939
# Lua interface:
4040
# LUA=[Path to Lua directory]
4141
# DYNAMIC_LUA=yes (to load the Lua DLL dynamically)
42-
# LUA_VER=[Lua version] (default is 51)
42+
# LUA_VER=[Lua version] (default is 53)
4343
#
4444
# MzScheme interface:
4545
# MZSCHEME=[Path to MzScheme directory]
4646
# DYNAMIC_MZSCHEME=yes (to load the MzScheme DLLs dynamically)
47-
# MZSCHEME_VER=[version, 205_000, ...]
47+
# MZSCHEME_VER=[version, 205_000, ...] (default is 3m_a0solc (6.6))
4848
# MZSCHEME_DEBUG=no
4949
#
5050
# Perl interface:
5151
# PERL=[Path to Perl directory]
5252
# DYNAMIC_PERL=yes (to load the Perl DLL dynamically)
5353
# PERL_VER=[Perl version, in the form 55 (5.005), 56 (5.6.x),
5454
# 510 (5.10.x), etc]
55-
# (default is 56)
55+
# (default is 524)
5656
#
5757
# Python interface:
5858
# PYTHON=[Path to Python directory]
5959
# DYNAMIC_PYTHON=yes (to load the Python DLL dynamically)
60-
# PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 22)
60+
# PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 27)
6161
#
6262
# Python3 interface:
6363
# PYTHON3=[Path to Python3 directory]
6464
# DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically)
65-
# PYTHON3_VER=[Python3 version, eg 30, 31] (default is 31)
65+
# PYTHON3_VER=[Python3 version, eg 30, 31] (default is 35)
6666
#
6767
# Ruby interface:
6868
# RUBY=[Path to Ruby directory]
@@ -78,8 +78,8 @@
7878
# Tcl interface:
7979
# TCL=[Path to Tcl directory]
8080
# DYNAMIC_TCL=yes (to load the Tcl DLL dynamically)
81-
# TCL_VER=[Tcl version, e.g. 80, 83] (default is 83)
82-
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3)
81+
# TCL_VER=[Tcl version, e.g. 80, 83] (default is 86)
82+
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.6)
8383
# You must set TCL_VER_LONG when you set TCL_VER.
8484
#
8585
# Cscope support: CSCOPE=yes
@@ -700,8 +700,8 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_GETTEXT
700700
# TCL interface
701701
!ifdef TCL
702702
!ifndef TCL_VER
703-
TCL_VER = 83
704-
TCL_VER_LONG = 8.3
703+
TCL_VER = 86
704+
TCL_VER_LONG = 8.6
705705
!endif
706706
!message Tcl requested (version $(TCL_VER)) - root dir is "$(TCL)"
707707
!if "$(DYNAMIC_TCL)" == "yes"
@@ -723,7 +723,7 @@ TCL_LIB = $(TCL)\lib\tcl$(TCL_VER)vc.lib
723723
# Lua interface
724724
!ifdef LUA
725725
!ifndef LUA_VER
726-
LUA_VER = 51
726+
LUA_VER = 53
727727
!endif
728728
!message Lua requested (version $(LUA_VER)) - root dir is "$(LUA)"
729729
!if "$(DYNAMIC_LUA)" == "yes"
@@ -751,7 +751,7 @@ DYNAMIC_PYTHON3=yes
751751
# PYTHON interface
752752
!ifdef PYTHON
753753
!ifndef PYTHON_VER
754-
PYTHON_VER = 22
754+
PYTHON_VER = 27
755755
!endif
756756
!message Python requested (version $(PYTHON_VER)) - root dir is "$(PYTHON)"
757757
!if "$(DYNAMIC_PYTHON)" == "yes"
@@ -772,7 +772,7 @@ PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib
772772
# PYTHON3 interface
773773
!ifdef PYTHON3
774774
!ifndef PYTHON3_VER
775-
PYTHON3_VER = 31
775+
PYTHON3_VER = 35
776776
!endif
777777
!message Python3 requested (version $(PYTHON3_VER)) - root dir is "$(PYTHON3)"
778778
!if "$(DYNAMIC_PYTHON3)" == "yes"
@@ -794,7 +794,7 @@ PYTHON3_LIB = $(PYTHON3)\libs\python$(PYTHON3_VER).lib
794794
!ifdef MZSCHEME
795795
!message MzScheme requested - root dir is "$(MZSCHEME)"
796796
!ifndef MZSCHEME_VER
797-
MZSCHEME_VER = 205_000
797+
MZSCHEME_VER = 3m_a0solc
798798
!endif
799799
!ifndef MZSCHEME_COLLECTS
800800
MZSCHEME_COLLECTS=$(MZSCHEME)\collects
@@ -852,7 +852,7 @@ MZSCHEME_LIB = $(MZSCHEME_LIB) /STACK:8388608
852852
# Perl interface
853853
!ifdef PERL
854854
!ifndef PERL_VER
855-
PERL_VER = 56
855+
PERL_VER = 524
856856
!endif
857857
!message Perl requested (version $(PERL_VER)) - root dir is "$(PERL)"
858858
!if "$(DYNAMIC_PERL)" == "yes"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2345,
766768
/**/
767769
2344,
768770
/**/

0 commit comments

Comments
 (0)