aboutsummaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-30 14:58:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-30 14:58:57 +0000
commit708eed20905096339da6f99ca0e1ed26db88b580 (patch)
tree283dacd4ef1213c1a08fb3a31fb7c2d8513730a4 /common.mk
parent7c1480ecbcee8b6edda4d453eb639f2c2c6635e6 (diff)
downloadruby-708eed20905096339da6f99ca0e1ed26db88b580.tar.gz
common.mk: separate updates
* common.mk (UPDATE_LIBRARIES): separate autogenerated library script from downloaded data files. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/common.mk b/common.mk
index b6f0d4b6a7..2b71c2c281 100644
--- a/common.mk
+++ b/common.mk
@@ -185,7 +185,7 @@ configure-ext: $(EXTS_MK)
build-ext: $(EXTS_MK)
$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
- ENCOBJS="$(ENCOBJS)" ALWAYS_UPDATE_UNICODE=no $(EXTSTATIC)
+ ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
prog: program wprogram
@@ -1101,6 +1101,8 @@ update-gems: PHONY
-e 'Downloader::RubyGems.download(gem)' \
bundled_gems
+UPDATE_LIBRARIES = yes
+
### set the following environment variable or uncomment the line if
### the Unicode data files are updated every minute.
# ALWAYS_UPDATE_UNICODE = yes
@@ -1114,13 +1116,13 @@ $(UNICODE_FILES): ./.unicode-$(UNICODE_VERSION).time
UPDATE_UNICODE_FILES_DEPS = $(ALWAYS_UPDATE_UNICODE:yes=PHONY)
-./.unicode-tables.time: ./.unicode-$(UNICODE_VERSION).time
+$(UPDATE_LIBRARIES:yes=.)/.unicode-tables.time: $(UNICODE_FILES)
./.unicode-$(UNICODE_VERSION).time: $(UPDATE_UNICODE_FILES_DEPS:no=)
$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
-d enc/unicode/data/$(UNICODE_VERSION) \
- -e $($(ALWAYS_UPDATE_UNICODE:yes=-a):no=) unicode \
+ -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
$(UNICODE_VERSION)/ucd/UnicodeData.txt \
$(UNICODE_VERSION)/ucd/CompositionExclusions.txt \
$(UNICODE_VERSION)/ucd/NormalizationTest.txt
@@ -1129,7 +1131,7 @@ UPDATE_UNICODE_FILES_DEPS = $(ALWAYS_UPDATE_UNICODE:yes=PHONY)
$(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time
./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
- $(srcdir)/template/unicode_norm_gen.tmpl $(UNICODE_FILES)
+ $(srcdir)/template/unicode_norm_gen.tmpl
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
-I $(srcdir) \