[前][次][番号順一覧][スレッド一覧]

ruby-changes:46560

From: nobu <ko1@a...>
Date: Fri, 12 May 2017 17:10:42 +0900 (JST)
Subject: [ruby-changes:46560] nobu:r58675 (trunk): remove code old versions

nobu	2017-05-12 17:10:36 +0900 (Fri, 12 May 2017)

  New Revision: 58675

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

  Log:
    remove code old versions
    
    * spec/rubyspec/optional/capi/spec_helper.rb (compile_extension):
      remove code old versions.  `RbConfig::CONFIG["rubyhdrdir"]` is
      since 1.9, and `RbConfig::CONFIG["rubyarchhdrdir"]` is since
      2.0.0.

  Modified files:
    trunk/spec/rubyspec/optional/capi/spec_helper.rb
Index: spec/rubyspec/optional/capi/spec_helper.rb
===================================================================
--- spec/rubyspec/optional/capi/spec_helper.rb	(revision 58674)
+++ spec/rubyspec/optional/capi/spec_helper.rb	(revision 58675)
@@ -29,12 +29,8 @@ def compile_extension(name) https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/optional/capi/spec_helper.rb#L29
   if RUBY_NAME == 'rbx'
     hdrdir = RbConfig::CONFIG["rubyhdrdir"]
   elsif RUBY_NAME =~ /^ruby/
-    if hdrdir = RbConfig::CONFIG["rubyhdrdir"]
-      arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"] ||
-                    File.join(hdrdir, RbConfig::CONFIG["arch"])
-    else
-      hdrdir = RbConfig::CONFIG["archdir"]
-    end
+    hdrdir = RbConfig::CONFIG["rubyhdrdir"]
+    arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
   elsif RUBY_NAME == 'jruby'
     require 'mkmf'
     hdrdir = $hdrdir

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

[前][次][番号順一覧][スレッド一覧]