nobu	2008-05-30 12:18:45 +0900 (Fri, 30 May 2008)

  New Revision: 16703

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/enc/make_encdb.rb
    trunk/enc/trans/make_transdb.rb

  Log:
    * common.mk (prelude.c): simply depends on PREP.  [ruby-dev:34877]
    
    * enc/make_encdb.rb, enc/trans/make_transdb.rb: ditto.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/make_encdb.rb?r1=16703&r2=16702&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=16703&r2=16702&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16703&r2=16702&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/trans/make_transdb.rb?r1=16703&r2=16702&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=16703&r2=16702&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16702)
+++ ChangeLog	(revision 16703)
@@ -1,3 +1,9 @@
+Fri May 30 12:18:43 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (prelude.c): simply depends on PREP.  [ruby-dev:34877]
+
+	* enc/make_encdb.rb, enc/trans/make_transdb.rb: ditto.
+
 Fri May 30 10:55:42 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_core.h (struct rb_unblock_callback), thread.c
Index: enc/trans/make_transdb.rb
===================================================================
--- enc/trans/make_transdb.rb	(revision 16702)
+++ enc/trans/make_transdb.rb	(revision 16703)
@@ -31,12 +31,6 @@
   end
 end
 result = converters.map {|k, v| %[rb_declare_transcoder("%s", "%s", "%s");\n] % v}.join
-mode = IO::RDWR|IO::CREAT
-mode |= IO::BINARY if defined?(IO::BINARY)
-open(outhdr, mode) do |f|
-  unless f.read == result
-    f.rewind
-    f.truncate(0)
-    f.print result
-  end
+open(outhdr, 'wb') do |f|
+  f.print result
 end
Index: enc/make_encdb.rb
===================================================================
--- enc/make_encdb.rb	(revision 16702)
+++ enc/make_encdb.rb	(revision 16703)
@@ -65,12 +65,6 @@
 
 result = encodings.map {|e| %[ENC_DEFINE("#{e}");\n]}.join + lines.join + 
   "\n#define ENCODING_COUNT #{count}\n"
-mode = IO::RDWR|IO::CREAT
-mode |= IO::BINARY if defined?(IO::BINARY)
-open(outhdr, mode) do |f|
-  unless f.read == result
-    f.rewind
-    f.truncate(0)
-    f.print result
-  end
+open(outhdr, 'wb') do |f|
+  f.print result
 end
Index: common.mk
===================================================================
--- common.mk	(revision 16702)
+++ common.mk	(revision 16703)
@@ -109,6 +109,8 @@
 
 BOOTSTRAPRUBY = $(BASERUBY)
 
+COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb
+
 VCS           = svn
 
 all: $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) encs
@@ -377,7 +379,7 @@
 	$(MAKE) -f enc.mk $(MFLAGS)
 
 enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
-	$(srcdir)/lib/mkmf.rb $(MKPREP)
+	$(srcdir)/lib/mkmf.rb $(PREP)
 	$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@
 
 .PRECIOUS: $(MKFILES)
@@ -742,14 +744,11 @@
 miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
-prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(MKPREP)
-	$(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb \
-		$(PRELUDE_SCRIPTS) $@.new
-	$(IFCHANGE) "$@" "$@.new"
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(PREP)
+	$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
 
-golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(MKPREP)
-	$(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@.new
-	$(IFCHANGE) "$@" "$@.new"
+golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
+	$(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
 
 prereq: incs srcs preludes
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 16702)
+++ Makefile.in	(revision 16703)
@@ -204,5 +204,3 @@
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-MKPREP = $(PREP) $(RBCONFIG)

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