mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Makefile.in: revert r55303 because of an error on Solaris 10. [Bug #12471] [ruby-dev:49654]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
fd25eea0e4
commit
404d6e9f38
1 changed files with 11 additions and 7 deletions
18
Makefile.in
18
Makefile.in
|
@ -476,9 +476,10 @@ after-update:: common-srcs
|
||||||
|
|
||||||
update-mspec:
|
update-mspec:
|
||||||
@$(CHDIR) $(srcdir); \
|
@$(CHDIR) $(srcdir); \
|
||||||
if cd spec/mspec 2> $(NULL); then \
|
if [ -d spec/mspec ]; then \
|
||||||
echo updating mspec ...; \
|
echo updating mspec ...; \
|
||||||
$(Q1:0=:) set -x; \
|
$(Q1:0=:) set -x; \
|
||||||
|
cd spec/mspec && \
|
||||||
exec git pull; \
|
exec git pull; \
|
||||||
else \
|
else \
|
||||||
echo retrieving mspec ...; \
|
echo retrieving mspec ...; \
|
||||||
|
@ -489,9 +490,10 @@ update-mspec:
|
||||||
|
|
||||||
update-rubyspec: update-mspec
|
update-rubyspec: update-mspec
|
||||||
@$(CHDIR) $(srcdir); \
|
@$(CHDIR) $(srcdir); \
|
||||||
if cd spec/rubyspec 2> $(NULL); then \
|
if [ -d spec/rubyspec ]; then \
|
||||||
echo updating rubyspec ...; \
|
echo updating rubyspec ...; \
|
||||||
$(Q1:0=:) set -x; \
|
$(Q1:0=:) set -x; \
|
||||||
|
cd spec/rubyspec && \
|
||||||
exec git pull; \
|
exec git pull; \
|
||||||
else \
|
else \
|
||||||
echo retrieving rubyspec ...; \
|
echo retrieving rubyspec ...; \
|
||||||
|
@ -501,14 +503,14 @@ update-rubyspec: update-mspec
|
||||||
$(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline
|
$(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline
|
||||||
|
|
||||||
test-rubyspec-precheck:
|
test-rubyspec-precheck:
|
||||||
@[ -d $(srcdir)/spec/rubyspec ] || \
|
@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
|
||||||
{ echo No rubyspec here. make update-rubyspec first.; exit 1; }
|
|
||||||
|
|
||||||
update-doclie:
|
update-doclie:
|
||||||
@$(CHDIR) $(srcdir); \
|
@$(CHDIR) $(srcdir); \
|
||||||
if cd coverage/doclie 2> $(NULL); then \
|
if [ -d coverage/doclie ]; then \
|
||||||
echo updating doclie ...; \
|
echo updating doclie ...; \
|
||||||
$(Q1:0=:) set -x; \
|
$(Q1:0=:) set -x; \
|
||||||
|
cd coverage/doclie && \
|
||||||
git fetch && \
|
git fetch && \
|
||||||
exec git checkout $(DOCLIE_GIT_REF); \
|
exec git checkout $(DOCLIE_GIT_REF); \
|
||||||
else \
|
else \
|
||||||
|
@ -519,9 +521,10 @@ update-doclie:
|
||||||
|
|
||||||
update-simplecov-html:
|
update-simplecov-html:
|
||||||
@$(CHDIR) $(srcdir); \
|
@$(CHDIR) $(srcdir); \
|
||||||
if cd coverage/simplecov-html 2> $(NULL) then \
|
if [ -d coverage/simplecov-html ]; then \
|
||||||
echo updating simplecov-html ...; \
|
echo updating simplecov-html ...; \
|
||||||
$(Q1:0=:) set -x; \
|
$(Q1:0=:) set -x; \
|
||||||
|
cd coverage/simplecov-html && \
|
||||||
git fetch && \
|
git fetch && \
|
||||||
exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
|
exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
|
||||||
else \
|
else \
|
||||||
|
@ -531,9 +534,10 @@ update-simplecov-html:
|
||||||
|
|
||||||
update-simplecov:
|
update-simplecov:
|
||||||
@$(CHDIR) $(srcdir); \
|
@$(CHDIR) $(srcdir); \
|
||||||
if cd coverage/simplecov 2> $(NULL); then \
|
if [ -d coverage/simplecov ]; then \
|
||||||
echo updating simplecov ...; \
|
echo updating simplecov ...; \
|
||||||
$(Q1:0=:) set -x; \
|
$(Q1:0=:) set -x; \
|
||||||
|
cd coverage/simplecov && \
|
||||||
git fetch && \
|
git fetch && \
|
||||||
exec git checkout $(SIMPLECOV_GIT_REF); \
|
exec git checkout $(SIMPLECOV_GIT_REF); \
|
||||||
else \
|
else \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue