naruse	2008-01-29 17:48:35 +0900 (Tue, 29 Jan 2008)

  New Revision: 15314

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/dmyencoding.c
    trunk/encoding.c

  Log:
    * dmyencoding.c, encoding.c (enc_init_db, NO_ENCDB_H):
      miniruby doesn't use encdb.
    
    * common.mk: encdb.h use miniruby.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15314&r2=15313&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15314&r2=15313&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/dmyencoding.c?r1=15314&r2=15313&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=15314&r2=15313&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15313)
+++ encoding.c	(revision 15314)
@@ -49,7 +49,11 @@
 static void
 enc_init_db(void)
 {
+#ifdef NO_ENCDB_H
+#define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
+#else
 #include "encdb.h"
+#endif
 }
 
 #define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15313)
+++ ChangeLog	(revision 15314)
@@ -1,3 +1,10 @@
+Tue Jan 29 17:25:22 2008  NARUSE, Yui  <naruse@r...>
+
+	* dmyencoding.c, encoding.c (enc_init_db, NO_ENCDB_H):
+	  miniruby doesn't use encdb.
+
+	* common.mk: encdb.h use miniruby.
+
 Tue Jan 29 17:37:36 2008  Tanaka Akira  <akr@f...>
 
 	* enc/gb18030.c (gb18030_mbc_enc_len): validation implemented.
@@ -23,7 +30,7 @@
 
 Tue Jan 29 16:25:26 2008  NARUSE, Yui  <naruse@r...>
 
-	* common.mk, ext/extmkf.rb: always make encdb.h.
+	* common.mk, ext/extmk.rb: always make encdb.h.
 
 Tue Jan 29 12:53:39 2008  NARUSE, Yui  <naruse@r...>
 
Index: common.mk
===================================================================
--- common.mk	(revision 15313)
+++ common.mk	(revision 15314)
@@ -100,7 +100,7 @@
 
 VCS           = svn
 
-all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) encs
+all: $(MKFILES) $(PREP) encdb $(RBCONFIG) $(LIBRUBY) encs
 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
 prog: $(PROGRAM) $(WPROGRAM)
 
@@ -428,7 +428,11 @@
   {$(VPATH)}st.h {$(VPATH)}dln.h
 dmydln.$(OBJEXT): {$(VPATH)}dmydln.c dln.$(OBJEXT)
 dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c encoding.$(OBJEXT)
+dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c \
+  {$(VPATH)}encoding.c {$(VPATH)}ruby.h \
+  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
+  {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}regenc.h
 encoding.$(OBJEXT): {$(VPATH)}encoding.c {$(VPATH)}ruby.h \
   {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
   {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \
@@ -705,11 +709,12 @@
 node_name.inc: {$(VPATH)}node.h
 	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
 
-encdb.h.new:
-	$(BASERUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc $@
+encdb:
+	$(MINIRUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc encdb.h.new
+	$(IFCHANGE) "encdb.h" "encdb.h.new"
 
-encdb.h: encdb.h.new
-	$(IFCHANGE) "$@" "$@.new"
+encdb.h:
+	$(MINIRUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc $@
 
 miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
Index: dmyencoding.c
===================================================================
--- dmyencoding.c	(revision 15313)
+++ dmyencoding.c	(revision 15314)
@@ -1,2 +1,3 @@
+#define NO_ENCDB_H 1
 #define NO_LOCALE_CHARMAP 1
 #include "encoding.c"

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