ruby-changes:3463
From: ko1@a...
Date: 8 Jan 2008 22:35:36 +0900
Subject: [ruby-changes:3463] naruse - Ruby:r14956 (trunk): * encoding.c, Makefile.in, include/ruby/oniguruma.h,
naruse 2008-01-08 22:35:24 +0900 (Tue, 08 Jan 2008)
New Revision: 14956
Modified files:
trunk/ChangeLog
trunk/Makefile.in
trunk/enc/Makefile.in
trunk/encoding.c
trunk/include/ruby/oniguruma.h
Log:
* encoding.c, Makefile.in, include/ruby/oniguruma.h,
enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/oniguruma.h?r1=14956&r2=14955&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=14956&r2=14955&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14956&r2=14955&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14956&r2=14955&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/Makefile.in?r1=14956&r2=14955&diff_format=u
Index: encoding.c
===================================================================
--- encoding.c (revision 14955)
+++ encoding.c (revision 14956)
@@ -295,6 +295,10 @@
ENCINDEX_EUC_JP,
ENCINDEX_SJIS,
ENCINDEX_UTF8,
+ ENCINDEX_UTF_16BE,
+ ENCINDEX_UTF_16LE,
+ ENCINDEX_UTF_32BE,
+ ENCINDEX_UTF_32LE,
ENCINDEX_BUILTIN_MAX
};
@@ -307,6 +311,10 @@
ENC_REGISTER(EUC_JP);
ENC_REGISTER(SJIS);
ENC_REGISTER(UTF8);
+ ENC_REGISTER(UTF_16BE);
+ ENC_REGISTER(UTF_16LE);
+ ENC_REGISTER(UTF_32BE);
+ ENC_REGISTER(UTF_32LE);
#undef ENC_REGISTER
enc_alias("ASCII", rb_enc_name(ONIG_ENCODING_ASCII));
enc_alias("BINARY", rb_enc_name(ONIG_ENCODING_ASCII));
Index: include/ruby/oniguruma.h
===================================================================
--- include/ruby/oniguruma.h (revision 14955)
+++ include/ruby/oniguruma.h (revision 14956)
@@ -189,10 +189,10 @@
ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_15;
ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_16;
ONIG_EXTERN OnigEncodingType OnigEncodingUTF8;
-ONIG_EXTERN OnigEncodingType OnigEncodingUTF16_BE;
-ONIG_EXTERN OnigEncodingType OnigEncodingUTF16_LE;
-ONIG_EXTERN OnigEncodingType OnigEncodingUTF32_BE;
-ONIG_EXTERN OnigEncodingType OnigEncodingUTF32_LE;
+ONIG_EXTERN OnigEncodingType OnigEncodingUTF_16BE;
+ONIG_EXTERN OnigEncodingType OnigEncodingUTF_16LE;
+ONIG_EXTERN OnigEncodingType OnigEncodingUTF_32BE;
+ONIG_EXTERN OnigEncodingType OnigEncodingUTF_32LE;
ONIG_EXTERN OnigEncodingType OnigEncodingEUC_JP;
ONIG_EXTERN OnigEncodingType OnigEncodingEUC_TW;
ONIG_EXTERN OnigEncodingType OnigEncodingEUC_KR;
@@ -221,10 +221,10 @@
#define ONIG_ENCODING_ISO_8859_15 (&OnigEncodingISO_8859_15)
#define ONIG_ENCODING_ISO_8859_16 (&OnigEncodingISO_8859_16)
#define ONIG_ENCODING_UTF8 (&OnigEncodingUTF8)
-#define ONIG_ENCODING_UTF16_BE (&OnigEncodingUTF16_BE)
-#define ONIG_ENCODING_UTF16_LE (&OnigEncodingUTF16_LE)
-#define ONIG_ENCODING_UTF32_BE (&OnigEncodingUTF32_BE)
-#define ONIG_ENCODING_UTF32_LE (&OnigEncodingUTF32_LE)
+#define ONIG_ENCODING_UTF_16BE (&OnigEncodingUTF_16BE)
+#define ONIG_ENCODING_UTF_16LE (&OnigEncodingUTF_16LE)
+#define ONIG_ENCODING_UTF_32BE (&OnigEncodingUTF_32BE)
+#define ONIG_ENCODING_UTF_32LE (&OnigEncodingUTF_32LE)
#define ONIG_ENCODING_EUC_JP (&OnigEncodingEUC_JP)
#define ONIG_ENCODING_EUC_TW (&OnigEncodingEUC_TW)
#define ONIG_ENCODING_EUC_KR (&OnigEncodingEUC_KR)
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14955)
+++ ChangeLog (revision 14956)
@@ -1,3 +1,8 @@
+Tue Jan 8 22:33:03 2008 NARUSE, Yui <naruse@r...>
+
+ * encoding.c, Makefile.in, include/ruby/oniguruma.h,
+ enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}.
+
Tue Jan 8 20:02:08 2008 Nobuyoshi Nakada <nobu@r...>
* win{32,ce}/Makefile.sub: merged.
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in (revision 14955)
+++ enc/Makefile.in (revision 14956)
@@ -16,7 +16,8 @@
BUILTIN_ENCS = ascii.c \
euc_jp.c sjis.c \
- unicode.c utf8.c
+ unicode.c utf8.c \
+ utf_16be.c utf_16le.c utf_32be.c utf_32le.c
RUBY_SO_NAME = @RUBY_SO_NAME@
LIBRUBY = @LIBRUBY@
Index: Makefile.in
===================================================================
--- Makefile.in (revision 14955)
+++ Makefile.in (revision 14956)
@@ -148,7 +148,7 @@
end; \
' > $@
-Makefile: $(srcdir)/Makefile.in
+Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
$(MKFILES): config.status $(srcdir)/common.mk
MAKE=$(MAKE) $(SHELL) ./config.status
@@ -160,7 +160,7 @@
$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
{ echo "Makefile updated, restart."; exit 1; }
-config.status: $(srcdir)/configure
+config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in
MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml