nobu	2017-03-24 08:55:29 +0900 (Fri, 24 Mar 2017)

  New Revision: 58071

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

  Log:
    Don't download from Unicode.org
    
    * .travis.yml, appveyor.yml: use checked out headers for Unicode,
      to get rid of downloading data files from Unicode.org.

  Modified files:
    trunk/.travis.yml
    trunk/appveyor.yml
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 58070)
+++ common.mk	(revision 58071)
@@ -744,6 +744,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb https://github.com/ruby/ruby/blob/trunk/common.mk#L744
 .PHONY: check test test-all btest btest-ruby test-basic test-knownbug
 .PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
 .PHONY: update-mspec update-rubyspec test-rubyspec
+.PHONY: .unicode-tables.time
 
 PHONY:
 
@@ -1151,11 +1152,14 @@ $(UNICODE_FILES): https://github.com/ruby/ruby/blob/trunk/common.mk#L1152
 $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
 	$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
 
-$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): $(UNICODE_FILES)
+$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): \
+	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+
+.unicode-tables.time: $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
 
 $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
-		$(srcdir)/template/unicode_norm_gen.tmpl
-	$(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(mflags) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode
+		$(srcdir)/template/unicode_norm_gen.tmpl \
+		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
 		-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
 		-I $(srcdir) \
Index: appveyor.yml
===================================================================
--- appveyor.yml	(revision 58070)
+++ appveyor.yml	(revision 58071)
@@ -26,7 +26,6 @@ install: https://github.com/ruby/ruby/blob/trunk/appveyor.yml#L26
   - mkdir \usr\local\lib
   - set UNICODE_DATA_DIR=enc\unicode\data\%UNICODE_VERSION%\
   - mkdir %UNICODE_DATA_DIR%
-  - for %%I in (UnicodeData CompositionExclusions NormalizationTest CaseFolding SpecialCasing) do appveyor DownloadFile %UNICODE_URL_BASE%%%I.txt -FileName %UNICODE_DATA_DIR%%%I.txt || exit /b 1
   - appveyor DownloadFile https://downloads.sourceforge.net/project/libpng/zlib/%zlib_version%/zlib%zlib_version:.=%.zip
   - 7z x -o%APPVEYOR_BUILD_FOLDER%\ext\zlib zlib%zlib_version:.=%.zip
   - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
@@ -35,6 +34,7 @@ build_script: https://github.com/ruby/ruby/blob/trunk/appveyor.yml#L34
   - mkdir %Platform%-mswin_%vs%
   - cd %Platform%-mswin_%vs%
   - ..\win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --with-openssl-dir=%OPENSSL_DIR:\=/%
+  - nmake -t .unicode-tables.time
   - nmake -l up
   - nmake -l
   - nmake install-nodoc
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 58070)
+++ .travis.yml	(revision 58071)
@@ -43,6 +43,7 @@ before_script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L43
   - "make reconfig"
   - "cp -pr config.status .ext/include config_2nd"
   - "diff -ru config_1st config_2nd"
+  - "make -t .unicode-tables.time"
   - "make after-update BASERUBY=ruby"
   - "make -s $JOBS"
   - "make update-rubyspec"

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