ruby-changes:43254
From: ngoto <ko1@a...>
Date: Wed, 8 Jun 2016 20:56:37 +0900 (JST)
Subject: [ruby-changes:43254] ngoto:r55328 (trunk): Makefile.in: revert r55303 because of an error on Solaris 10. [Bug #12471]
ngoto 2016-06-08 20:56:33 +0900 (Wed, 08 Jun 2016) New Revision: 55328 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55328 Log: Makefile.in: revert r55303 because of an error on Solaris 10. [Bug #12471] [ruby-dev:49654] Modified files: trunk/Makefile.in Index: Makefile.in =================================================================== --- Makefile.in (revision 55327) +++ Makefile.in (revision 55328) @@ -476,9 +476,10 @@ after-update:: common-srcs https://github.com/ruby/ruby/blob/trunk/Makefile.in#L476 update-mspec: @$(CHDIR) $(srcdir); \ - if cd spec/mspec 2> $(NULL); then \ + if [ -d spec/mspec ]; then \ echo updating mspec ...; \ $(Q1:0=:) set -x; \ + cd spec/mspec && \ exec git pull; \ else \ echo retrieving mspec ...; \ @@ -489,9 +490,10 @@ update-mspec: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L490 update-rubyspec: update-mspec @$(CHDIR) $(srcdir); \ - if cd spec/rubyspec 2> $(NULL); then \ + if [ -d spec/rubyspec ]; then \ echo updating rubyspec ...; \ $(Q1:0=:) set -x; \ + cd spec/rubyspec && \ exec git pull; \ else \ echo retrieving rubyspec ...; \ @@ -501,14 +503,14 @@ update-rubyspec: update-mspec https://github.com/ruby/ruby/blob/trunk/Makefile.in#L503 $(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline test-rubyspec-precheck: - @[ -d $(srcdir)/spec/rubyspec ] || \ - { echo No rubyspec here. make update-rubyspec first.; exit 1; } + @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi update-doclie: @$(CHDIR) $(srcdir); \ - if cd coverage/doclie 2> $(NULL); then \ + if [ -d coverage/doclie ]; then \ echo updating doclie ...; \ $(Q1:0=:) set -x; \ + cd coverage/doclie && \ git fetch && \ exec git checkout $(DOCLIE_GIT_REF); \ else \ @@ -519,9 +521,10 @@ update-doclie: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L521 update-simplecov-html: @$(CHDIR) $(srcdir); \ - if cd coverage/simplecov-html 2> $(NULL) then \ + 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 \ @@ -531,9 +534,10 @@ update-simplecov-html: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L534 update-simplecov: @$(CHDIR) $(srcdir); \ - if cd coverage/simplecov 2> $(NULL); then \ + if [ -d coverage/simplecov ]; then \ echo updating simplecov ...; \ $(Q1:0=:) set -x; \ + cd coverage/simplecov && \ git fetch && \ exec git checkout $(SIMPLECOV_GIT_REF); \ else \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/