ruby-changes:41510
From: nobu <ko1@a...>
Date: Tue, 19 Jan 2016 11:29:41 +0900 (JST)
Subject: [ruby-changes:41510] nobu:r53584 (trunk): common.mk: update-remote
nobu 2016-01-19 11:30:17 +0900 (Tue, 19 Jan 2016) New Revision: 53584 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53584 Log: common.mk: update-remote * common.mk (update-remote): update by downloading remote files. Modified files: trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Index: common.mk =================================================================== --- common.mk (revision 53583) +++ common.mk (revision 53584) @@ -963,13 +963,17 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L963 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 https://github.com/ruby/ruby/blob/trunk/common.mk#L999 -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/da https://github.com/ruby/ruby/blob/trunk/common.mk#L1007 $(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-$(UNIC https://github.com/ruby/ruby/blob/trunk/common.mk#L1022 @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 \ Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 53583) +++ win32/Makefile.sub (revision 53584) @@ -454,7 +454,7 @@ scriptbin: $(SCRIPTPROGRAMS) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L454 $(SCRIPTPROGRAMS): $(STUBPROGRAM) -up:: +update-src:: @cd "$(srcdir:/=\)" && set LC_TIME=C && $(VCSUP) update-mspec: Index: Makefile.in =================================================================== --- Makefile.in (revision 53583) +++ Makefile.in (revision 53584) @@ -467,10 +467,10 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(S https://github.com/ruby/ruby/blob/trunk/Makefile.in#L467 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); \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/