[前][次][番号順一覧][スレッド一覧]

ruby-changes:43229

From: nobu <ko1@a...>
Date: Tue, 7 Jun 2016 13:53:52 +0900 (JST)
Subject: [ruby-changes:43229] nobu:r55303 (trunk): Makefile.in: cd to working directory

nobu	2016-06-07 13:53:47 +0900 (Tue, 07 Jun 2016)

  New Revision: 55303

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55303

  Log:
    Makefile.in: cd to working directory
    
    * Makefile.in (update-{mspec,rubyspec,doclie,simplecov{,-html}}):
      cd to working directory first and check if the directory exists.

  Modified files:
    trunk/Makefile.in
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 55302)
+++ Makefile.in	(revision 55303)
@@ -476,10 +476,9 @@ after-update:: common-srcs https://github.com/ruby/ruby/blob/trunk/Makefile.in#L476
 
 update-mspec:
 	@$(CHDIR) $(srcdir); \
-	if [ -d spec/mspec ]; then \
+	if cd spec/mspec 2> $(NULL); then \
 	  echo updating mspec ...; \
 	  $(Q1:0=:) set -x; \
-	  cd spec/mspec && \
 	  exec git pull; \
 	else \
 	  echo retrieving mspec ...; \
@@ -490,10 +489,9 @@ update-mspec: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L489
 
 update-rubyspec: update-mspec
 	@$(CHDIR) $(srcdir); \
-	if [ -d spec/rubyspec ]; then \
+	if cd spec/rubyspec 2> $(NULL); then \
 	  echo updating rubyspec ...; \
 	  $(Q1:0=:) set -x; \
-	  cd spec/rubyspec && \
 	  exec git pull; \
 	else \
 	  echo retrieving rubyspec ...; \
@@ -503,14 +501,14 @@ update-rubyspec: update-mspec https://github.com/ruby/ruby/blob/trunk/Makefile.in#L501
 	$(Q)cd $(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
+	@[ -d $(srcdir)/spec/rubyspec ] || \
+	 { echo No rubyspec here.  make update-rubyspec first.; exit 1; }
 
 update-doclie:
 	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/doclie ]; then \
+	if cd coverage/doclie 2> $(NULL); then \
 	  echo updating doclie ...; \
 	  $(Q1:0=:) set -x; \
-	  cd coverage/doclie && \
 	  git fetch && \
 	  exec git checkout $(DOCLIE_GIT_REF); \
 	else \
@@ -521,10 +519,9 @@ update-doclie: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L519
 
 update-simplecov-html:
 	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/simplecov-html ]; then \
+	if cd coverage/simplecov-html 2> $(NULL) then \
 	  echo updating simplecov-html ...; \
 	  $(Q1:0=:) set -x; \
-	  cd coverage/simplecov-html && \
 	  git fetch && \
 	  exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
 	else \
@@ -534,10 +531,9 @@ update-simplecov-html: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L531
 
 update-simplecov:
 	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/simplecov ]; then \
+	if cd coverage/simplecov 2> $(NULL); 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/

[前][次][番号順一覧][スレッド一覧]