shyouhei	2009-05-26 21:27:14 +0900 (Tue, 26 May 2009)

  New Revision: 23589

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

  Log:
    merge revision(s) 22489:
    * 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_7/ChangeLog
    branches/ruby_1_8_7/Makefile.in
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/Makefile.in
===================================================================
--- ruby_1_8_7/Makefile.in	(revision 23588)
+++ ruby_1_8_7/Makefile.in	(revision 23589)
@@ -189,14 +189,14 @@
 	if [ -d $(srcdir)/rubyspec ]; then \
 	  cd $(srcdir)/rubyspec/mspec; \
 	  git pull; \
-	  cd ../spec/rubyspec; \
+	  cd ../spec; \
 	  git pull; \
 	else \
+	  mkdir $(srcdir)/rubyspec; \
 	  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_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 23588)
+++ ruby_1_8_7/ChangeLog	(revision 23589)
@@ -1,3 +1,8 @@
+Tue May 26 21:24:01 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]
+
 Tue May 26 21:21:49 2009  Akinori MUSHA  <knu@i...>
 
 	* lib/soap/mimemessage.rb (MIMEMessage#to_s): Fix a fatal
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 23588)
+++ ruby_1_8_7/version.h	(revision 23589)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-05-26"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090526
-#define RUBY_PATCHLEVEL 166
+#define RUBY_PATCHLEVEL 167
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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