Mercurial > vim

comparison src/Make_cyg_ming.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 b0c7061d6439
children cd9823840f2e
comparison
equal deleted inserted replaced
10137:8e6070686e81 10138:8bfcb960e6bd
346 346
347 347
348 # Ruby interface: 348 # Ruby interface:
349 # RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak) 349 # RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak)
350 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) 350 # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
351 # RUBY_VER=[Ruby version, eg 18, 19, 20] (default is 18) 351 # RUBY_VER=[Ruby version, eg 19, 22] (default is 22)
352 # RUBY_VER_LONG=[Ruby version, eg 1.8, 1.9.1, 2.0.0] (default is 1.8) 352 # RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0]
353 # You must set RUBY_VER_LONG when changing RUBY_VER. 353 # (default is 2.2.0)
354 # RUBY_API_VER is derived from RUBY_VER_LONG. 354 # You must set RUBY_API_VER_LONG when changing RUBY_VER.
355 # Note: If you use Ruby 1.9.3, set as follows: 355 # Note: If you use Ruby 1.9.3, set as follows:
356 # RUBY_VER=19 356 # RUBY_VER=19
357 # RUBY_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.) 357 # RUBY_API_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.)
358 ifdef RUBY 358 ifdef RUBY
359 ifndef DYNAMIC_RUBY 359 ifndef DYNAMIC_RUBY
360 DYNAMIC_RUBY=yes 360 DYNAMIC_RUBY=yes
361 endif 361 endif
362 # Set default value 362 # Set default value
363 ifndef RUBY_VER 363 ifndef RUBY_VER
364 RUBY_VER = 18 364 RUBY_VER = 22
365 endif 365 endif
366 ifndef RUBY_VER_LONG 366 ifndef RUBY_VER_LONG
367 RUBY_VER_LONG = 1.8 367 RUBY_VER_LONG = 2.2.0
368 endif
369 ifndef RUBY_API_VER_LONG
370 RUBY_API_VER_LONG = $(RUBY_API_VER_LONG)
368 endif 371 endif
369 ifndef RUBY_API_VER 372 ifndef RUBY_API_VER
370 RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG)) 373 RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG))
371 endif 374 endif
372 375
373 ifndef RUBY_PLATFORM 376 ifndef RUBY_PLATFORM
374 ifeq ($(RUBY_VER), 16) 377 ifeq ($(RUBY_VER), 16)
375 RUBY_PLATFORM = i586-mswin32 378 RUBY_PLATFORM = i586-mswin32
376 else 379 else
377 ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),) 380 ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
378 RUBY_PLATFORM = i386-mingw32 381 RUBY_PLATFORM = i386-mingw32
379 else 382 else
380 ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/x64-mingw32),) 383 ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
381 RUBY_PLATFORM = x64-mingw32 384 RUBY_PLATFORM = x64-mingw32
382 else 385 else
383 RUBY_PLATFORM = i386-mswin32 386 RUBY_PLATFORM = i386-mswin32
384 endif 387 endif
385 endif 388 endif
404 407
405 ifeq (19, $(word 1,$(sort 19 $(RUBY_VER)))) 408 ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
406 RUBY_19_OR_LATER = 1 409 RUBY_19_OR_LATER = 1
407 endif 410 endif
408 411
409 RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) 412 RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
410 ifdef RUBY_19_OR_LATER 413 ifdef RUBY_19_OR_LATER
411 RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM) 414 RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
412 endif 415 endif
413 ifeq (no, $(DYNAMIC_RUBY)) 416 ifeq (no, $(DYNAMIC_RUBY))
414 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) 417 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
415 endif 418 endif
416 419