aboutsummaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-19 02:30:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-19 02:30:17 +0000
commite48375c112022fa321786ccd95dd4e718efd78a3 (patch)
treeb581a4f0e4b28338f5f96bf0242d8b436ff27897 /common.mk
parentd4ad4d2db7723a2ea2899fc5c3f1d936029c3f87 (diff)
downloadruby-e48375c112022fa321786ccd95dd4e718efd78a3.tar.gz
common.mk: update-remote
* common.mk (update-remote): update by downloading remote files. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk21
1 files changed, 10 insertions, 11 deletions
diff --git a/common.mk b/common.mk
index 1bd8fe8a09..a6c345edd9 100644
--- a/common.mk
+++ b/common.mk
@@ -963,13 +963,17 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY
dist:
$(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME)
+up:: update-remote
+
up::
-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
up::
-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) after-update
-after-update:: update-unicode update-gems extract-extlibs
+after-update:: extract-extlibs
+
+update-remote:: update-src update-rubyspec update-config_files update-unicode update-gems
update-config_files: PHONY
$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
@@ -995,8 +999,6 @@ extract-gems: PHONY
-e 'Gem.unpack("#{gem}-#{ver}.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
@@ -1005,14 +1007,11 @@ UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CompositionExclusions.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt
-update-unicode: $(UNICODE_FILES) PHONY
+UNICODE_FILES_DEPS = $(srcdir)/.unicode-$(UNICODE_VERSION).time
-UNICODE_FILES_DEPS0 = $(UPDATE_LIBRARIES:yes=download-unicode-data)
-UNICODE_FILES_DEPS = $(UNICODE_FILES_DEPS0:no=)
-$(UNICODE_FILES): $(UNICODE_FILES_DEPS)
+update-unicode: $(srcdir)/.unicode-$(UNICODE_VERSION).time PHONY
-download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
-./.unicode-$(UNICODE_VERSION).time: PHONY
+$(UNICODE_FILES_DEPS):
$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
@@ -1023,9 +1022,9 @@ download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
@exit > $@
$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
- $(UNICODE_FILES_DEPS:download-unicode-data=./.unicode-tables.time)
+ $(srcdir)/.unicode-tables.time
-./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
+$(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
$(UNICODE_FILES) $(UNICODE_FILES_DEPS) \
$(srcdir)/template/unicode_norm_gen.tmpl
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \