diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-19 02:30:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-19 02:30:17 +0000 |
| commit | 2a788fd083c06b1208953156449af0b118ea060e (patch) | |
| tree | b581a4f0e4b28338f5f96bf0242d8b436ff27897 | |
| parent | 64923ecb2d114b6ac1728c5a1b23de509e8bf654 (diff) | |
| download | ruby-2a788fd083c06b1208953156449af0b118ea060e.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
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | common.mk | 21 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index c0202b9c2a..9901573ee3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -467,10 +467,10 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP) -up:: +update-src:: @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) -after-update:: update-config_files common-srcs +after-update:: common-srcs update-mspec: @$(CHDIR) $(srcdir); \ @@ -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 \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 38d332f726..38933ae9d0 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -454,7 +454,7 @@ scriptbin: $(SCRIPTPROGRAMS) $(SCRIPTPROGRAMS): $(STUBPROGRAM) -up:: +update-src:: @cd "$(srcdir:/=\)" && set LC_TIME=C && $(VCSUP) update-mspec: |