From eb2e931f6f44c7f3c0701ba38ba8bdd9e3a3b40b Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 19 Dec 2018 00:26:31 +0000
Subject: add option to deal with Unicode beta data files

Unicode uses file names with explicit versions for beta publication.
This commit introduces a variable on the makefile level to distinguish
between beta and regular versions of file names.

common.mk: Define new variable UNICODE_BETA, usually set to NO,
but would be YES during tests with beta data files. Pass the value
of this variable to tool/downloader.rb with option --unicode-beta.

tool/downloader.rb: Receive and store value of --unicode-beta.
Raise an exception if value is YES, because we don't yet actually
deal with this case. Continue as usual if value is not YES.

This completes the changes needed in the makefile. Upcomming changes
will only affect tool/downloader.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk          | 3 +++
 tool/downloader.rb | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/common.mk b/common.mk
index e579ec3772..4bcd0037d3 100644
--- a/common.mk
+++ b/common.mk
@@ -17,6 +17,7 @@ enable_shared = $(ENABLE_SHARED:no=)
 
 UNICODE_VERSION = 11.0.0
 UNICODE_EMOJI_VERSION = 11.0
+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',...).
@@ -1318,12 +1319,14 @@ CACHE_DIR = $(srcdir)/.downloaded-cache
 UNICODE_DOWNLOAD = \
 	$(BASERUBY) $(srcdir)/tool/downloader.rb \
 	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
 	    -d $(UNICODE_SRC_DATA_DIR) \
 	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
 UNICODE_EMOJI_DOWNLOAD = \
 	$(BASERUBY) $(srcdir)/tool/downloader.rb \
 	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
 	    -d $(UNICODE_SRC_EMOJI_DATA_DIR) \
 	    -p emoji/$(UNICODE_EMOJI_VERSION) \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
diff --git a/tool/downloader.rb b/tool/downloader.rb
index ee6242676d..46f8bea96e 100644
--- a/tool/downloader.rb
+++ b/tool/downloader.rb
@@ -310,6 +310,15 @@ if $0 == __FILE__
     when '--cache-dir'
       options[:cache_dir] = ARGV[1]
       ARGV.shift
+    when '--unicode-beta'
+      options[:unicode_beta] = ARGV[1]
+      ARGV.shift
+      # TODO: Move this code further down
+      if options[:unicode_beta]=='YES'
+        raise "Not yet able to deal with Unicode Data beta versions."
+      else
+        # TODO: deal with the case that we just switched from beta to 'regular'
+      end
     when /\A--cache-dir=(.*)/m
       options[:cache_dir] = $1
     when /\A-/
-- 
cgit v1.2.3