ruby-changes:3314
From: ko1@a...
Date: 31 Dec 2007 06:52:33 +0900
Subject: [ruby-changes:3314] nobu - Ruby:r14807 (ruby_1_8, trunk): * trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
nobu 2007-12-31 06:50:40 +0900 (Mon, 31 Dec 2007)
New Revision: 14807
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/bcc32/Makefile.sub
branches/ruby_1_8/common.mk
branches/ruby_1_8/configure.in
branches/ruby_1_8/version.h
branches/ruby_1_8/win32/Makefile.sub
trunk/ChangeLog
trunk/bcc32/Makefile.sub
trunk/common.mk
trunk/configure.in
trunk/win32/Makefile.sub
Log:
* trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
compiling.
* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
moved.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/common.mk?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/bcc32/Makefile.sub?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/Makefile.sub?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=14807&r2=14806
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=14807&r2=14806
Index: configure.in
===================================================================
--- configure.in (revision 14806)
+++ configure.in (revision 14807)
@@ -1360,7 +1360,7 @@
PREP=fake.rb
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
else
- MINIRUBY='./miniruby$(EXEEXT)'
+ MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
fi
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14806)
+++ ChangeLog (revision 14807)
@@ -1,3 +1,11 @@
+Mon Dec 31 06:50:38 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
+ compiling.
+
+ * configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
+ moved.
+
Mon Dec 31 06:08:34 2007 Nobuyoshi Nakada <nobu@r...>
* include/ruby/encoding.h (rb_enc_sprintf, rb_enc_vsprintf): prototyped.
Index: common.mk
===================================================================
--- common.mk (revision 14806)
+++ common.mk (revision 14807)
@@ -347,7 +347,7 @@
$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
extconf:
- $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)"
+ $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
@@ -356,7 +356,7 @@
-so_name=$(RUBY_SO_NAME) rbconfig.rb
encs: enc.mk
- $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans
+ $(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans
$(MAKE) -f enc.mk $(MFLAGS)
enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
@@ -668,10 +668,10 @@
$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG)
- $(MINIRUBY) -I$(srcdir) -I$(srcdir)/lib -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@
+ $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@
golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb
- $(MINIRUBY) -I$(srcdir) -I$(srcdir)/lib -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@
+ $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@
prereq: incs srcs preludes
@@ -691,7 +691,7 @@
##
run: miniruby$(EXEEXT) PHONY
- $(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb $(RUNOPT)
+ $(MINIRUBY) $(srcdir)/test.rb $(RUNOPT)
runruby: $(PROGRAM) PHONY
$(RUNRUBY) $(srcdir)/test.rb
@@ -735,7 +735,7 @@
echo run >> run.gdb
gdb: miniruby$(EXEEXT) run.gdb PHONY
- gdb -x run.gdb --quiet --args $(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb
+ gdb -x run.gdb --quiet --args $(MINIRUBY) $(srcdir)/test.rb
# Intel VTune
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub (revision 14806)
+++ win32/Makefile.sub (revision 14807)
@@ -178,7 +178,7 @@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
+MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
!if !defined(STACK)
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub (revision 14806)
+++ bcc32/Makefile.sub (revision 14807)
@@ -179,7 +179,7 @@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
+MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
ORGLIBPATH = $(LIB)
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in (revision 14806)
+++ ruby_1_8/configure.in (revision 14807)
@@ -1313,7 +1313,7 @@
PREP=fake.rb
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
else
- MINIRUBY='./miniruby$(EXEEXT)'
+ MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
fi
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 14806)
+++ ruby_1_8/ChangeLog (revision 14807)
@@ -1,3 +1,11 @@
+Mon Dec 31 06:50:38 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
+ compiling.
+
+ * configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
+ moved.
+
Sun Dec 30 22:48:37 2007 Tadayoshi Funaba <tadf@d...>
* lib/date.rb (_valid_time?): I'm not sure to recommend such an
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h (revision 14806)
+++ ruby_1_8/version.h (revision 14807)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-12-27"
+#define RUBY_RELEASE_DATE "2007-12-31"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071227
+#define RUBY_RELEASE_CODE 20071231
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 31
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/bcc32/Makefile.sub
===================================================================
--- ruby_1_8/bcc32/Makefile.sub (revision 14806)
+++ ruby_1_8/bcc32/Makefile.sub (revision 14807)
@@ -157,7 +157,7 @@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
+MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
ORGLIBPATH = $(LIB)
Index: ruby_1_8/common.mk
===================================================================
--- ruby_1_8/common.mk (revision 14806)
+++ ruby_1_8/common.mk (revision 14807)
@@ -294,7 +294,7 @@
$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
extconf:
- $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)"
+ $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub (revision 14806)
+++ ruby_1_8/win32/Makefile.sub (revision 14807)
@@ -166,7 +166,7 @@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
+MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
!if !defined(STACK)
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml