From 315196bc7af78c121df9a6a4a01c8ac2f354fc2a Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Jan 2008 08:48:35 +0000
Subject: * dmyencoding.c, encoding.c (enc_init_db, NO_ENCDB_H):   miniruby
 doesn't use encdb.

* common.mk: encdb.h use miniruby.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     |  9 ++++++++-
 common.mk     | 17 +++++++++++------
 dmyencoding.c |  1 +
 encoding.c    |  4 ++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb5e2464b4..772dd4a0d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 29 17:25:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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@fsij.org>
 
 	* enc/gb18030.c (gb18030_mbc_enc_len): validation implemented.
@@ -23,7 +30,7 @@ Tue Jan 29 16:59:01 2008  Tanaka Akira  <akr@fsij.org>
 
 Tue Jan 29 16:25:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* 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@ruby-lang.org>
 
diff --git a/common.mk b/common.mk
index 4e73b762fd..6d8590fcf3 100644
--- a/common.mk
+++ b/common.mk
@@ -100,7 +100,7 @@ BOOTSTRAPRUBY = $(BASERUBY)
 
 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 @@ dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(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 @@ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h $(srcdir)/revision.h
 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 $@
diff --git a/dmyencoding.c b/dmyencoding.c
index 1bd1106e69..dc00172ce8 100644
--- a/dmyencoding.c
+++ b/dmyencoding.c
@@ -1,2 +1,3 @@
+#define NO_ENCDB_H 1
 #define NO_LOCALE_CHARMAP 1
 #include "encoding.c"
diff --git a/encoding.c b/encoding.c
index a23f52b356..71a531a0fd 100644
--- a/encoding.c
+++ b/encoding.c
@@ -49,7 +49,11 @@ static void enc_declare(const char *name);
 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))
-- 
cgit v1.2.3