nagachika	2016-03-29 02:46:51 +0900 (Tue, 29 Mar 2016)

  New Revision: 54342

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54342

  Log:
    merge revision(s) 49154: [Backport #10384]
    
    ext/-test-/dln/empty: move from ext/-test-/win32/dln

  Added directories:
    branches/ruby_2_2/ext/-test-/dln/
  Removed files:
    branches/ruby_2_2/ext/-test-/win32/dln/empty/empty.c
    branches/ruby_2_2/ext/-test-/win32/dln/empty/extconf.rb
  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/-ext-/win32/test_dln.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/test/-ext-/win32/test_dln.rb
===================================================================
--- ruby_2_2/test/-ext-/win32/test_dln.rb	(revision 54341)
+++ ruby_2_2/test/-ext-/win32/test_dln.rb	(revision 54342)
@@ -12,7 +12,7 @@ module Bug https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/-ext-/win32/test_dln.rb#L12
 
       def test_nonascii_load
         bug9699 = '[ruby-core:61845] [Bug #9699]'
-        so = "-test-/win32/dln/empty." + RbConfig::CONFIG["DLEXT"]
+        so = "-test-/dln/empty." + RbConfig::CONFIG["DLEXT"]
         so = $:.find {|d| d = ::File.join(d, so); break d if ::File.exist?(d)}
         assert_not_nil(so)
         Dir.mkdir(dir = ::File.join(testdir = Dir.mktmpdir("test"), "\u{30c6 30b9 30c8}"))
Index: ruby_2_2/ext/-test-/win32/dln/empty/empty.c
===================================================================
--- ruby_2_2/ext/-test-/win32/dln/empty/empty.c	(revision 54341)
+++ ruby_2_2/ext/-test-/win32/dln/empty/empty.c	(revision 54342)
@@ -1,4 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/win32/dln/empty/empty.c#L0
-void
-Init_empty(void)
-{
-}
Index: ruby_2_2/ext/-test-/win32/dln/empty/extconf.rb
===================================================================
--- ruby_2_2/ext/-test-/win32/dln/empty/extconf.rb	(revision 54341)
+++ ruby_2_2/ext/-test-/win32/dln/empty/extconf.rb	(revision 54342)
@@ -1,3 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/win32/dln/empty/extconf.rb#L0
-if $mingw or $mswin
-  create_makefile("-test-/win32/dln/empty")
-end
Index: ruby_2_2/ext/-test-/dln/empty/empty.c
===================================================================
--- ruby_2_2/ext/-test-/dln/empty/empty.c	(revision 0)
+++ ruby_2_2/ext/-test-/dln/empty/empty.c	(revision 54342)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/dln/empty/empty.c#L1
+void
+Init_empty(void)
+{
+}

Property changes on: ruby_2_2/ext/-test-/dln/empty/empty.c
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ruby_2_2/ext/-test-/dln/empty/extconf.rb
===================================================================
--- ruby_2_2/ext/-test-/dln/empty/extconf.rb	(revision 0)
+++ ruby_2_2/ext/-test-/dln/empty/extconf.rb	(revision 54342)
@@ -0,0 +1 @@
+create_makefile("-test-/dln/empty")

Property changes on: ruby_2_2/ext/-test-/dln/empty/extconf.rb
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54341)
+++ ruby_2_2/version.h	(revision 54342)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 284
+#define RUBY_PATCHLEVEL 285
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49154


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/