1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unicode Version in RbConfig

Browse Source 
* tool/mkconfig.rb: provide Unicode Version information as
  RbConfig::CONFIG['UNICODE_VERSION'].
  [ruby-core:75845] [Feature #12460]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-06-14 16:44:45 +00:00
parent 06975d613a
commit a7ce662a85
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Jun 15 01:44:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkconfig.rb: provide Unicode Version information as
RbConfig::CONFIG['UNICODE_VERSION'].
[ruby-core:75845] [Feature #12460]
Wed Jun 15 00:01:18 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Wed Jun 15 00:01:18 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/ruby/enc/test_case_comprehensive.rb * test/ruby/enc/test_case_comprehensive.rb

4
common.mk
View File

@ -628,7 +628,9 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
-cross_compiling=$(CROSS_COMPILING) \ -cross_compiling=$(CROSS_COMPILING) \
-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \ -arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
-install_name=$(RUBY_INSTALL_NAME) \ -install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) > rbconfig.tmp -so_name=$(RUBY_SO_NAME) \
-unicode_version=$(UNICODE_VERSION) \
> rbconfig.tmp
$(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp $(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp
test-rubyspec-precheck: test-rubyspec-precheck:

4
tool/mkconfig.rb
View File

@ -9,6 +9,7 @@
$install_name ||= nil $install_name ||= nil
$so_name ||= nil $so_name ||= nil
$cross_compiling ||= nil $cross_compiling ||= nil
$unicode_version ||= nil
arch = $arch or raise "missing -arch" arch = $arch or raise "missing -arch"
version = $version or raise "missing -version" version = $version or raise "missing -version"
@ -235,6 +236,9 @@ end
print(*v_fast) print(*v_fast)
print(*v_others) print(*v_others)
print <<EOS if $unicode_version
CONFIG["UNICODE_VERSION"] = #{$unicode_version.dump}
EOS
print <<EOS if /darwin/ =~ arch print <<EOS if /darwin/ =~ arch
CONFIG["SDKROOT"] = ENV["SDKROOT"] || "" # don't run xcrun everytime, usually useless. CONFIG["SDKROOT"] = ENV["SDKROOT"] || "" # don't run xcrun everytime, usually useless.
EOS EOS