nobu	2008-05-19 13:01:17 +0900 (Mon, 19 May 2008)

  New Revision: 16469

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/Makefile.in
    branches/ruby_1_8/bcc32/Makefile.sub
    branches/ruby_1_8/common.mk
    branches/ruby_1_8/win32/Makefile.sub

  Log:
    * common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.
    
    * {win32,bcc32}/Makefile.sub (update-rubyspec): added.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/common.mk?r1=16469&r2=16468&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/Makefile.in?r1=16469&r2=16468&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16469&r2=16468&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/bcc32/Makefile.sub?r1=16469&r2=16468&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/Makefile.sub?r1=16469&r2=16468&diff_format=u

Index: ruby_1_8/Makefile.in
===================================================================
--- ruby_1_8/Makefile.in	(revision 16468)
+++ ruby_1_8/Makefile.in	(revision 16469)
@@ -182,9 +182,6 @@
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
 
-MSPEC_GIT_URL=git://github.com/brixen/mspec.git
-RUBYSPEC_GIT_URL=git://github.com/brixen/rubyspec.git
-
 update-rubyspec: 
 	if [ -d $(srcdir)/rubyspec ]; then \
 	  cd $(srcdir)/rubyspec/mspec; \
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16468)
+++ ruby_1_8/ChangeLog	(revision 16469)
@@ -1,3 +1,9 @@
+Mon May 19 13:01:05 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.
+
+	* {win32,bcc32}/Makefile.sub (update-rubyspec): added.
+
 Mon May 19 11:53:45 2008  Akinori MUSHA  <knu@i...>
 
 	* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
Index: ruby_1_8/bcc32/Makefile.sub
===================================================================
--- ruby_1_8/bcc32/Makefile.sub	(revision 16468)
+++ ruby_1_8/bcc32/Makefile.sub	(revision 16469)
@@ -471,6 +471,38 @@
 		@$(RM) ext\config.cache $(RBCONFIG:/=\)
 		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 
+update-rubyspec:
+	@echo SPEC_EXISTS=0 > $@.mk
+	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
+	@type >> $@.mk &&|
+$()update-rubyspec:
+$()	@del $@.mk
+$()!if $$(SPEC_EXISTS)
+$()	cd $(srcdir:/=\)\rubyspec\mspec
+$()	git pull
+$()	cd ..\spec\rubyspec
+$()	git pull
+$()!else
+$()	git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
+$()	git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
+$()!endif
+|
+	@$(MAKE) -$(MAKEFLAGS)$(MFLAGS) -f $@.mk
+
+test-rubyspec:
+	@echo SPEC_EXISTS=0 > $@.mk
+	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
+	@type >> $@.mk &&|
+$()test-rubyspec:
+$()!if $$(SPEC_EXISTS)
+$()	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+$()!else
+$()	@echo No rubyspec here.  put rubyspec to srcdir first.
+$()	@cd $(srcdir:/=\)\rubyspec
+$()!endif
+|
+	@$(MAKE) -$(MAKEFLAGS) -f $@.mk
+
 ext/extinit.obj: ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
 
Index: ruby_1_8/common.mk
===================================================================
--- ruby_1_8/common.mk	(revision 16468)
+++ ruby_1_8/common.mk	(revision 16469)
@@ -5,6 +5,10 @@
 RUBYLIB       = -
 RUBYOPT       = -
 
+SPEC_GIT_BASE = git://github.com/brixen
+MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
+RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
+
 STATIC_RUBY   = static-ruby
 
 EXTCONF       = extconf.rb
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 16468)
+++ ruby_1_8/win32/Makefile.sub	(revision 16469)
@@ -233,14 +233,6 @@
 
 INSTALLED_LIST= .installed.list
 
-!if [find "revision.h" $(srcdir:/=\)\version.h > nul 2> nul] == 0
-REVISION_H    = revision.h
-REVISION_UP   = revision-up
-!else
-REVISION_H    = version.h
-REVISION_UP   =
-!endif
-
 !if !defined(WINMAINOBJ)
 WINMAINOBJ    = winmain.$(OBJEXT)
 !endif
@@ -639,11 +631,25 @@
 end
 <<KEEP
 
+update-rubyspec:
+!if exist($(srcdir:/=\)\rubyspec)
+	cd $(srcdir:/=\)\rubyspec\mspec
+	git pull
+	cd ..\spec\rubyspec
+	git pull
+!else
+	git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
+	git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
+!endif
+
 test-rubyspec:
-	@if not exist $(srcdir:/=\)\rubyspec\nul echo No rubyspec here.  put rubyspec to srcdir first. && exit 1
+!if exist($(srcdir:/=\)\rubyspec)
 	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+!else
+	@echo No rubyspec here.  put rubyspec to srcdir first.
+	@cd $(srcdir:/=\)\rubyspec
+!endif
 
-
 {$(srcdir)/missing}.c.obj:
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
 {$(srcdir)/win32}.c.obj:

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