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

ruby-changes:10914

From: shyouhei <ko1@a...>
Date: Sun, 22 Feb 2009 01:55:02 +0900 (JST)
Subject: [ruby-changes:10914] Ruby:r22489 (ruby_1_8): * Makefile.in (update-rubyspec, test-rubyspec): Catch up to

shyouhei	2009-02-22 01:54:54 +0900 (Sun, 22 Feb 2009)

  New Revision: 22489

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22489

  Log:
    * Makefile.in (update-rubyspec, test-rubyspec): Catch up to
      rubyspec merge.  A patch by Brian Ford at [ruby-core:21032]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/Makefile.in

Index: ruby_1_8/Makefile.in
===================================================================
--- ruby_1_8/Makefile.in	(revision 22488)
+++ ruby_1_8/Makefile.in	(revision 22489)
@@ -200,15 +200,14 @@
 	if [ -d $(srcdir)/rubyspec ]; then \
 	  cd $(srcdir)/rubyspec/mspec; \
 	  git pull; \
-	  cd ../spec/rubyspec; \
+	  cd ../spec; \
 	  git pull; \
 	else \
 	  mkdir $(srcdir)/rubyspec; \
-	  mkdir $(srcdir)/rubyspec/spec; \
 	  git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
-	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
+	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec; \
 	fi
 
 test-rubyspec:
 	@if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+	RUBY_EXE="$(RUNRUBY)" $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec-run --background --prefix $(srcdir)/rubyspec/spec -B $(srcdir)/rubyspec/spec/ruby.$(MAJOR).$(MINOR).mspec
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22488)
+++ ruby_1_8/ChangeLog	(revision 22489)
@@ -1,3 +1,8 @@
+Sun Feb 22 01:22:31 2009  URABE Shyouhei  <shyouhei@r...>
+
+	* Makefile.in (update-rubyspec, test-rubyspec): Catch up to
+	  rubyspec merge.  A patch by Brian Ford at [ruby-core:21032]
+
 Thu Feb 19 14:22:02 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (create_makefile): added phony targets.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

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