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

Add UNICODE_EMOJI_VERSION to RbConfig [Feature #15341]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-12-07 08:51:26 +00:00
parent 9bb2da28d5
commit a830793914
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common.mk
View File

@ -787,6 +787,7 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
-install_name=$(RUBY_INSTALL_NAME) \ -install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) \ -so_name=$(RUBY_SO_NAME) \
-unicode_version=$(UNICODE_VERSION) \ -unicode_version=$(UNICODE_VERSION) \
-unicode_emoji_version=$(UNICODE_EMOJI_VERSION) \
> rbconfig.tmp > rbconfig.tmp
$(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp $(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp

4
tool/mkconfig.rb
View File

@ -9,6 +9,7 @@
$install_name ||= nil $install_name ||= nil
$so_name ||= nil $so_name ||= nil
$unicode_version ||= nil $unicode_version ||= nil
$unicode_emoji_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"
@ -247,6 +248,9 @@ print(*v_others)
print <<EOS if $unicode_version print <<EOS if $unicode_version
CONFIG["UNICODE_VERSION"] = #{$unicode_version.dump} CONFIG["UNICODE_VERSION"] = #{$unicode_version.dump}
EOS EOS
print <<EOS if $unicode_emoji_version
CONFIG["UNICODE_EMOJI_VERSION"] = #{$unicode_emoji_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