nobu	2007-08-25 10:20:30 +0900 (Sat, 25 Aug 2007)

  New Revision: 13258

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/tool/compile_prelude.rb

  Log:
    * common.mk (prelude.o): depends on vm_core.h now.
    
    * common.mk (prelude.c): depends on tool/compile_prelude.rb too.
    
    * common.mk (prereq): updates all auto-generated sources.
    
    * tool/compile_prelude.rb: separated dynamic and static portions.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/tool/compile_prelude.rb?r1=13258&r2=13257
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13258&r2=13257
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=13258&r2=13257

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13257)
+++ ChangeLog	(revision 13258)
@@ -1,3 +1,13 @@
+Sat Aug 25 10:20:28 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (prelude.o): depends on vm_core.h now.
+
+	* common.mk (prelude.c): depends on tool/compile_prelude.rb too.
+
+	* common.mk (prereq): updates all auto-generated sources.
+
+	* tool/compile_prelude.rb: separated dynamic and static portions.
+
 Sat Aug 25 10:05:17 2007  Koichi Sasada  <ko1@a...>
 
 	* prelude.rb: add Thread.exclusive.  This class method
Index: common.mk
===================================================================
--- common.mk	(revision 13257)
+++ common.mk	(revision 13258)
@@ -589,7 +589,7 @@
         {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
         {$(VPATH)}thread_$(THREAD_MODEL).h
 id.$(OBJEXT): {$(VPATH)}id.c {$(VPATH)}ruby.h
-prelude.$(OBJEXT): {$(VPATH)}prelude.c {$(VPATH)}ruby.h
+prelude.$(OBJEXT): {$(VPATH)}prelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h
 
 MATZRUBY = $(MATZRUBYDIR)ruby
 
@@ -623,9 +623,11 @@
 node_name.inc: {$(VPATH)}node.h
 	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
 
-prelude.c: {$(VPATH)}prelude.rb
-	$(BASERUBY) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb prelude.c
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
+	$(BASERUBY) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
+prereq: incs prelude.c
+
 docs:
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT)
 
Index: tool/compile_prelude.rb
===================================================================
--- tool/compile_prelude.rb	(revision 13257)
+++ tool/compile_prelude.rb	(revision 13258)
@@ -1,26 +1,29 @@
 
 prelude, outfile = *ARGV
-lines = []
 
 lines = File.readlines(prelude).map{|line|
   line.dump
 }
 
 open(outfile, 'w'){|f|
-f.puts <<EOS__
+  f.puts <<EOS__, <<'EOS__'
 
 #include "ruby/ruby.h"
 #include "vm_core.h"
 
-static const char *prelude_code = 
+static const char prelude_name[] = "#{File.basename(prelude)}";
+static const char prelude_code[] =
 #{lines.join("\n")}
 ;
+EOS__
+
 void
 Init_prelude(void)
 {
   rb_iseq_eval(rb_iseq_compile(
-    rb_str_new2(prelude_code),
-    rb_str_new2("#{File.basename(prelude)}"), INT2FIX(1)));
+    rb_str_new(prelude_code, sizeof(prelude_code) - 1),
+    rb_str_new(prelude_name, sizeof(prelude_name) - 1),
+    INT2FIX(1)));
 
 #if 0
     printf("%s\n", prelude_code);

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