7.2.388

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.388 (extra)
   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.2.388 (extra part of 7.2.387)
  11 Problem:    Ruby with MingW still doesn't build all versions.
  12 Solution:   Different approach to build file. (Sergey Khorev)
  13 Files:      src/Make_ming.mak
  14
  15
  16 *** ../vim-7.2.387/src/Make_ming.mak    2010-02-26 22:05:17.000000000 +0100
  17 --- src/Make_ming.mak   2010-03-10 12:34:25.000000000 +0100
  18 ***************
  19 *** 212,234 ****
  20   RUBY_VER_LONG = 1.6
  21   endif
  22
  23 - ifeq ($(RUBY_VER), 16)
  24   ifndef RUBY_PLATFORM
  25   RUBY_PLATFORM = i586-mswin32
  26 ! endif
  27 ! ifndef RUBY_INSTALL_NAME
  28 ! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
  29 ! endif
  30   else
  31 - ifndef RUBY_PLATFORM
  32   RUBY_PLATFORM = i386-mswin32
  33   endif
  34   ifndef RUBY_INSTALL_NAME
  35   RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
  36   endif
  37   endif
  38
  39 ! RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
  40   ifeq (no, $(DYNAMIC_RUBY))
  41   RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
  42   endif
  43 --- 212,236 ----
  44   RUBY_VER_LONG = 1.6
  45   endif
  46
  47   ifndef RUBY_PLATFORM
  48 + ifeq ($(RUBY_VER), 16)
  49   RUBY_PLATFORM = i586-mswin32
  50 ! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
  51 ! RUBY_PLATFORM = i386-mingw32
  52   else
  53   RUBY_PLATFORM = i386-mswin32
  54   endif
  55 + endif
  56 +
  57   ifndef RUBY_INSTALL_NAME
  58 + ifeq ($(RUBY_VER), 16)
  59 + RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
  60 + else
  61   RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
  62   endif
  63   endif
  64
  65 ! RUBYINC =-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)
  66   ifeq (no, $(DYNAMIC_RUBY))
  67   RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
  68   endif
  69 *** ../vim-7.2.387/src/version.c        2010-03-10 12:46:38.000000000 +0100
  70 --- src/version.c       2010-03-10 13:18:38.000000000 +0100
  71 ***************
  72 *** 683,684 ****
  73 --- 683,686 ----
  74   {   /* Add new patch number below this line */
  75 + /**/
  76 +     388,
  77   /**/
  78
  79 --
  80 Q: Is selling software the same as selling hardware?
  81 A: No, good hardware is sold new, good software has already been used by many.
  82
  83  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  84 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  85 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  86  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///