home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.620 < prev    next >
Encoding:
Internet Message Format  |  2012-11-20  |  4.8 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.620
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.620
  11. Problem:    Building with recent Ruby on Win32 doesn't work.
  12. Solution:   Add a separate argument for the API version. (Yasuhiro Matsumoto)
  13. Files:        src/Make_ming.mak, src/Make_mvc.mak
  14.  
  15.  
  16. *** ../vim-7.3.619/src/Make_ming.mak    2012-07-06 13:40:44.000000000 +0200
  17. --- src/Make_ming.mak    2012-08-02 17:02:34.000000000 +0200
  18. ***************
  19. *** 260,266 ****
  20.   #      DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
  21.   #      RUBY_VER=[Ruby version, eg 16, 17] (default is 16)
  22.   #      RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.6)
  23. ! #        You must set RUBY_VER_LONG when change RUBY_VER.
  24.   #RUBY=c:/ruby
  25.   ifdef RUBY
  26.   ifndef DYNAMIC_RUBY
  27. --- 260,268 ----
  28.   #      DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
  29.   #      RUBY_VER=[Ruby version, eg 16, 17] (default is 16)
  30.   #      RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.6)
  31. ! #        You must set RUBY_VER_LONG when changing RUBY_VER.
  32. ! #        You must set RUBY_API_VER version to RUBY_VER_LONG.
  33. ! #        Don't set ruby API version to RUBY_VER like 191.
  34.   #RUBY=c:/ruby
  35.   ifdef RUBY
  36.   ifndef DYNAMIC_RUBY
  37. ***************
  38. *** 273,278 ****
  39. --- 275,283 ----
  40.   ifndef RUBY_VER_LONG
  41.   RUBY_VER_LONG = 1.6
  42.   endif
  43. + ifndef RUBY_API_VER
  44. + RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG))
  45. + endif
  46.   
  47.   ifndef RUBY_PLATFORM
  48.   ifeq ($(RUBY_VER), 16)
  49. ***************
  50. *** 288,296 ****
  51.   
  52.   ifndef RUBY_INSTALL_NAME
  53.   ifeq ($(RUBY_VER), 16)
  54. ! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
  55.   else
  56. ! RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
  57.   endif
  58.   endif
  59.   
  60. --- 293,301 ----
  61.   
  62.   ifndef RUBY_INSTALL_NAME
  63.   ifeq ($(RUBY_VER), 16)
  64. ! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
  65.   else
  66. ! RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
  67.   endif
  68.   endif
  69.   
  70. *** ../vim-7.3.619/src/Make_mvc.mak    2012-02-22 16:01:53.000000000 +0100
  71. --- src/Make_mvc.mak    2012-08-02 17:42:31.000000000 +0200
  72. ***************
  73. *** 63,68 ****
  74. --- 63,70 ----
  75.   #      RUBY_VER=[Ruby version, eg 16, 17] (default is 18)
  76.   #      RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.8)
  77.   #        You must set RUBY_VER_LONG when change RUBY_VER.
  78. + #        You must set RUBY_API_VER to RUBY_VER_LONG.
  79. + #        Don't set ruby API version to RUBY_VER like 191.
  80.   #
  81.   #    Tcl interface:
  82.   #      TCL=[Path to Tcl directory]
  83. ***************
  84. *** 807,834 ****
  85.   !ifndef RUBY_VER_LONG
  86.   RUBY_VER_LONG = 1.8
  87.   !endif
  88.   
  89.   !if $(RUBY_VER) >= 18
  90.   !ifndef RUBY_PLATFORM
  91.   RUBY_PLATFORM = i386-mswin32
  92.   !endif
  93.   !ifndef RUBY_INSTALL_NAME
  94. ! RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
  95.   !endif
  96.   !else
  97.   !ifndef RUBY_PLATFORM
  98.   RUBY_PLATFORM = i586-mswin32
  99.   !endif
  100.   !ifndef RUBY_INSTALL_NAME
  101. ! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
  102.   !endif
  103.   !endif # $(RUBY_VER) >= 18
  104.   
  105.   !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)"
  106.   CFLAGS = $(CFLAGS) -DFEAT_RUBY
  107.   RUBY_OBJ = $(OUTDIR)\if_ruby.obj
  108. ! !if $(RUBY_VER) >= 190
  109. ! RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)"
  110.   !else
  111.   RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)"
  112.   !endif
  113. --- 813,843 ----
  114.   !ifndef RUBY_VER_LONG
  115.   RUBY_VER_LONG = 1.8
  116.   !endif
  117. + !ifndef RUBY_API_VER
  118. + RUBY_API_VER = $(RUBY_VER_LONG:.=)
  119. + !endif
  120.   
  121.   !if $(RUBY_VER) >= 18
  122.   !ifndef RUBY_PLATFORM
  123.   RUBY_PLATFORM = i386-mswin32
  124.   !endif
  125.   !ifndef RUBY_INSTALL_NAME
  126. ! RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
  127.   !endif
  128.   !else
  129.   !ifndef RUBY_PLATFORM
  130.   RUBY_PLATFORM = i586-mswin32
  131.   !endif
  132.   !ifndef RUBY_INSTALL_NAME
  133. ! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
  134.   !endif
  135.   !endif # $(RUBY_VER) >= 18
  136.   
  137.   !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)"
  138.   CFLAGS = $(CFLAGS) -DFEAT_RUBY
  139.   RUBY_OBJ = $(OUTDIR)\if_ruby.obj
  140. ! !if $(RUBY_VER) >= 19
  141. ! 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)"
  142.   !else
  143.   RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)"
  144.   !endif
  145. *** ../vim-7.3.619/src/version.c    2012-08-02 12:31:40.000000000 +0200
  146. --- src/version.c    2012-08-02 21:20:28.000000000 +0200
  147. ***************
  148. *** 716,717 ****
  149. --- 716,719 ----
  150.   {   /* Add new patch number below this line */
  151. + /**/
  152. +     620,
  153.   /**/
  154.  
  155. -- 
  156. hundred-and-one symptoms of being an internet addict:
  157. 199. You read this entire list of symptoms, looking for something
  158.      that doesn't describe you.
  159.  
  160.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  161. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  162. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  163.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  164.