diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-23 23:55:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-23 23:55:29 +0000 |
| commit | 1d96dbfdfefc3d150c2ad3cbb35ce21f86cfcc34 (patch) | |
| tree | 364b64ca253bf7e33fcfc7c2f27477aa7404e529 | |
| parent | 765946b82ba73808155bead607959f471a955e6a (diff) | |
| download | ruby-1d96dbfdfefc3d150c2ad3cbb35ce21f86cfcc34.tar.gz | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | common.mk | 10 |
3 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 24837a4bd6..65102bd4e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ before_script: - "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" diff --git a/appveyor.yml b/appveyor.yml index cd61fb3ca0..5bd7246bb9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,6 @@ install: - 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: - 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 @@ -744,6 +744,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc .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): $(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) \ |