kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Makefile.sub: sitearch

Browse source 
* win32/Makefile.sub (config.status): site and vendor directories
  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-11 04:15:14 +00:00
parent f882c4c5e0
commit 507477af54
3 changed files with 48 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Feb 11 13:15:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (config.status): site and vendor directories
should use sitearch, not arch. [ruby-dev:46964] [Bug #7823]
Mon Feb 11 12:31:25 2013 Tanaka Akira <akr@fsij.org>
* configure.in: move OS specific header/function knowledge before

41
test/test_rbconfig.rb Normal file
View file

@ -0,0 +1,41 @@
require 'test/unit'
require 'rbconfig'
class TestRbConfig < Test::Unit::TestCase
def test_sitedirs
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Asite(?!arch)/ =~ key
assert_match(/(?:\$\(|\/)site/, val, key)
end
end
def test_vendordirs
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Avendor(?!arch)/ =~ key
assert_match(/(?:\$\(|\/)vendor/, val, key)
end
end
def test_archdirs
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\A(?!site|vendor|archdir\z).*arch.*dir\z/ =~ key
assert_match(/\$\(arch|\$\(rubyarchprefix\)/, val, key)
end
end
def test_sitearchdirs
bug7823 = '[ruby-dev:46964] [Bug #7823]'
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Asite.*arch.*dir\z/ =~ key
assert_match(/\$\(sitearch|\$\(rubyarchprefix\)/, val, "#{key} #{bug7823}")
end
end
def test_vendorarchdirs
bug7823 = '[ruby-dev:46964] [Bug #7823]'
RbConfig::MAKEFILE_CONFIG.each do |key, val|
next unless /\Avendor.*arch.*dir\z/ =~ key
assert_match(/\$\(sitearch|\$\(rubyarchprefix\)/, val, "#{key} #{bug7823}")
end
end
end

4
win32/Makefile.sub
View file

@ -852,10 +852,10 @@ s,@rubylibprefix@,$${prefix}/lib/$${RUBY_BASE_NAME},;t t
s,@rubyarchdir@,$${rubylibdir}/$${arch},;t t
s,@rubylibdir@,$${rubylibprefix}/$${ruby_version},;t t
s,@sitedir@,$${rubylibprefix}/site_ruby,;t t
s,@sitearchdir@,$${sitelibdir}/$${arch},;t t
s,@sitearchdir@,$${sitelibdir}/$${sitearch},;t t
s,@sitelibdir@,$${sitedir}/$${ruby_version},;t t
s,@vendordir@,$${rubylibprefix}/vendor_ruby,;t t
s,@vendorarchdir@,$${vendirlibdir}/$${arch},;t t
s,@vendorarchdir@,$${vendirlibdir}/$${sitearch},;t t
s,@vendorlibdir@,$${vendordir}/$${ruby_version},;t t
s,@rubyhdrdir@,$$(includedir)/$${RUBY_BASE_NAME}-$$(ruby_version),;t t
s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t