yugui	2008-08-01 23:27:21 +0900 (Fri, 01 Aug 2008)

  New Revision: 18311

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

  Log:
    Merged r16430(akr), r16431(akr), r16433(akr), r16469(nobu), and
    r17874(akr) from ruby_1_8.
    
    * Makefile.in (update-rubyspec): added
    
    * Makefile.in (test-rubyspec): added

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18310)
+++ ChangeLog	(revision 18311)
@@ -1,3 +1,12 @@
+Fri Aug 01 23:26:22 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	Merged r16430(akr), r16431(akr), r16433(akr), r16469(nobu), and
+	r17874(akr) from ruby_1_8.
+
+	* Makefile.in (update-rubyspec): added
+
+	* Makefile.in (test-rubyspec): added
+
 Fri Aug  1 23:16:03 2008  NARUSE, Yui  <naruse@r...>
 
 	* enc/trans/japanese.c: add support for CP51932,
Index: common.mk
===================================================================
--- common.mk	(revision 18310)
+++ common.mk	(revision 18311)
@@ -7,6 +7,10 @@
 RUBYLIB       = -
 RUBYOPT       = -
 
+SPEC_GIT_BASE = git://github.com/rubyspec
+MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
+RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
+
 STATIC_RUBY   = static-ruby
 
 EXTCONF       = extconf.rb
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 18310)
+++ Makefile.in	(revision 18311)
@@ -206,3 +206,20 @@
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
+
+update-rubyspec: 
+	if [ -d $(srcdir)/rubyspec ]; then \
+	  cd $(srcdir)/rubyspec/mspec; \
+	  git pull; \
+	  cd ../spec/rubyspec; \
+	  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; \
+	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 $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)

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