* common.mk (enc.mk): depends on rbconfig.rb.

* regenc.h (OnigEncodingDefine): external encoding definition macro.

* enc/Makefile.in: fix for linking.

* enc/depend, enc/make_encmake.rb: fix for Windows.


* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: renamed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

22 files changed, 56 insertions, 25 deletions

diff --git a/enc/Makefile.in b/enc/Makefile.in
index 6cb9789976..a16124dc24 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -1,4 +1,6 @@
 srcdir = @srcdir@
+topdir = .
+libdir = @libdir@
 top_srcdir = $(srcdir:/enc=)
 arch = @arch@
 EXTOUT = @EXTOUT@
@@ -12,16 +14,22 @@ BUILTIN_ENCS	= ascii.c \
 		  euc_jp.c sjis.c \
 		  unicode.c utf8.c
 
+RUBY_SO_NAME = @RUBY_SO_NAME@
+LIBRUBY = @LIBRUBY@
+LIBRUBY_A = @LIBRUBY_A@
+LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
+LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
+
 empty =
 CC = @CC@
 OUTFLAG = @OUTFLAG@$(empty)
 CFLAGS = @CFLAGS@ @ARCH_FLAG@
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
 DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
-LIBS = @LIBS@ $(EXTLIBS)
+LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS)
 LDSHARED = @LDSHARED@
 DLDFLAGS = @DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
 
diff --git a/enc/ascii.c b/enc/ascii.c
index 894cea4bc2..9428902a9f 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -38,7 +38,7 @@ ascii_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
     return FALSE;
 }
 
-OnigEncodingType OnigEncodingASCII = {
+OnigEncodingDefine(ASCII) = {
   onigenc_single_byte_mbc_enc_len,
   "ASCII-8BIT",/* name */
   1,           /* max byte length */
diff --git a/enc/depend b/enc/depend
index f5eeafe9dc..29ae9154b6 100644
--- a/enc/depend
+++ b/enc/depend
@@ -3,23 +3,43 @@
 ! encs = encs.sort_by {|e| e.split(/(\d+)/).map {|n| Integer(n) rescue n}}
 
 VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join(CONFIG["PATH_SEPARATOR"]) %>
+LIBPATH = <%libpathflag($DEFLIBPATH)%>
 
 ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t  ")%><%"\n" if encs.size>1%>
+ENCDEFS = <%encs.map {|e|"#{e}.def"}.join(" \\\n\t  ") if DEFFILE%><%"\n" if encs.size>1%>
 ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%>
 
 all: $(ENCSOS)
 
-.c.$(OBJEXT):
+! COMPILE_RULES.each do |rule|
+<%  rule % %w[c $(OBJEXT)] %>
 	<%COMPILE_C%>
+
+! end
 ! unless encs.empty?
 
 $(ENCOBJS): regenc.h oniguruma.h config.h defines.h
 
+! encs.each do |e|
+<%e%>.so: $(ENCSODIR)/<%e%>.$(DLEXT)
 ! end
+
+! end
+! link_so = LINK_SO.gsub(/\n/, "\n\t")
 ! encs.each do |e|
-$(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT)
-	<%LINK_SO.gsub(/\n/, "\n\t")%>
+!   deps = "#{e}.$(OBJEXT)"
+!   deps << " #{e}-$(arch).def" if DEFFILE
+$(ENCSODIR)/<%e%>.$(DLEXT): <%deps%>
+	<%link_so.sub(/\$\(OBJS\)/, deps)%>
+
+! end
+! if DEFFILE
+!   encs.each do |e|
+<%e%>-$(arch).def:
+	echo EXPORTS > $@
+	echo <%EXPORT_PREFIX%>Init_<%e.upcase%> >> $@
 
+!   end
 ! end
 ! encs.each do |e|
 <%e%>.$(OBJEXT): <%e%>.c
@@ -27,6 +47,7 @@ $(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT)
 
 clean:
 	$(RM) $(ENCSOS)
+	$(RM) $(ENCDEFS)
 	$(RM) $(ENCOBJS)
 
 distclean: clean
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index ea2a8e0726..240e110139 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -341,7 +341,7 @@ get_ctype_code_range(int ctype, OnigCodePoint* sb_out,
 }
 
 
-OnigEncodingType OnigEncodingEUC_JP = {
+OnigEncodingDefine(EUC_JP) = {
   mbc_enc_len,
   "EUC-JP",   /* name */
   3,          /* max enc length */
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index fc2d93c61f..f7db6f931d 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -254,7 +254,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
     return FALSE;
 }
 
-OnigEncodingType OnigEncodingISO_8859_1 = {
+OnigEncodingDefine(ISO_8859_1) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-1",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
index 976b428579..20606d7398 100644
--- a/enc/iso_8859_10.c
+++ b/enc/iso_8859_10.c
@@ -224,7 +224,7 @@ iso_8859_10_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_10 = {
+OnigEncodingDefine(ISO_8859_10) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-10", /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
index 70645faed1..463f52eff2 100644
--- a/enc/iso_8859_11.c
+++ b/enc/iso_8859_11.c
@@ -76,7 +76,7 @@ iso_8859_11_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding e
     return FALSE;
 }
 
-OnigEncodingType OnigEncodingISO_8859_11 = {
+OnigEncodingDefine(ISO_8859_11) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-11",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index b3318b2381..3a9911550f 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -213,7 +213,7 @@ iso_8859_13_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_13 = {
+OnigEncodingDefine(ISO_8859_13) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-13",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c
index 030e030ee7..d4afd9db33 100644
--- a/enc/iso_8859_14.c
+++ b/enc/iso_8859_14.c
@@ -225,7 +225,7 @@ iso_8859_14_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_14 = {
+OnigEncodingDefine(ISO_8859_14) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-14",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
index 7650bf9eb8..9deeec7ac4 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -219,7 +219,7 @@ iso_8859_15_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_15 = {
+OnigEncodingDefine(ISO_8859_15) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-15",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
index 90de07d006..76517f85c7 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -222,7 +222,7 @@ iso_8859_16_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_16 = {
+OnigEncodingDefine(ISO_8859_16) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-16",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
index e12962a230..182a417f10 100644
--- a/enc/iso_8859_2.c
+++ b/enc/iso_8859_2.c
@@ -219,7 +219,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
     return FALSE;
 }
 
-OnigEncodingType OnigEncodingISO_8859_2 = {
+OnigEncodingDefine(ISO_8859_2) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-2",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
index 41888952fa..952483a439 100644
--- a/enc/iso_8859_3.c
+++ b/enc/iso_8859_3.c
@@ -219,7 +219,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_3 = {
+OnigEncodingDefine(ISO_8859_3) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-3",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
index 0cddf19192..a82ec3c3ba 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -221,7 +221,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_4 = {
+OnigEncodingDefine(ISO_8859_4) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-4",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
index 187e6b14e8..69908a2eeb 100644
--- a/enc/iso_8859_5.c
+++ b/enc/iso_8859_5.c
@@ -209,7 +209,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_5 = {
+OnigEncodingDefine(ISO_8859_5) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-5",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
index 1681506b5d..b0da863b67 100644
--- a/enc/iso_8859_6.c
+++ b/enc/iso_8859_6.c
@@ -76,7 +76,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
     return FALSE;
 }
 
-OnigEncodingType OnigEncodingISO_8859_6 = {
+OnigEncodingDefine(ISO_8859_6) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-6",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
index 3790c7154d..fc825b1363 100644
--- a/enc/iso_8859_7.c
+++ b/enc/iso_8859_7.c
@@ -206,7 +206,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 }
 
 
-OnigEncodingType OnigEncodingISO_8859_7 = {
+OnigEncodingDefine(ISO_8859_7) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-7",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c
index ba1d4864f7..61cd84258b 100644
--- a/enc/iso_8859_8.c
+++ b/enc/iso_8859_8.c
@@ -76,7 +76,7 @@ iso_8859_8_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding en
     return FALSE;
 }
 
-OnigEncodingType OnigEncodingISO_8859_8 = {
+OnigEncodingDefine(ISO_8859_8) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-8",  /* name */
   1,             /* max enc length */
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
index 1a51fad64a..95d92d906f 100644
--- a/enc/iso_8859_9.c
+++ b/enc/iso_8859_9.c
@@ -213,7 +213,7 @@ iso_8859_9_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingISO_8859_9 = {
+OnigEncodingDefine(ISO_8859_9) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-9",  /* name */
   1,             /* max enc length */
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index c20920168c..799c4a0851 100644
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -14,11 +14,13 @@ else
   BUILTIN_ENCS = []
 end
 
+DEFFILE = (true if CONFIG["DLDFLAGS"].sub!(/\s+-def:\$\(DEFFILE\)\s+/, ' '))
+  
 mkin = File.read(File.join($srcdir, "Makefile.in"))
 mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
 if File.exist?(depend = File.join($srcdir, "depend"))
   tmp = ''
-  eval(serb(File.read(depend), 'tmp'))
+  eval(serb(File.read(depend), 'tmp'), binding, depend)
   mkin << "\n#### depend ####\n\n" << depend_rules(tmp).join
 end
 open(ARGV[0], 'wb') {|f|
diff --git a/enc/sjis.c b/enc/sjis.c
index ff7da34279..e3d656ffb5 100644
--- a/enc/sjis.c
+++ b/enc/sjis.c
@@ -351,7 +351,7 @@ get_ctype_code_range(int ctype, OnigCodePoint* sb_out,
   }
 }
 
-OnigEncodingType OnigEncodingSJIS = {
+OnigEncodingDefine(SJIS) = {
   mbc_enc_len,
   "Shift_JIS",   /* name */
   2,             /* max byte length */
diff --git a/enc/utf8.c b/enc/utf8.c
index 24a3854485..9f278b54b0 100644
--- a/enc/utf8.c
+++ b/enc/utf8.c
@@ -486,7 +486,7 @@ utf8_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF8 = {
+OnigEncodingDefine(UTF8) = {
   utf8_mbc_enc_len,
   "UTF-8",     /* name */
   6,           /* max byte length */