naruse	2019-04-14 07:18:20 +0900 (Sun, 14 Apr 2019)

  New Revision: 67529

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67529

  Log:
    merge revision(s) 66720:
    
    separate downloading of Unicode property files and auxiliary files
    
    Separate downloading of Unicode property files in ucd and in ucd/auxiliary.
    This is needed because we need information from separate index.html files
    to discover the exact file names of property files during a beta period.

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/common.mk
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67528)
+++ ruby_2_6/version.h	(revision 67529)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 58
+#define RUBY_PATCHLEVEL 59
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_6/common.mk
===================================================================
--- ruby_2_6/common.mk	(revision 67528)
+++ ruby_2_6/common.mk	(revision 67529)
@@ -1301,6 +1301,9 @@ UNICODE_PROPERTY_FILES =  \ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/common.mk#L1301
 		$(UNICODE_SRC_DATA_DIR)/PropertyAliases.txt \
 		$(UNICODE_SRC_DATA_DIR)/PropertyValueAliases.txt \
 		$(UNICODE_SRC_DATA_DIR)/Scripts.txt \
+		$(empty)
+
+UNICODE_AUXILIARY_FILES =  \
 		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakProperty.txt \
 		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakTest.txt \
 		$(empty)
@@ -1323,6 +1326,13 @@ UNICODE_DOWNLOAD = \ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/common.mk#L1326
 	    -d $(UNICODE_SRC_DATA_DIR) \
 	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+UNICODE_AUXILIARY_DOWNLOAD = \
+	$(BASERUBY) $(srcdir)/tool/downloader.rb \
+	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
+	    -d $(UNICODE_SRC_DATA_DIR)/auxiliary \
+	    -p $(UNICODE_VERSION)/ucd/auxiliary \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
 UNICODE_EMOJI_DOWNLOAD = \
 	$(BASERUBY) $(srcdir)/tool/downloader.rb \
 	    --cache-dir=$(CACHE_DIR) \
@@ -1334,8 +1344,10 @@ UNICODE_EMOJI_DOWNLOAD = \ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/common.mk#L1344
 $(UNICODE_PROPERTY_FILES): update-unicode-property-files
 update-unicode-property-files:
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) property files...
-	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
 	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES)
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
+	$(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $(UNICODE_AUXILIARY_FILES)
 	$(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
 	$(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES)
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67528)
+++ ruby_2_6	(revision 67529)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66720

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