ruby-changes:2885
From: ko1@a...
Date: 21 Dec 2007 11:23:53 +0900
Subject: [ruby-changes:2885] nobu - Ruby:r14376 (trunk): * common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
nobu 2007-12-21 11:23:26 +0900 (Fri, 21 Dec 2007)
New Revision: 14376
Modified files:
trunk/ChangeLog
trunk/common.mk
trunk/enc/Makefile.in
trunk/enc/ascii.c
trunk/enc/depend
trunk/enc/euc_jp.c
trunk/enc/iso_8859_1.c
trunk/enc/iso_8859_10.c
trunk/enc/iso_8859_11.c
trunk/enc/iso_8859_13.c
trunk/enc/iso_8859_14.c
trunk/enc/iso_8859_15.c
trunk/enc/iso_8859_16.c
trunk/enc/iso_8859_2.c
trunk/enc/iso_8859_3.c
trunk/enc/iso_8859_4.c
trunk/enc/iso_8859_5.c
trunk/enc/iso_8859_6.c
trunk/enc/iso_8859_7.c
trunk/enc/iso_8859_8.c
trunk/enc/iso_8859_9.c
trunk/enc/sjis.c
trunk/enc/utf8.c
trunk/encoding.c
trunk/regenc.h
Log:
* common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
* encoding.c (Init_Encoding): ISO-8859-1 is no longer a replica.
* regenc.h (OnigEncodingDefine): names of extension and encoding can
differ.
* enc/Makefile.in: always shared.
* enc/depend (deffile): should not upcase.
* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: fix for Init.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/utf8.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_9.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_13.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_14.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_15.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_1.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_2.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_16.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/ascii.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_3.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/euc_jp.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/sjis.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_4.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_5.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/Makefile.in?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_6.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regenc.h?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_7.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_10.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_8.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/iso_8859_11.c?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/depend?r1=14376&r2=14375
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=14376&r2=14375
Index: encoding.c
===================================================================
--- encoding.c (revision 14375)
+++ encoding.c (revision 14376)
@@ -773,9 +773,6 @@
rb_define_singleton_method(rb_cEncoding, "default_external", get_default_external, 0);
- /* should be imported from Oniguruma */
- rb_enc_replicate("ISO-8859-1", rb_enc_find(rb_enc_name(ONIG_ENCODING_ASCII)));
-
/* dummy for unsupported, statefull encoding */
rb_enc_replicate("ISO-2022-JP", rb_enc_find(rb_enc_name(ONIG_ENCODING_ASCII)));
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14375)
+++ ChangeLog (revision 14376)
@@ -1,3 +1,18 @@
+Fri Dec 21 11:23:24 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
+
+ * encoding.c (Init_Encoding): ISO-8859-1 is no longer a replica.
+
+ * regenc.h (OnigEncodingDefine): names of extension and encoding can
+ differ.
+
+ * enc/Makefile.in: always shared.
+
+ * enc/depend (deffile): should not upcase.
+
+ * enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: fix for Init.
+
Fri Dec 21 09:26:48 2007 Tanaka Akira <akr@f...>
* tool/compile_prelude.rb: use erb.
@@ -78,7 +93,6 @@
* enc/depend, enc/make_encmake.rb: fix for Windows.
-
* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: renamed.
Thu Dec 20 16:42:55 2007 Koichi Sasada <ko1@a...>
Index: regenc.h
===================================================================
--- regenc.h (revision 14375)
+++ regenc.h (revision 14376)
@@ -181,9 +181,9 @@
extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*);
#define OnigEncodingName(n) encoding_##n
#define OnigEncodingDeclare(n) static OnigEncodingType OnigEncodingName(n)
-#define OnigEncodingDefine(n) \
+#define OnigEncodingDefine(f,n) \
OnigEncodingDeclare(n); \
- void Init_##n(void) { \
+ void Init_##f(void) { \
ONIG_ENC_REGISTER(OnigEncodingName(n).name, \
&OnigEncodingName(n)); \
} \
@@ -191,7 +191,7 @@
#else
#define OnigEncodingName(n) OnigEncoding##n
#define OnigEncodingDeclare(n) OnigEncodingType OnigEncodingName(n)
-#define OnigEncodingDefine(n) OnigEncodingDeclare(n)
+#define OnigEncodingDefine(f,n) OnigEncodingDeclare(n)
#endif
#endif /* REGENC_H */
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in (revision 14375)
+++ enc/Makefile.in (revision 14376)
@@ -16,14 +16,14 @@
RUBY_SO_NAME = @RUBY_SO_NAME@
LIBRUBY = @LIBRUBY@
-LIBRUBY_A = @LIBRUBY_A@
-LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
+LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
empty =
CC = @CC@
OUTFLAG = @OUTFLAG@$(empty)
-CFLAGS = @CFLAGS@ @ARCH_FLAG@
+CFLAGS = $(CCDLFLAGS) @CFLAGS@ @ARCH_FLAG@
+CCDLFLAGS = @CCDLFLAGS@
INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
Index: enc/euc_jp.c
===================================================================
--- enc/euc_jp.c (revision 14375)
+++ enc/euc_jp.c (revision 14376)
@@ -341,7 +341,7 @@
}
-OnigEncodingDefine(EUC_JP) = {
+OnigEncodingDefine(euc_jp, EUC_JP) = {
mbc_enc_len,
"EUC-JP", /* name */
3, /* max enc length */
Index: enc/iso_8859_1.c
===================================================================
--- enc/iso_8859_1.c (revision 14375)
+++ enc/iso_8859_1.c (revision 14376)
@@ -254,7 +254,7 @@
return FALSE;
}
-OnigEncodingDefine(ISO_8859_1) = {
+OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-1", /* name */
1, /* max enc length */
Index: enc/iso_8859_2.c
===================================================================
--- enc/iso_8859_2.c (revision 14375)
+++ enc/iso_8859_2.c (revision 14376)
@@ -219,7 +219,7 @@
return FALSE;
}
-OnigEncodingDefine(ISO_8859_2) = {
+OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-2", /* name */
1, /* max enc length */
Index: enc/sjis.c
===================================================================
--- enc/sjis.c (revision 14375)
+++ enc/sjis.c (revision 14376)
@@ -351,7 +351,7 @@
}
}
-OnigEncodingDefine(SJIS) = {
+OnigEncodingDefine(sjis, SJIS) = {
mbc_enc_len,
"Shift_JIS", /* name */
2, /* max byte length */
Index: enc/iso_8859_3.c
===================================================================
--- enc/iso_8859_3.c (revision 14375)
+++ enc/iso_8859_3.c (revision 14376)
@@ -219,7 +219,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_3) = {
+OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-3", /* name */
1, /* max enc length */
Index: enc/iso_8859_4.c
===================================================================
--- enc/iso_8859_4.c (revision 14375)
+++ enc/iso_8859_4.c (revision 14376)
@@ -221,7 +221,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_4) = {
+OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-4", /* name */
1, /* max enc length */
Index: enc/iso_8859_5.c
===================================================================
--- enc/iso_8859_5.c (revision 14375)
+++ enc/iso_8859_5.c (revision 14376)
@@ -209,7 +209,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_5) = {
+OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-5", /* name */
1, /* max enc length */
Index: enc/iso_8859_6.c
===================================================================
--- enc/iso_8859_6.c (revision 14375)
+++ enc/iso_8859_6.c (revision 14376)
@@ -76,7 +76,7 @@
return FALSE;
}
-OnigEncodingDefine(ISO_8859_6) = {
+OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-6", /* name */
1, /* max enc length */
Index: enc/iso_8859_7.c
===================================================================
--- enc/iso_8859_7.c (revision 14375)
+++ enc/iso_8859_7.c (revision 14376)
@@ -206,7 +206,7 @@
}
-OnigEncodingDefine(ISO_8859_7) = {
+OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-7", /* name */
1, /* max enc length */
Index: enc/depend
===================================================================
--- enc/depend (revision 14375)
+++ enc/depend (revision 14376)
@@ -35,9 +35,9 @@
! end
! if DEFFILE
! encs.each do |e|
-<%e%>-$(arch).def:
+<%e%>-$(arch).def: enc.mk
echo EXPORTS > $@
- echo <%EXPORT_PREFIX%>Init_<%e.upcase%> >> $@
+ echo <%EXPORT_PREFIX%>Init_<%e%> >> $@
! end
! end
Index: enc/iso_8859_8.c
===================================================================
--- enc/iso_8859_8.c (revision 14375)
+++ enc/iso_8859_8.c (revision 14376)
@@ -76,7 +76,7 @@
return FALSE;
}
-OnigEncodingDefine(ISO_8859_8) = {
+OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-8", /* name */
1, /* max enc length */
Index: enc/iso_8859_9.c
===================================================================
--- enc/iso_8859_9.c (revision 14375)
+++ enc/iso_8859_9.c (revision 14376)
@@ -213,7 +213,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_9) = {
+OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-9", /* name */
1, /* max enc length */
Index: enc/utf8.c
===================================================================
--- enc/utf8.c (revision 14375)
+++ enc/utf8.c (revision 14376)
@@ -486,7 +486,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(UTF8) = {
+OnigEncodingDefine(utf8, UTF8) = {
utf8_mbc_enc_len,
"UTF-8", /* name */
6, /* max byte length */
Index: enc/iso_8859_10.c
===================================================================
--- enc/iso_8859_10.c (revision 14375)
+++ enc/iso_8859_10.c (revision 14376)
@@ -224,7 +224,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_10) = {
+OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-10", /* name */
1, /* max enc length */
Index: enc/iso_8859_11.c
===================================================================
--- enc/iso_8859_11.c (revision 14375)
+++ enc/iso_8859_11.c (revision 14376)
@@ -76,7 +76,7 @@
return FALSE;
}
-OnigEncodingDefine(ISO_8859_11) = {
+OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-11", /* name */
1, /* max enc length */
Index: enc/ascii.c
===================================================================
--- enc/ascii.c (revision 14375)
+++ enc/ascii.c (revision 14376)
@@ -38,7 +38,7 @@
return FALSE;
}
-OnigEncodingDefine(ASCII) = {
+OnigEncodingDefine(ascii, ASCII) = {
onigenc_single_byte_mbc_enc_len,
"ASCII-8BIT",/* name */
1, /* max byte length */
Index: enc/iso_8859_13.c
===================================================================
--- enc/iso_8859_13.c (revision 14375)
+++ enc/iso_8859_13.c (revision 14376)
@@ -213,7 +213,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_13) = {
+OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-13", /* name */
1, /* max enc length */
Index: enc/iso_8859_14.c
===================================================================
--- enc/iso_8859_14.c (revision 14375)
+++ enc/iso_8859_14.c (revision 14376)
@@ -225,7 +225,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_14) = {
+OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-14", /* name */
1, /* max enc length */
Index: enc/iso_8859_15.c
===================================================================
--- enc/iso_8859_15.c (revision 14375)
+++ enc/iso_8859_15.c (revision 14376)
@@ -219,7 +219,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_15) = {
+OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-15", /* name */
1, /* max enc length */
Index: enc/iso_8859_16.c
===================================================================
--- enc/iso_8859_16.c (revision 14375)
+++ enc/iso_8859_16.c (revision 14376)
@@ -222,7 +222,7 @@
flag, p, end, items);
}
-OnigEncodingDefine(ISO_8859_16) = {
+OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
onigenc_single_byte_mbc_enc_len,
"ISO-8859-16", /* name */
1, /* max enc length */
Index: common.mk
===================================================================
--- common.mk (revision 14375)
+++ common.mk (revision 14376)
@@ -344,7 +344,7 @@
$(MAKE) -f enc.mk -$(MAKEFLAGS)
enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
- $(srcdir)/lib/mkmf.rb rbconfig.rb
+ $(srcdir)/lib/mkmf.rb $(RBCONFIG)
$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@
.PRECIOUS: $(MKFILES)
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml