1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
nobu 2017-03-23 23:55:29 +00:00
parent e1e5857c08
commit 96069e9573
3 changed files with 9 additions and 4 deletions

View file

@ -43,6 +43,7 @@ before_script:
- "make reconfig" - "make reconfig"
- "cp -pr config.status .ext/include config_2nd" - "cp -pr config.status .ext/include config_2nd"
- "diff -ru config_1st config_2nd" - "diff -ru config_1st config_2nd"
- "make -t .unicode-tables.time"
- "make after-update BASERUBY=ruby" - "make after-update BASERUBY=ruby"
- "make -s $JOBS" - "make -s $JOBS"
- "make update-rubyspec" - "make update-rubyspec"

View file

@ -26,7 +26,6 @@ install:
- mkdir \usr\local\lib - mkdir \usr\local\lib
- set UNICODE_DATA_DIR=enc\unicode\data\%UNICODE_VERSION%\ - set UNICODE_DATA_DIR=enc\unicode\data\%UNICODE_VERSION%\
- mkdir %UNICODE_DATA_DIR% - 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 - 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 - 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 - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
@ -35,6 +34,7 @@ build_script:
- mkdir %Platform%-mswin_%vs% - mkdir %Platform%-mswin_%vs%
- cd %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:\=/% - ..\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 up
- nmake -l - nmake -l
- nmake install-nodoc - nmake install-nodoc

View file

@ -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: check test test-all btest btest-ruby test-basic test-knownbug
.PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby .PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
.PHONY: update-mspec update-rubyspec test-rubyspec .PHONY: update-mspec update-rubyspec test-rubyspec
.PHONY: .unicode-tables.time
PHONY: PHONY:
@ -1151,11 +1152,14 @@ $(UNICODE_FILES):
$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \ $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(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 \ $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
$(srcdir)/template/unicode_norm_gen.tmpl $(srcdir)/template/unicode_norm_gen.tmpl \
$(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(mflags) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode $(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
-I $(srcdir) \ -I $(srcdir) \