Mercurial > vim

comparison src/Make_mvc.mak @ 10138:8bfcb960e6bd v7.4.2340

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/6384c5db8dda70076c878d393ba19a1510695228 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Sep 6 22:06:35 2016 +0200 patch 7.4.2340 Problem: MS-Windows: Building with Ruby uses old version. Solution: Update to 2.2.X. Use clearer name for the API version. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Tue, 06 Sep 2016 22:15:07 +0200
parents 103d874ebb96
children cd9823840f2e
comparison
equal deleted inserted replaced
10137:8e6070686e81 10138:8bfcb960e6bd
65 # PYTHON3_VER=[Python3 version, eg 30, 31] (default is 31) 65 # PYTHON3_VER=[Python3 version, eg 30, 31] (default is 31)
66 # 66 #
67 # Ruby interface: 67 # Ruby interface:
68 # RUBY=[Path to Ruby directory] 68 # RUBY=[Path to Ruby directory]
69 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) 69 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
70 # RUBY_VER=[Ruby version, eg 18, 19, 20] (default is 18) 70 # RUBY_VER=[Ruby version, eg 19, 22] (default is 22)
71 # RUBY_VER_LONG=[Ruby version, eg 1.8, 1.9.1, 2.0.0] (default is 1.8) 71 # RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0]
72 # You must set RUBY_VER_LONG when change RUBY_VER. 72 # (default is 2.2.0)
73 # RUBY_API_VER is derived from RUBY_VER_LONG. 73 # You must set RUBY_API_VER_LONG when change RUBY_VER.
74 # Note: If you use Ruby 1.9.3, set as follows: 74 # Note: If you use Ruby 1.9.3, set as follows:
75 # RUBY_VER=19 75 # RUBY_VER=19
76 # RUBY_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.) 76 # RUBY_API_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.)
77 # 77 #
78 # Tcl interface: 78 # Tcl interface:
79 # TCL=[Path to Tcl directory] 79 # TCL=[Path to Tcl directory]
80 # DYNAMIC_TCL=yes (to load the Tcl DLL dynamically) 80 # DYNAMIC_TCL=yes (to load the Tcl DLL dynamically)
81 # TCL_VER=[Tcl version, e.g. 80, 83] (default is 83) 81 # TCL_VER=[Tcl version, e.g. 80, 83] (default is 83)
915 # Support Ruby interface 915 # Support Ruby interface
916 # 916 #
917 !ifdef RUBY 917 !ifdef RUBY
918 # Set default value 918 # Set default value
919 !ifndef RUBY_VER 919 !ifndef RUBY_VER
920 RUBY_VER = 18 920 RUBY_VER = 22
921 !endif 921 !endif
922 !ifndef RUBY_VER_LONG 922 !ifndef RUBY_VER_LONG
923 RUBY_VER_LONG = 1.8 923 RUBY_VER_LONG = 2.2.0
924 !endif
925 !ifndef RUBY_API_VER_LONG
926 RUBY_API_VER_LONG = $(RUBY_VER_LONG)
924 !endif 927 !endif
925 !ifndef RUBY_API_VER 928 !ifndef RUBY_API_VER
926 RUBY_API_VER = $(RUBY_VER_LONG:.=) 929 RUBY_API_VER = $(RUBY_API_VER_LONG:.=)
927 !endif 930 !endif
928 931
929 !if $(RUBY_VER) >= 18 932 !if $(RUBY_VER) >= 18
930 933
931 !ifndef RUBY_PLATFORM 934 !ifndef RUBY_PLATFORM
964 967
965 !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)" 968 !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)"
966 CFLAGS = $(CFLAGS) -DFEAT_RUBY 969 CFLAGS = $(CFLAGS) -DFEAT_RUBY
967 RUBY_OBJ = $(OUTDIR)\if_ruby.obj 970 RUBY_OBJ = $(OUTDIR)\if_ruby.obj
968 !if $(RUBY_VER) >= 19 971 !if $(RUBY_VER) >= 19
969 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)" 972 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)"
970 !else 973 !else
971 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" 974 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)"
972 !endif 975 !endif
973 RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib 976 RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib
974 # Do we want to load Ruby dynamically? 977 # Do we want to load Ruby dynamically?
975 !if "$(DYNAMIC_RUBY)" == "yes" 978 !if "$(DYNAMIC_RUBY)" == "yes"
976 !message Ruby DLL will be loaded dynamically 979 !message Ruby DLL will be loaded dynamically