1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Browse Source
This commit is contained in:
duerst 2016-01-23 09:32:44 +00:00
parent 90f05d9b85
commit 0d3d8a8cda
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jan 23 16:29:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* common.mk: Simplifying Unicode data file download logic to make
it more reliable
Sat Jan 23 16:29:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Sat Jan 23 16:29:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* tool/downloader.rb: Fixed a logical error, improved documentation * tool/downloader.rb: Fixed a logical error, improved documentation

9
common.mk
View File

@ -1005,7 +1005,7 @@ extract-gems: PHONY
bundled_gems bundled_gems
### set the following environment variable or uncomment the line if ### set the following environment variable or uncomment the line if
### the Unicode data files are updated every minute. ### the Unicode data files should be updated completely on every update ('make up',...).
# ALWAYS_UPDATE_UNICODE = yes # ALWAYS_UPDATE_UNICODE = yes
UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \ UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
@ -1013,11 +1013,9 @@ UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt \ $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CaseFolding.txt $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CaseFolding.txt
UNICODE_FILES_DEPS = $(srcdir)/.unicode-$(UNICODE_VERSION).time update-unicode: $(UNICODE_FILES)
update-unicode: $(srcdir)/.unicode-$(UNICODE_VERSION).time PHONY $(UNICODE_FILES):
$(UNICODE_FILES_DEPS):
$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
@ -1025,7 +1023,6 @@ $(UNICODE_FILES_DEPS):
-p $(UNICODE_VERSION)/ucd \ -p $(UNICODE_VERSION)/ucd \
-e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
$(UNICODE_FILES) $(UNICODE_FILES)
@exit > $@
$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \ $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
$(srcdir)/.unicode-tables.time $(srcdir)/.unicode-tables.time