diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.in | 17 | ||||
| -rw-r--r-- | common.mk | 4 |
3 files changed, 30 insertions, 0 deletions
@@ -1,3 +1,12 @@ +Fri Aug 01 23:26:22 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + 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@ruby-lang.org> * enc/trans/japanese.c: add support for CP51932, diff --git a/Makefile.in b/Makefile.in index ad4f27abd9..f239b7941c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -206,3 +206,20 @@ distclean-local:: 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) @@ -7,6 +7,10 @@ dll: $(LIBRUBY_SO) 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 |