From 36bb50e06cee5ea5ed56a924ed08397dbe97473c Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 30 Mar 2017 06:44:27 +0000 Subject: tool/git-refresh * tool/git-refresh: tool to clone or update git working directory. * Makefile.in: use git-refresh. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 70 ++++++++++++------------------------------------------------- 1 file changed, 13 insertions(+), 57 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 07f93ca150..c1ae34e2d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -473,76 +473,32 @@ update-download:: update-config_files after-update:: common-srcs update-mspec: - @$(CHDIR) $(srcdir); \ - if [ -d spec/mspec ]; then \ - echo updating mspec ...; \ - $(Q1:0=:) set -x; \ - cd spec/mspec && \ - exec git pull; \ - else \ - echo retrieving mspec ...; \ - $(Q1:0=:) set -x; \ - exec git clone $(MSPEC_GIT_URL) spec/mspec; \ - fi + $(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/spec $(Q1:0=-q) \ + $(MSPEC_GIT_URL) mspec $(GIT_OPTS) $(Q)$(CHDIR) $(srcdir)/spec/mspec && exec git --no-pager log -1 --oneline update-rubyspec: update-mspec - @$(CHDIR) $(srcdir); \ - if [ -d spec/rubyspec ]; then \ - echo updating rubyspec ...; \ - $(Q1:0=:) set -x; \ - cd spec/rubyspec && \ - exec git pull; \ - else \ - echo retrieving rubyspec ...; \ - $(Q1:0=:) set -x; \ - exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \ - fi + $(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/spec $(Q1:0=-q) \ + $(RUBYSPEC_GIT_URL) rubyspec $(GIT_OPTS) $(Q)$(CHDIR) $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline test-rubyspec-precheck: @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi update-doclie: - @$(CHDIR) $(srcdir); \ - if [ -d coverage/doclie ]; then \ - echo updating doclie ...; \ - $(Q1:0=:) set -x; \ - cd coverage/doclie && \ - git fetch && \ - exec git checkout $(DOCLIE_GIT_REF); \ - else \ - echo retrieving doclie ...; \ - $(Q1:0=:) set -x; \ - exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \ - fi + $(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \ + --branch $(DOCLIE_GIT_REF) \ + $(DOCLIE_GIT_URL) doclie $(GIT_OPTS) update-simplecov-html: - @$(CHDIR) $(srcdir); \ - if [ -d coverage/simplecov-html ]; then \ - echo updating simplecov-html ...; \ - $(Q1:0=:) set -x; \ - cd coverage/simplecov-html && \ - git fetch && \ - exec git checkout $(SIMPLECOV_HTML_GIT_REF); \ - else \ - echo retrieving simplecov-html ...; \ - exec git clone --branch $(SIMPLECOV_HTML_GIT_REF) $(SIMPLECOV_HTML_GIT_URL) coverage/simplecov-html; \ - fi + $(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \ + --branch $(SIMPLECOV_HTML_GIT_REF) \ + $(SIMPLECOV_HTML_GIT_URL) simplecov-html $(GIT_OPTS) update-simplecov: - @$(CHDIR) $(srcdir); \ - if [ -d coverage/simplecov ]; then \ - echo updating simplecov ...; \ - $(Q1:0=:) set -x; \ - cd coverage/simplecov && \ - git fetch && \ - exec git checkout $(SIMPLECOV_GIT_REF); \ - else \ - echo retrieving simplecov ...; \ - $(Q1:0=:) set -x; \ - exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \ - fi + $(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \ + --branch $(SIMPLECOV_GIT_REF) \ + $(SIMPLECOV_GIT_URL) simplecov-html $(GIT_OPTS) update-coverage: update-simplecov update-simplecov-html update-doclie -- cgit v1.2.3