2 Subject: Patch 6.2.173 (extra)
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: Win32: Ruby interface doesn't work with Ruby 1.8.0 for other
13 Solution: Fix the BC5, Cygwin and Mingw makefiles. (Dan Sharp)
14 Files: src/Make_bc5.mak, src/Make_cyg.mak, src/Make_ming.mak
17 *** ../vim-6.2.172/src/Make_bc5.mak Sun Oct 12 16:42:14 2003
18 --- src/Make_bc5.mak Sun Jan 4 12:41:29 2004
22 # TCL_VER define to version of TCL being used (83)
23 # DYNAMIC_TCL no or yes: use yes to load the TCL DLL dynamically (no)
24 # RUBY define to path to Ruby dir to get Ruby support (not defined)
25 + # NOTE: You may have to remove the defines for uid_t and gid_t
26 + # from the Ruby config.h header file.
27 # RUBY_VER define to version of Ruby being used (16)
28 # NOTE: compilation on WinNT/2K/XP requires
29 # at least version 1.6.5 of Ruby. Earlier versions
36 RUBY_PLATFORM = i586-mswin32
38 INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_RUBY
39 INCLUDE = $(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM);$(INCLUDE)
40 - RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
42 !if "$(DYNAMIC_RUBY)" == "yes"
43 INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
44 RUBY_LIB_FLAG = /nodefaultlib:
52 + !if "$(RUBY_VER)" == "16"
54 RUBY_PLATFORM = i586-mswin32
56 + !ifndef RUBY_INSTALL_NAME
57 + RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
60 + !ifndef RUBY_PLATFORM
61 + RUBY_PLATFORM = i386-mswin32
63 + !ifndef RUBY_INSTALL_NAME
64 + RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
68 INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_RUBY
69 INCLUDE = $(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM);$(INCLUDE)
71 !if "$(DYNAMIC_RUBY)" == "yes"
72 INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
73 + INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_RUBY_VER=$(RUBY_VER)
74 RUBY_LIB_FLAG = /nodefaultlib:
77 *** ../vim-6.2.172/src/Make_cyg.mak Sun Oct 12 16:42:14 2003
78 --- src/Make_cyg.mak Sun Jan 4 12:37:06 2004
82 # Makefile for VIM on Win32, using Cygnus gcc
84 # This compiles Vim as a Windows application. If you want Vim to run as a
85 # Cygwin application use the Makefile (just like on Unix).
87 - # Last updated by Dan Sharp. Last Change: 2003 Sep 12
89 # GUI no or yes: set to yes if you want the GUI version (yes)
90 # PERL define to path to Perl dir to get Perl support (not defined)
91 # PERL_VER define to version of Perl being used (56)
94 # Makefile for VIM on Win32, using Cygnus gcc
95 + # Last updated by Dan Sharp. Last Change: 2004 Jan 03
97 # This compiles Vim as a Windows application. If you want Vim to run as a
98 # Cygwin application use the Makefile (just like on Unix).
100 # GUI no or yes: set to yes if you want the GUI version (yes)
101 # PERL define to path to Perl dir to get Perl support (not defined)
102 # PERL_VER define to version of Perl being used (56)
105 # DYNAMIC_RUBY=no does not (process exits).
106 ##############################
111 - DEFINES += -DFEAT_RUBY
112 - INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i586-mswin32
113 - EXTRA_OBJS += $(OUTDIR)/if_ruby.o
123 ifeq (yes, $(DYNAMIC_RUBY))
124 ! DEFINES += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"mswin32-ruby$(RUBY_VER).dll\"
126 ! EXTRA_LIBS += $(RUBY)/lib/mswin32-ruby$(RUBY_VER).lib
131 # DYNAMIC_RUBY=no does not (process exits).
132 ##############################
147 ! ifeq ($(RUBY_VER), 16)
148 ! ifndef RUBY_PLATFORM
149 ! RUBY_PLATFORM = i586-mswin32
151 ! ifndef RUBY_INSTALL_NAME
152 ! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
155 ! ifndef RUBY_PLATFORM
156 ! RUBY_PLATFORM = i386-mswin32
158 ! ifndef RUBY_INSTALL_NAME
159 ! RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
163 + DEFINES += -DFEAT_RUBY
164 + INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
165 + EXTRA_OBJS += $(OUTDIR)/if_ruby.o
167 ifeq (yes, $(DYNAMIC_RUBY))
168 ! DEFINES += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
169 ! DEFINES += -DDYNAMIC_RUBY_VER=$(RUBY_VER)
171 ! EXTRA_LIBS += $(RUBY)/lib/$(RUBY_INSTALL_NAME).lib
180 $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
181 + ifeq (16, $(RUBY_VER))
182 $(CC) -c $(CFLAGS) -U_WIN32 if_ruby.c -o $(OUTDIR)/if_ruby.o
185 $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_DEP)
186 $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
187 *** ../vim-6.2.172/src/Make_ming.mak Sun Oct 12 16:42:14 2003
188 --- src/Make_ming.mak Sun Jan 4 12:37:06 2004
196 + ifeq ($(RUBY_VER), 16)
198 RUBY_PLATFORM = i586-mswin32
200 + ifndef RUBY_INSTALL_NAME
201 RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
204 + ifndef RUBY_PLATFORM
205 + RUBY_PLATFORM = i386-mswin32
207 + ifndef RUBY_INSTALL_NAME
208 + RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
212 RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
213 ifeq (no, $(DYNAMIC_RUBY))
217 CFLAGS += -DFEAT_RUBY $(RUBYINC)
218 ifeq (yes, $(DYNAMIC_RUBY))
219 CFLAGS += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
220 + CFLAGS += -DDYNAMIC_RUBY_VER=$(RUBY_VER)
227 $(CC) $(CFLAGS) -D__IID_DEFINED__ -c -o $(OUTDIR)/if_ole.o if_ole.cpp
229 $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
231 $(CC) $(CFLAGS) -U_WIN32 -c -o $(OUTDIR)/if_ruby.o if_ruby.c
234 if_perl.c: if_perl.xs typemap
235 perl $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
236 *** ../vim-6.2.172/src/version.c Tue Jan 6 16:27:05 2004
237 --- src/version.c Tue Jan 6 16:32:04 2004
241 { /* Add new patch number below this line */
247 hundred-and-one symptoms of being an internet addict:
248 150. You find yourself counting emoticons to get to sleep.
250 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
251 /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
252 \\\ Project leader for A-A-P -- http://www.A-A-P.org ///
253 \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///