ruby-changes:4982
From: ko1@a...
Date: Mon, 19 May 2008 14:45:04 +0900 (JST)
Subject: [ruby-changes:4982] knu - Ruby:r16475 (ruby_1_8_7): Merge from ruby_1_8.
knu 2008-05-19 14:44:47 +0900 (Mon, 19 May 2008)
New Revision: 16475
Modified files:
branches/ruby_1_8_7/ChangeLog
branches/ruby_1_8_7/Makefile.in
branches/ruby_1_8_7/bcc32/Makefile.sub
branches/ruby_1_8_7/common.mk
branches/ruby_1_8_7/process.c
branches/ruby_1_8_7/sprintf.c
branches/ruby_1_8_7/win32/Makefile.sub
Log:
Merge from ruby_1_8.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/bcc32/Makefile.sub?r1=16475&r2=16474&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/Makefile.in?r1=16475&r2=16474&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/win32/Makefile.sub?r1=16475&r2=16474&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/common.mk?r1=16475&r2=16474&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=16475&r2=16474&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/process.c?r1=16475&r2=16474&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/sprintf.c?r1=16475&r2=16474&diff_format=u
Index: ruby_1_8_7/Makefile.in
===================================================================
--- ruby_1_8_7/Makefile.in (revision 16474)
+++ ruby_1_8_7/Makefile.in (revision 16475)
@@ -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_7/process.c
===================================================================
--- ruby_1_8_7/process.c (revision 16474)
+++ ruby_1_8_7/process.c (revision 16475)
@@ -1519,6 +1519,9 @@
}
#if !defined(_WIN32)
last_status_set(status == -1 ? 127 : status, 0);
+#else
+ if (status == -1)
+ last_status_set(0x7f << 8, 0);
#endif
#elif defined(__VMS)
VALUE cmd;
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog (revision 16474)
+++ ruby_1_8_7/ChangeLog (revision 16475)
@@ -1,3 +1,19 @@
+Mon May 19 14:20:13 2008 NAKAMURA Usaku <usa@r...>
+
+ * sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
+
+Mon May 19 13:29:58 2008 NAKAMURA Usaku <usa@r...>
+
+ * process.c (rb_f_system): set last_status when status == -1 because
+ there is no path to set it on win32. this patch is derived from
+ [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com>
+
+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_7/bcc32/Makefile.sub
===================================================================
--- ruby_1_8_7/bcc32/Makefile.sub (revision 16474)
+++ ruby_1_8_7/bcc32/Makefile.sub (revision 16475)
@@ -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_7/common.mk
===================================================================
--- ruby_1_8_7/common.mk (revision 16474)
+++ ruby_1_8_7/common.mk (revision 16475)
@@ -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_7/win32/Makefile.sub
===================================================================
--- ruby_1_8_7/win32/Makefile.sub (revision 16474)
+++ ruby_1_8_7/win32/Makefile.sub (revision 16475)
@@ -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:
Index: ruby_1_8_7/sprintf.c
===================================================================
--- ruby_1_8_7/sprintf.c (revision 16474)
+++ ruby_1_8_7/sprintf.c (revision 16475)
@@ -729,6 +729,8 @@
need = strlen(expr);
if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))
need++;
+ else if (flags & FSPACE)
+ need++;
if ((flags & FWIDTH) && need < width)
need = width;
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/