nobu	2009-04-03 18:34:24 +0900 (Fri, 03 Apr 2009)

  New Revision: 23130

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

  Log:
    * gc.c (Init_stack): use ruby_init_stack.  [ruby-dev:34350]
    * intern.h (Init_stack): make to call ruby_init_stack.

  Added directories:
    branches/ruby_1_8/template/
  Added files:
    branches/ruby_1_8/template/fake.rb.in
  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/Makefile.in
    branches/ruby_1_8/configure.in

Index: ruby_1_8/Makefile.in
===================================================================
--- ruby_1_8/Makefile.in	(revision 23129)
+++ ruby_1_8/Makefile.in	(revision 23130)
@@ -128,22 +128,8 @@
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake.rb:	Makefile
-		@echo ' \
-		class Object; \
-		  CROSS_COMPILING = RUBY_PLATFORM; \
-		  remove_const :RUBY_PLATFORM; \
-		  remove_const :RUBY_VERSION; \
-		  RUBY_PLATFORM = "@arch@"; \
-		  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
-		end; \
-		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
-		  class File; \
-		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\"; \
-		  end; \
-		end; \
-		' > $@
+fake.rb:	config.status
+		@./config.status --file=$@:$(srcdir)/template/fake.rb.in
 
 Makefile:	$(srcdir)/Makefile.in
 
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 23129)
+++ ruby_1_8/configure.in	(revision 23130)
@@ -1462,8 +1462,8 @@
 #fi
 
 if test x"$cross_compiling" = xyes; then
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
-  PREP=fake.rb
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake'
+  PREP='$(arch)-fake.rb'
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23129)
+++ ruby_1_8/ChangeLog	(revision 23130)
@@ -1,3 +1,9 @@
+Fri Apr  3 18:34:22 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (Init_stack): use ruby_init_stack.  [ruby-dev:34350]
+
+	* intern.h (Init_stack): make to call ruby_init_stack.
+
 Fri Apr  3 13:53:44 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (is_defined): made a volatile variable not to be
Index: ruby_1_8/template/fake.rb.in
===================================================================
--- ruby_1_8/template/fake.rb.in	(revision 0)
+++ ruby_1_8/template/fake.rb.in	(revision 23130)
@@ -0,0 +1,15 @@
+class Object
+  CROSS_COMPILING = RUBY_PLATFORM
+  remove_const :RUBY_PLATFORM
+  remove_const :RUBY_VERSION
+  remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
+  RUBY_PLATFORM = "@arch@"
+  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"
+  RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (#{Time.now.strftime("%Y-%m-%d")}) [#{RUBY_PLATFORM}]"
+end
+if RUBY_PLATFORM =~ /mswin|bccwin|mingw/
+  class File
+    remove_const :ALT_SEPARATOR
+    ALT_SEPARATOR = "\\"
+  end
+end

Property changes on: ruby_1_8/template/fake.rb.in
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision
Name: svn:eol-style
   + LF


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