>> Ruby 1.8.7 from rubyinstaller.org also uses i386-mingw32. Can you
>> confirm this is default value for all 1.8.x versions? If not, I
>> suggest to leave it as it currently is, because there is no way to
>> detect exact ruby version in the makefile.
>
> The installer for ruby 1.8.6 use i386-mswin32
> The installers for ruby 1.8.7 and 1.9.1 use i386-mingw32
> but their binaries use i386-mswin32
Ok, it seems the rule cannot be implemented in Make_ming.mak. Here is
a version which check for existence of
lib\ruby\<long-ver>\i386-mingw32 directory. The patch should be
applied to clean Vim without old patch for Ruby integration.
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
--- ../vim-bak/src/Make_ming.mak Tue Mar 02 18:16:09 2010 +0100
+++ ./src/Make_ming.mak Sat Mar 06 18:28:15 2010 +0300
@@ -212,23 +212,25 @@
RUBY_VER_LONG = 1.6
endif
+ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16)
-ifndef RUBY_PLATFORM
RUBY_PLATFORM = i586-mswin32
-endif
-ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
-endif
+else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
+RUBY_PLATFORM = i386-mingw32
else
-ifndef RUBY_PLATFORM
RUBY_PLATFORM = i386-mswin32
endif
+endif
+
ifndef RUBY_INSTALL_NAME
+ifeq ($(RUBY_VER), 16)
+RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
+else
RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
endif
endif
-RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
+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)
ifeq (no, $(DYNAMIC_RUBY))
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
endif
--- ../vim-bak/src/if_ruby.c Tue Mar 02 18:16:09 2010 +0100
+++ ./src/if_ruby.c Sat Mar 06 18:28:15 2010 +0300
@@ -39,8 +39,8 @@
# define rb_cTrueClass (*dll_rb_cTrueClass)
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
/*
- * On ver 1.8, all Ruby functions are exported with "__declspce(dllimport)"
- * in ruby.h. But it cause trouble for these variables, because it is
+ * On ver 1.8, all Ruby functions are exported with "__declspec(dllimport)"
+ * in ruby.h. But it causes trouble for these variables, because it is
* defined in this file. When defined this RUBY_EXPORT it modified to
* "extern" and be able to avoid this problem.
*/
@@ -53,6 +53,11 @@
# undef _WIN32_WINNT
#endif
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
+/* Ruby 1.9 defines a number of static functions which use rb_num2long and
rb_int2big */
+# define rb_num2long rb_num2long_stub
+# define rb_int2big rb_int2big_stub
+#endif
#include <ruby.h>
#if defined(RUBY_VERSION) && RUBY_VERSION >= 19
# include <ruby/encoding.h>
@@ -159,7 +164,14 @@
#define rb_str_concat dll_rb_str_concat
#define rb_str_new dll_rb_str_new
#define rb_str_new2 dll_rb_str_new2
-#if defined(RUBY_VERSION) && RUBY_VERSION >= 19
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+# define rb_string_value_ptr dll_rb_string_value_ptr
+# define rb_float_new dll_rb_float_new
+# define rb_ary_new dll_rb_ary_new
+# define rb_ary_push dll_rb_ary_push
+#endif
+#if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
+ || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
# define rb_errinfo dll_rb_errinfo
#else
# define ruby_errinfo (*dll_ruby_errinfo)
@@ -226,7 +238,8 @@
static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
static VALUE (*dll_rb_str_new) (const char*, long);
static VALUE (*dll_rb_str_new2) (const char*);
-#if defined(RUBY_VERSION) && RUBY_VERSION >= 19
+#if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
+ || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
static VALUE (*dll_rb_errinfo) (void);
#else
static VALUE *dll_ruby_errinfo;
@@ -235,6 +248,15 @@
static void (*dll_ruby_init_loadpath) (void);
static void (*dll_NtInitialize) (int*, char***);
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
+static VALUE (*dll_rb_float_new) (double);
+static VALUE (*dll_rb_ary_new) (void);
+static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
+#endif
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
+static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
+#endif
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
#endif
@@ -246,6 +268,17 @@
static VALUE (*dll_rb_sprintf) (const char*, ...);
#endif
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
+static SIGNED_VALUE rb_num2long_stub(VALUE x)
+{
+ return dll_rb_num2long(x);
+}
+static VALUE rb_int2big_stub(SIGNED_VALUE x)
+{
+ return dll_rb_int2big(x);
+}
+#endif
+
static HINSTANCE hinstRuby = 0; /* Instance of ruby.dll */
/*
@@ -301,17 +334,33 @@
{"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
{"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
{"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
-#if defined(RUBY_VERSION) && RUBY_VERSION >= 19
+#if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
+ || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
{"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
#else
{"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
#endif
{"ruby_init", (RUBY_PROC*)&dll_ruby_init},
{"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
- {"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
+ {
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
+ "NtInitialize"
+#else
+ "ruby_sysinit"
+#endif
+ , (RUBY_PROC*)&dll_NtInitialize},
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
{"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
#endif
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+ {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
+ {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
+ {"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new},
+ {"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
+#endif
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
+ {"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
+#endif
#if defined(RUBY_VERSION) && RUBY_VERSION >= 19
{"ruby_script", (RUBY_PROC*)&dll_ruby_script},
{"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
@@ -569,7 +618,8 @@
static void error_print(int state)
{
#ifndef DYNAMIC_RUBY
-#if !(defined(RUBY_VERSION) && RUBY_VERSION >= 19)
+#if !(defined(RUBY_VERSION) && RUBY_VERSION >= 19) \
+ && !(defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19)
RUBYEXTERN VALUE ruby_errinfo;
#endif
#endif
@@ -605,7 +655,8 @@
break;
case TAG_RAISE:
case TAG_FATAL:
-#if defined(RUBY_VERSION) && RUBY_VERSION >= 19
+#if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
+ || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
eclass = CLASS_OF(rb_errinfo());
einfo = rb_obj_as_string(rb_errinfo());
#else
