|
 |
bd03dfb |
To: vim-dev@vim.org
|
|
|
bd03dfb |
Subject: Patch 7.2.388 (extra)
|
|
|
bd03dfb |
Fcc: outbox
|
|
|
bd03dfb |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
bd03dfb |
Mime-Version: 1.0
|
|
|
bd03dfb |
Content-Type: text/plain; charset=UTF-8
|
|
|
bd03dfb |
Content-Transfer-Encoding: 8bit
|
|
|
bd03dfb |
------------
|
|
|
bd03dfb |
|
|
|
bd03dfb |
Patch 7.2.388 (extra part of 7.2.387)
|
|
|
bd03dfb |
Problem: Ruby with MingW still doesn't build all versions.
|
|
|
bd03dfb |
Solution: Different approach to build file. (Sergey Khorev)
|
|
|
bd03dfb |
Files: src/Make_ming.mak
|
|
|
bd03dfb |
|
|
|
bd03dfb |
|
|
|
bd03dfb |
*** ../vim-7.2.387/src/Make_ming.mak 2010-02-26 22:05:17.000000000 +0100
|
|
|
bd03dfb |
--- src/Make_ming.mak 2010-03-10 12:34:25.000000000 +0100
|
|
|
bd03dfb |
***************
|
|
|
bd03dfb |
*** 212,234 ****
|
|
|
bd03dfb |
RUBY_VER_LONG = 1.6
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
|
|
|
bd03dfb |
- ifeq ($(RUBY_VER), 16)
|
|
|
bd03dfb |
ifndef RUBY_PLATFORM
|
|
|
bd03dfb |
RUBY_PLATFORM = i586-mswin32
|
|
|
bd03dfb |
! endif
|
|
|
bd03dfb |
! ifndef RUBY_INSTALL_NAME
|
|
|
bd03dfb |
! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
|
|
|
bd03dfb |
! endif
|
|
|
bd03dfb |
else
|
|
|
bd03dfb |
- ifndef RUBY_PLATFORM
|
|
|
bd03dfb |
RUBY_PLATFORM = i386-mswin32
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
ifndef RUBY_INSTALL_NAME
|
|
|
bd03dfb |
RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
|
|
|
bd03dfb |
! RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
|
|
|
bd03dfb |
ifeq (no, $(DYNAMIC_RUBY))
|
|
|
bd03dfb |
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
--- 212,236 ----
|
|
|
bd03dfb |
RUBY_VER_LONG = 1.6
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
|
|
|
bd03dfb |
ifndef RUBY_PLATFORM
|
|
|
bd03dfb |
+ ifeq ($(RUBY_VER), 16)
|
|
|
bd03dfb |
RUBY_PLATFORM = i586-mswin32
|
|
|
bd03dfb |
! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
|
|
|
bd03dfb |
! RUBY_PLATFORM = i386-mingw32
|
|
|
bd03dfb |
else
|
|
|
bd03dfb |
RUBY_PLATFORM = i386-mswin32
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
+ endif
|
|
|
bd03dfb |
+
|
|
|
bd03dfb |
ifndef RUBY_INSTALL_NAME
|
|
|
bd03dfb |
+ ifeq ($(RUBY_VER), 16)
|
|
|
bd03dfb |
+ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
|
|
|
bd03dfb |
+ else
|
|
|
bd03dfb |
RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
|
|
|
bd03dfb |
! 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)
|
|
|
bd03dfb |
ifeq (no, $(DYNAMIC_RUBY))
|
|
|
bd03dfb |
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
|
|
|
bd03dfb |
endif
|
|
|
bd03dfb |
*** ../vim-7.2.387/src/version.c 2010-03-10 12:46:38.000000000 +0100
|
|
|
bd03dfb |
--- src/version.c 2010-03-10 13:18:38.000000000 +0100
|
|
|
bd03dfb |
***************
|
|
|
bd03dfb |
*** 683,684 ****
|
|
|
bd03dfb |
--- 683,686 ----
|
|
|
bd03dfb |
{ /* Add new patch number below this line */
|
|
|
bd03dfb |
+ /**/
|
|
|
bd03dfb |
+ 388,
|
|
|
bd03dfb |
/**/
|
|
|
bd03dfb |
|
|
|
bd03dfb |
--
|
|
|
bd03dfb |
Q: Is selling software the same as selling hardware?
|
|
|
bd03dfb |
A: No, good hardware is sold new, good software has already been used by many.
|
|
|
bd03dfb |
|
|
|
bd03dfb |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
bd03dfb |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
bd03dfb |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
bd03dfb |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|