ruby-changes:19775
From: yugui <ko1@a...>
Date: Mon, 30 May 2011 13:45:22 +0900 (JST)
Subject: [ruby-changes:19775] yugui:r31820 (ruby_1_9_2): merges r31371 from trunk into ruby_1_9_2.
yugui 2011-05-30 13:45:09 +0900 (Mon, 30 May 2011) New Revision: 31820 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31820 Log: merges r31371 from trunk into ruby_1_9_2. -- * test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on mswin/mingw. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/test/dl/test_base.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 31819) +++ ruby_1_9_2/ChangeLog (revision 31820) @@ -1,3 +1,8 @@ +Thu Apr 28 15:32:53 2011 NAKAMURA Usaku <usa@r...> + + * test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on + mswin/mingw. + Wed Apr 27 07:42:44 2011 Nobuyoshi Nakada <nobu@r...> * configure.in (STRIP): use proper toolchain. based on a patch Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 31819) +++ ruby_1_9_2/version.h (revision 31820) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 244 +#define RUBY_PATCHLEVEL 245 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_2/test/dl/test_base.rb =================================================================== --- ruby_1_9_2/test/dl/test_base.rb (revision 31819) +++ ruby_1_9_2/test/dl/test_base.rb (revision 31820) @@ -25,7 +25,7 @@ libm_so = File.join(libdir, "libm.so.6") when /mingw/, /mswin/ require "rbconfig" - libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/, 2)[0] + ".dll" + libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/).find{|e| /^msvc/ =~ e} + ".dll" when /darwin/ libc_so = "/usr/lib/libc.dylib" libm_so = "/usr/lib/libm.dylib" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/