archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-27 15:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

* common.mk: Introduce two variables (UNICODE_DATA_DIR and

Browse source 
UNICODE_SRC_DATA_DIR) to eliminate repetitions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-02-04 02:54:02 +00:00
parent b7503d03ca
commit 6ec7e30ce0
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Feb 4 11:53:56 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* common.mk: Introduce two variables (UNICODE_DATA_DIR and
UNICODE_SRC_DATA_DIR) to eliminate repetitions.
Wed Feb 3 12:13:20 2016 NARUSE, Yui <naruse@ruby-lang.org> Wed Feb 3 12:13:20 2016 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (str_new_frozen): if the given string is embeddedable * string.c (str_new_frozen): if the given string is embeddedable

16
common.mk
View file

@ -1014,19 +1014,21 @@ update-bundled_gems: PHONY
### set the following environment variable or uncomment the line if ### set the following environment variable or uncomment the line if
### the Unicode data files should be updated completely on every update ('make up',...). ### the Unicode data files should be updated completely on every update ('make up',...).
# ALWAYS_UPDATE_UNICODE = yes # ALWAYS_UPDATE_UNICODE = yes
UNICODE_DATA_DIR = enc/unicode/data/$(UNICODE_VERSION)
UNICODE_SRC_DATA_DIR = $(srcdir)/$(UNICODE_DATA_DIR)
UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \ UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CompositionExclusions.txt \ $(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt \ $(UNICODE_SRC_DATA_DIR)/NormalizationTest.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CaseFolding.txt $(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
update-unicode: $(UNICODE_FILES) update-unicode: $(UNICODE_FILES)
$(UNICODE_FILES): $(UNICODE_FILES):
$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
-d enc/unicode/data/$(UNICODE_VERSION) \ -d $(UNICODE_DATA_DIR) \
-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)
@ -1041,7 +1043,7 @@ $(srcdir)/.unicode-tables.time: $(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) \
$(srcdir)/template/unicode_norm_gen.tmpl \ $(srcdir)/template/unicode_norm_gen.tmpl \
enc/unicode/data/$(UNICODE_VERSION) lib/unicode_normalize $(UNICODE_DATA_DIR) lib/unicode_normalize
download-extlibs: download-extlibs:
$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext $(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext