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

ruby-changes:55817

From: Martin <ko1@a...>
Date: Fri, 24 May 2019 18:24:18 +0900 (JST)
Subject: [ruby-changes:55817] Martin Drst: c06f9e1d24 (trunk): switch UNICODE_BETA to NO (one more try, first try didn't work)

https://git.ruby-lang.org/ruby.git/commit/?id=c06f9e1d24

From c06f9e1d24e0e164506c6b5946a02814319485cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20D=C3=BCrst?= <duerst@i...>
Date: Fri, 24 May 2019 18:22:36 +0900
Subject: switch UNICODE_BETA to NO (one more try, first try didn't work)

    Unicode version 12.1.0 was officially released on May 7th, 2019.
    There were no changes at all from the "real" beta
    published shortly after the new era name "Reiwa" was announced.
    So we can switch UNICODE_BETA back to NO.

    common.mk: switch UNICODE_BETA back to NO
    tool/downloader.rb: add additional conditions to avoid an error
                        when moving from beta to final

diff --git a/common.mk b/common.mk
index b4be421..54e1718 100755
--- a/common.mk
+++ b/common.mk
@@ -19,7 +19,7 @@ enable_shared = $(ENABLE_SHARED:no=) https://github.com/ruby/ruby/blob/trunk/common.mk#L19
 
 UNICODE_VERSION = 12.1.0
 UNICODE_EMOJI_VERSION = 12.0
-UNICODE_BETA = YES
+UNICODE_BETA = NO
 
 ### set the following environment variable or uncomment the line if
 ### the Unicode data files should be updated completely on every update ('make up',...).
diff --git a/tool/downloader.rb b/tool/downloader.rb
index 77eab26..cb36150 100644
--- a/tool/downloader.rb
+++ b/tool/downloader.rb
@@ -94,7 +94,7 @@ class Downloader https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L94
         super(UNICODE_PUBLIC+name_dir_part+beta_name, name, dir, since, options)
       else
         index_file = Pathname.new(under(dir, name_dir_part+'index.html'))
-        if index_file.exist?
+        if index_file.exist? and name_dir_part !~ /^(12.1.0|emoji\/12.0)/
           raise "Although Unicode is not in beta, file #{index_file} exists. " +
                 "Remove all files in this directory and in .downloaded-cache/ " +
                 "because they may be leftovers from the beta period."
-- 
cgit v0.10.2


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

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